Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11 from mitmproxy/refactor_read_http_body

Browse Source 
always return Content-Length: 0 if r is not set
This commit is contained in:
Aldo Cortesi 2014-01-04 14:48:12 -08:00
commit a9f8dcf755
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libpathod/language.py
View File

@ -765,11 +765,12 @@ class _Message(object):
def resolve(self, settings, request_host): def resolve(self, settings, request_host):
tokens = self.tokens[:] tokens = self.tokens[:]
if not self.raw: if not self.raw:
if self.body and not utils.get_header("Content-Length", self.headers): if not utils.get_header("Content-Length", self.headers):
length = 0 if not self.body else len(self.body.value.get_generator(settings))
tokens.append( tokens.append(
Header( Header(
ValueLiteral("Content-Length"), ValueLiteral("Content-Length"),
ValueLiteral(str(len(self.body.value.get_generator(settings)))), ValueLiteral(str(length)),
) )
) )
if request_host: if request_host:

12
libpathod/pathoc.py
View File

@ -33,19 +33,19 @@ class Pathoc(tcp.TCPClient):
self.clientcert = clientcert self.clientcert = clientcert
self.sslversion = SSLVERSIONS[sslversion] self.sslversion = SSLVERSIONS[sslversion]
def http_connect(self, connect_to, wfile, rfile): def http_connect(self, connect_to):
wfile.write( self.wfile.write(
'CONNECT %s:%s HTTP/1.1\r\n'%tuple(connect_to) + 'CONNECT %s:%s HTTP/1.1\r\n'%tuple(connect_to) +
'\r\n' '\r\n'
) )
wfile.flush() self.wfile.flush()
l = rfile.readline() l = self.rfile.readline()
if not l: if not l:
raise PathocError("Proxy CONNECT failed") raise PathocError("Proxy CONNECT failed")
parsed = http.parse_response_line(l) parsed = http.parse_response_line(l)
if not parsed[1] == 200: if not parsed[1] == 200:
raise PathocError("Proxy CONNECT failed: %s - %s"%(parsed[1], parsed[2])) raise PathocError("Proxy CONNECT failed: %s - %s"%(parsed[1], parsed[2]))
headers = http.read_headers(rfile) headers = http.read_headers(self.rfile)
def connect(self, connect_to=None): def connect(self, connect_to=None):
""" """
@ -54,7 +54,7 @@ class Pathoc(tcp.TCPClient):
""" """
tcp.TCPClient.connect(self) tcp.TCPClient.connect(self)
if connect_to: if connect_to:
self.http_connect(connect_to, self.wfile, self.rfile) self.http_connect(connect_to)
if self.ssl: if self.ssl:
try: try:
self.convert_to_ssl(sni=self.sni, cert=self.clientcert, method=self.sslversion) self.convert_to_ssl(sni=self.sni, cert=self.clientcert, method=self.sslversion)

4
libpathod/pathod.py
View File

@ -123,8 +123,8 @@ class PathodHandler(tcp.BaseHandler):
) )
try: try:
content = http.read_http_body_request( content = http.read_http_body(
self.rfile, self.wfile, headers, httpversion, None self.rfile, headers, None, True
) )
except http.HttpError, s: except http.HttpError, s:
s = str(s) s = str(s)

12
test/test_pathoc.py
View File

@ -136,16 +136,16 @@ class TestDaemon(_TestDaemon):
def test_connect_fail(self): def test_connect_fail(self):
to = ("foobar", 80) to = ("foobar", 80)
c = pathoc.Pathoc("127.0.0.1", self.d.port) c = pathoc.Pathoc("127.0.0.1", self.d.port)
r, w = cStringIO.StringIO(), cStringIO.StringIO() c.rfile, c.wfile = cStringIO.StringIO(), cStringIO.StringIO()
tutils.raises("connect failed", c.http_connect, to, w, r) tutils.raises("connect failed", c.http_connect, to)
r = cStringIO.StringIO( c.rfile = cStringIO.StringIO(
"HTTP/1.1 500 OK\r\n" "HTTP/1.1 500 OK\r\n"
) )
tutils.raises("connect failed", c.http_connect, to, w, r) tutils.raises("connect failed", c.http_connect, to)
r = cStringIO.StringIO( c.rfile = cStringIO.StringIO(
"HTTP/1.1 200 OK\r\n" "HTTP/1.1 200 OK\r\n"
) )
c.http_connect(to, w, r) c.http_connect(to)