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

Test replay corner cases. Fix discovered bugs.

Browse Source
This commit is contained in:
Aldo Cortesi 2012-07-09 11:18:03 +12:00
parent aab45078ad
commit 79af9e89c4
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -8,5 +8,6 @@ MANIFEST
*.swo *.swo
mitmproxyc mitmproxyc
mitmdumpc mitmdumpc
netlib
.coverage .coverage
netlib
libpathod

6
libmproxy/proxy.py
View File

@ -67,11 +67,9 @@ class RequestReplayThread(threading.Thread):
self.flow.request, httpversion, code, msg, headers, content, server.cert self.flow.request, httpversion, code, msg, headers, content, server.cert
) )
response._send(self.masterq) response._send(self.masterq)
except (ProxyError, http.HttpError), v: except (ProxyError, http.HttpError, tcp.NetLibError), v:
err = flow.Error(self.flow.request, v.msg) err = flow.Error(self.flow.request, str(v))
err._send(self.masterq) err._send(self.masterq)
except tcp.NetLibError, v:
raise ProxyError(502, v)
class ServerConnection(tcp.TCPClient): class ServerConnection(tcp.TCPClient):

12
test/test_server.py
View File

@ -30,6 +30,18 @@ class SanityMixin:
rt.join() rt.join()
assert l.response.code == 305 assert l.response.code == 305
# Disconnect error
l.request.path = "/p/305:d0"
rt = self.master.replay_request(l)
rt.join()
assert l.error
# Port error
l.request.port = 1
rt = self.master.replay_request(l)
rt.join()
assert l.error
class TestHTTP(tutils.HTTPProxTest, SanityMixin): class TestHTTP(tutils.HTTPProxTest, SanityMixin):
def test_invalid_http(self): def test_invalid_http(self):