diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-01-04 14:42:32 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-01-04 14:42:32 +1300 |
| commit | 45eab17e0c35b9527dd8f68364fa577c61f33551 (patch) | |
| tree | 9a05d418856d5c67b950fbc7650cc80bfae6778d /libmproxy/proxy.py | |
| parent | 1e07d9e6e7962922707fb0f384e30fd4d9461e2a (diff) | |
| download | mitmproxy-45eab17e0c35b9527dd8f68364fa577c61f33551.tar.gz mitmproxy-45eab17e0c35b9527dd8f68364fa577c61f33551.tar.bz2 mitmproxy-45eab17e0c35b9527dd8f68364fa577c61f33551.zip | |
Decouple message type from message class name.
Diffstat (limited to 'libmproxy/proxy.py')
| -rw-r--r-- | libmproxy/proxy.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 9b300aa1..7f39a5c5 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -97,10 +97,10 @@ class RequestReplayThread(threading.Thread): self.flow.request, httpversion, code, msg, headers, content, server.cert, server.rfile.first_byte_timestamp ) - self.channel.ask(response) + self.channel.ask("response", response) except (ProxyError, http.HttpError, tcp.NetLibError), v: err = flow.Error(self.flow.request, str(v)) - self.channel.ask(err) + self.channel.ask("error", err) class HandleSNI: @@ -173,7 +173,7 @@ class ProxyHandler(tcp.BaseHandler): self.server_conn.require_request = False self.server_conn.conn_info = conn_info - self.channel.ask(self.server_conn) + self.channel.ask("serverconnect", self.server_conn) self.server_conn.connect() except tcp.NetLibError, v: raise ProxyError(502, v) @@ -187,7 +187,7 @@ class ProxyHandler(tcp.BaseHandler): def handle(self): cc = flow.ClientConnect(self.client_address) self.log(cc, "connect") - self.channel.ask(cc) + self.channel.ask("clientconnect", cc) while self.handle_request(cc) and not cc.close: pass cc.close = True @@ -199,7 +199,7 @@ class ProxyHandler(tcp.BaseHandler): [ "handled %s requests"%cc.requestcount] ) - self.channel.tell(cd) + self.channel.tell("clientdisconnect", cd) def handle_request(self, cc): try: @@ -209,13 +209,13 @@ class ProxyHandler(tcp.BaseHandler): return cc.requestcount += 1 - request_reply = self.channel.ask(request) + request_reply = self.channel.ask("request", request) if request_reply is None or request_reply == KILL: return elif isinstance(request_reply, flow.Response): request = False response = request_reply - response_reply = self.channel.ask(response) + response_reply = self.channel.ask("response", response) else: request = request_reply if self.config.reverse_proxy: @@ -261,7 +261,7 @@ class ProxyHandler(tcp.BaseHandler): request, httpversion, code, msg, headers, content, sc.cert, sc.rfile.first_byte_timestamp ) - response_reply = self.channel.ask(response) + response_reply = self.channel.ask("response", response) # Not replying to the server invalidates the server # connection, so we terminate. if response_reply == KILL: @@ -288,7 +288,7 @@ class ProxyHandler(tcp.BaseHandler): if request: err = flow.Error(request, cc.error) - self.channel.ask(err) + self.channel.ask("error", err) self.log( cc, cc.error, ["url: %s"%request.get_url()] @@ -308,7 +308,7 @@ class ProxyHandler(tcp.BaseHandler): msg.append(" -> "+i) msg = "\n".join(msg) l = Log(msg) - self.channel.tell(l) + self.channel.tell("log", l) def find_cert(self, cc, host, port, sni): if self.config.certfile: |