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

Add connection cipher info to pathod server log

Browse Source
This commit is contained in:
Aldo Cortesi 2014-03-02 22:10:49 +13:00
parent 602e400ccc
commit 944f213ebc
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libpathod/pathod.py
View File

@ -53,7 +53,7 @@ class PathodHandler(tcp.BaseHandler):
def handle_sni(self, connection): def handle_sni(self, connection):
self.sni = connection.get_servername() self.sni = connection.get_servername()
def serve_crafted(self, crafted, request_log): def serve_crafted(self, crafted):
c = self.server.check_policy(crafted, self.server.request_settings) c = self.server.check_policy(crafted, self.server.request_settings)
if c: if c:
err = language.make_error_response(c) err = language.make_error_response(c)
@ -68,14 +68,9 @@ class PathodHandler(tcp.BaseHandler):
crafted = crafted.freeze(self.server.request_settings, None) crafted = crafted.freeze(self.server.request_settings, None)
self.info(">> Spec: %s"%crafted.spec()) self.info(">> Spec: %s"%crafted.spec())
response_log = language.serve(crafted, self.wfile, self.server.request_settings, None) response_log = language.serve(crafted, self.wfile, self.server.request_settings, None)
log = dict(
type = "crafted",
request=request_log,
response=response_log
)
if response_log["disconnect"]: if response_log["disconnect"]:
return False, log return False, response_log
return True, log return True, response_log
def handle_request(self): def handle_request(self):
""" """
@ -141,15 +136,21 @@ class PathodHandler(tcp.BaseHandler):
keyinfo = self.clientcert.keyinfo, keyinfo = self.clientcert.keyinfo,
) )
request_log = dict( retlog = dict(
type = "crafted",
request = dict(
path = path, path = path,
method = method, method = method,
headers = headers.lst, headers = headers.lst,
httpversion = httpversion, httpversion = httpversion,
sni = self.sni, sni = self.sni,
remote_address = self.address(), remote_address = self.address(),
clientcert = clientcert clientcert = clientcert,
),
cipher = None,
) )
if self.ssl_established:
retlog["cipher"] = self.get_current_cipher()
try: try:
content = http.read_http_body( content = http.read_http_body(
@ -164,7 +165,8 @@ class PathodHandler(tcp.BaseHandler):
if i[0].match(path): if i[0].match(path):
self.info("crafting anchor: %s"%path) self.info("crafting anchor: %s"%path)
aresp = language.parse_response(self.server.request_settings, i[1]) aresp = language.parse_response(self.server.request_settings, i[1])
return self.serve_crafted(aresp, request_log) again, retlog["response"] = self.serve_crafted(aresp)
return again, retlog
if not self.server.nocraft and path.startswith(self.server.craftanchor): if not self.server.nocraft and path.startswith(self.server.craftanchor):
spec = urllib.unquote(path)[len(self.server.craftanchor):] spec = urllib.unquote(path)[len(self.server.craftanchor):]
@ -177,7 +179,8 @@ class PathodHandler(tcp.BaseHandler):
"Parse Error", "Parse Error",
"Error parsing response spec: %s\n"%v.msg + v.marked() "Error parsing response spec: %s\n"%v.msg + v.marked()
) )
return self.serve_crafted(crafted, request_log) again, retlog["response"] = self.serve_crafted(crafted)
return again, retlog
elif self.server.noweb: elif self.server.noweb:
crafted = language.make_error_response("Access Denied") crafted = language.make_error_response("Access Denied")
language.serve(crafted, self.wfile, self.server.request_settings) language.serve(crafted, self.wfile, self.server.request_settings)

11
test/test_pathod.py
View File

@ -94,7 +94,7 @@ class TestNohang(tutils.DaemonTests):
r = self.get("200:p0,0") r = self.get("200:p0,0")
assert r.status_code == 800 assert r.status_code == 800
l = self.d.last_log() l = self.d.last_log()
assert "Pauses have been disabled" in l["msg"] assert "Pauses have been disabled" in l["response"]["msg"]
class TestHexdump(tutils.DaemonTests): class TestHexdump(tutils.DaemonTests):
@ -113,7 +113,7 @@ class CommonTests(tutils.DaemonTests):
r = self.get("200:b@1g") r = self.get("200:b@1g")
assert r.status_code == 800 assert r.status_code == 800
l = self.d.last_log() l = self.d.last_log()
assert "too large" in l["msg"] assert "too large" in l["response"]["msg"]
def test_preline(self): def test_preline(self):
r = self.pathoc(r"get:'/p/200':i0,'\r\n'") r = self.pathoc(r"get:'/p/200':i0,'\r\n'")
@ -219,3 +219,10 @@ class TestDaemonSSL(CommonTests):
assert l["type"] == "error" assert l["type"] == "error"
assert "SSL" in l["msg"] assert "SSL" in l["msg"]
def test_ssl_cipher(self):
r = self.pathoc(r"get:/p/202")
assert r.status_code == 202
assert self.d.last_log()["cipher"][1] > 0