Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-02-01 15:55:28 +00:00
Code Issues Projects Releases Wiki Activity

complete state handling

Browse Source
This commit is contained in:
Maximilian Hils 2014-01-30 20:11:01 +01:00
parent 8544a5ba4b
commit 5fce7be592
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libmproxy/protocol/http.py
View File

@ -617,7 +617,7 @@ class HTTPResponse(HTTPMessage):
timestamp_end: Timestamp indicating when request transmission ended timestamp_end: Timestamp indicating when request transmission ended
""" """
def __init__(self, httpversion, code, msg, headers, content, timestamp_start, timestamp_end): def __init__(self, httpversion, code, msg, headers, content, timestamp_start, timestamp_end):
assert isinstance(headers, ODictCaseless) assert isinstance(headers, ODictCaseless) or headers is None
HTTPMessage.__init__(self) HTTPMessage.__init__(self)
self.httpversion = httpversion self.httpversion = httpversion
@ -643,7 +643,7 @@ class HTTPResponse(HTTPMessage):
@classmethod @classmethod
def _from_state(cls, state): def _from_state(cls, state):
f = cls(None, None, None, None, None, None, None, None) f = cls(None, None, None, None, None, None, None)
f._load_state(state) f._load_state(state)
return f return f
@ -948,6 +948,19 @@ class HTTPHandler(ProtocolHandler):
if flow.request.form_in == "authority": if flow.request.form_in == "authority":
self.ssl_upgrade(flow.request) self.ssl_upgrade(flow.request)
flow.server_conn = self.c.server_conn
"""
FIXME: Remove state test
d = flow._get_state()
print d
flow._load_state(d)
print flow._get_state()
copy = HTTPFlow._from_state(d)
print copy._get_state()
"""
return True return True
except (HttpAuthenticationError, http.HttpError, ProxyError, tcp.NetLibError), e: except (HttpAuthenticationError, http.HttpError, ProxyError, tcp.NetLibError), e:
self.handle_error(e, flow) self.handle_error(e, flow)

14
libmproxy/proxy.py
View File

@ -36,7 +36,11 @@ class ProxyConfig:
class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject): class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject):
def __init__(self, client_connection, address, server): def __init__(self, client_connection, address, server):
if client_connection: # Eventually, this object is restored from state
tcp.BaseHandler.__init__(self, client_connection, address, server) tcp.BaseHandler.__init__(self, client_connection, address, server)
else:
self.address = None
self.clientcert = None
self.timestamp_start = utils.timestamp() self.timestamp_start = utils.timestamp()
self.timestamp_end = None self.timestamp_end = None
@ -52,7 +56,9 @@ class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject):
@classmethod @classmethod
def _from_state(cls, state): def _from_state(cls, state):
raise NotImplementedError # FIXME f = cls(None, None, None)
f._load_state(state)
return f
def convert_to_ssl(self, *args, **kwargs): def convert_to_ssl(self, *args, **kwargs):
tcp.BaseHandler.convert_to_ssl(self, *args, **kwargs) tcp.BaseHandler.convert_to_ssl(self, *args, **kwargs)
@ -86,7 +92,9 @@ class ServerConnection(tcp.TCPClient, stateobject.SimpleStateObject):
@classmethod @classmethod
def _from_state(cls, state): def _from_state(cls, state):
raise NotImplementedError # FIXME f = cls(None)
f._load_state(state)
return f
def connect(self): def connect(self):
self.timestamp_start = utils.timestamp() self.timestamp_start = utils.timestamp()
@ -163,7 +171,7 @@ class ConnectionHandler:
def del_server_connection(self): def del_server_connection(self):
if self.server_conn and self.server_conn.connection: if self.server_conn and self.server_conn.connection:
self.server_conn.finish() self.server_conn.finish()
self.log("serverdisconnect", ["%s:%s" % self.server_conn.address]) self.log("serverdisconnect", ["%s:%s" % (self.server_conn.address.host, self.server_conn.address.port)])
self.channel.tell("serverdisconnect", self) self.channel.tell("serverdisconnect", self)
self.server_conn = None self.server_conn = None
self.sni = None self.sni = None