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

Extend eventlog information.

Browse Source 
Also, squash an SSL-related bug revealed by the extended logging.
This commit is contained in:
Aldo Cortesi 2011-07-23 13:37:06 +12:00
parent 4043829cf2
commit 3648c7953a
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmproxy/dump.py
View File

@ -139,7 +139,10 @@ class DumpMaster(flow.FlowMaster):
def handle_clientdisconnect(self, c): def handle_clientdisconnect(self, c):
if self.eventlog: if self.eventlog:
print >> self.outfile, "Disconnect from: %s:%s"%c.client_conn.address print >> self.outfile, "Disconnect from: %s:%s"%c.client_conn.address,
print >> self.outfile, "(handled %s requests)"%c.client_conn.requestcount
if c.client_conn.connection_error:
print >> self.outfile, "\terror: %s"%c.client_conn.connection_error
return flow.FlowMaster.handle_clientconnect(self, c) return flow.FlowMaster.handle_clientconnect(self, c)
def handle_request(self, r): def handle_request(self, r):

26
libmproxy/proxy.py
View File

@ -443,6 +443,8 @@ class ClientConnect(controller.Msg):
""" """
self.address = address self.address = address
self.close = False self.close = False
self.requestcount = 0
self.connection_error = None
controller.Msg.__init__(self) controller.Msg.__init__(self)
def __eq__(self, other): def __eq__(self, other):
@ -620,10 +622,14 @@ class ProxyHandler(SocketServer.StreamRequestHandler):
def handle_request(self, cc): def handle_request(self, cc):
server, request, err = None, None, None server, request, err = None, None, None
try: try:
request = self.read_request(cc) try:
request = self.read_request(cc)
except IOError, v:
raise IOError, "Reading request: %s"%v
if request is None: if request is None:
cc.close = True cc.close = True
return return
cc.requestcount += 1
request = request.send(self.mqueue) request = request.send(self.mqueue)
if request is None: if request is None:
cc.close = True cc.close = True
@ -636,7 +642,10 @@ class ProxyHandler(SocketServer.StreamRequestHandler):
else: else:
server = ServerConnection(request) server = ServerConnection(request)
server.send_request(request) server.send_request(request)
response = server.read_response() try:
response = server.read_response()
except IOError, v:
raise IOError, "Reading response: %s"%v
response = response.send(self.mqueue) response = response.send(self.mqueue)
if response is None: if response is None:
server.terminate() server.terminate()
@ -644,13 +653,16 @@ class ProxyHandler(SocketServer.StreamRequestHandler):
cc.close = True cc.close = True
return return
self.send_response(response) self.send_response(response)
except IOError: except IOError, v:
cc.connection_error = v
cc.close = True cc.close = True
except ProxyError, e: except ProxyError, e:
err = Error(request, e.msg)
err.send(self.mqueue)
cc.close = True cc.close = True
self.send_error(e.code, e.msg) cc.connection_error = "%s: %s"%(e.code, e.msg)
if request:
err = Error(request, e.msg)
err.send(self.mqueue)
self.send_error(e.code, e.msg)
if server: if server:
server.terminate() server.terminate()
@ -689,7 +701,7 @@ class ProxyHandler(SocketServer.StreamRequestHandler):
keyfile = self.config.certfile or self.config.cacert, keyfile = self.config.certfile or self.config.cacert,
server_side = True, server_side = True,
ssl_version = ssl.PROTOCOL_SSLv23, ssl_version = ssl.PROTOCOL_SSLv23,
do_handshake_on_connect = False do_handshake_on_connect = True
) )
if sys.version_info[1] > 6: if sys.version_info[1] > 6:
kwargs["ciphers"] = self.config.ciphers kwargs["ciphers"] = self.config.ciphers