diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-05-10 12:18:05 -0600 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-05-10 12:18:05 -0600 |
commit | bb4f9611f53771103b9b790d7fa3baddb706cfe9 (patch) | |
tree | 74f92dbf2f5318f43afc69eca7a8fe7996936a4c /mitmproxy/flow.py | |
parent | f315dc1eb9f4701548fd57bbb38de1e9caa34e40 (diff) | |
download | mitmproxy-bb4f9611f53771103b9b790d7fa3baddb706cfe9.tar.gz mitmproxy-bb4f9611f53771103b9b790d7fa3baddb706cfe9.tar.bz2 mitmproxy-bb4f9611f53771103b9b790d7fa3baddb706cfe9.zip |
Revert "fix tests"
This reverts commit f315dc1eb9f4701548fd57bbb38de1e9caa34e40.
Diffstat (limited to 'mitmproxy/flow.py')
-rw-r--r-- | mitmproxy/flow.py | 50 |
1 files changed, 4 insertions, 46 deletions
diff --git a/mitmproxy/flow.py b/mitmproxy/flow.py index 9e6d3f89..9292e76a 100644 --- a/mitmproxy/flow.py +++ b/mitmproxy/flow.py @@ -16,13 +16,12 @@ import re from netlib import wsgi from netlib.exceptions import HttpException from netlib.http import Headers, http1 -from netlib.utils import clean_bin from . import controller, tnetstring, filt, script, version, flow_format_compat from .onboarding import app from .proxy.config import HostMatcher from .protocol.http_replay import RequestReplayThread from .exceptions import Kill, FlowReadException -from .models import ClientConnection, ServerConnection, HTTPFlow, HTTPRequest, FLOW_TYPES, TCPFlow +from .models import ClientConnection, ServerConnection, HTTPFlow, HTTPRequest, FLOW_TYPES from collections import defaultdict @@ -893,17 +892,6 @@ class FlowMaster(controller.ServerMaster): self.handle_response(f) if f.error: self.handle_error(f) - elif isinstance(f, TCPFlow): - messages = f.messages - f.messages = [] - f.reply = controller.DummyReply() - self.handle_tcp_open(f) - while messages: - f.messages.append(messages.pop(0)) - self.handle_tcp_message(f) - if f.error: - self.handle_tcp_error(f) - self.handle_tcp_close(f) else: raise NotImplementedError() @@ -1091,39 +1079,9 @@ class FlowMaster(controller.ServerMaster): self.add_event('"{}" reloaded.'.format(s.filename), 'info') return ok - def handle_tcp_open(self, flow): - self.state.add_flow(flow) - self.run_script_hook("tcp_open", flow) - flow.reply() - - def handle_tcp_message(self, flow): - self.run_script_hook("tcp_message", flow) - message = flow.messages[-1] - direction = "->" if message.from_client else "<-" - self.add_event("{client} {direction} tcp {direction} {server}".format( - client=repr(flow.client_conn.address), - server=repr(flow.server_conn.address), - direction=direction, - ), "info") - self.add_event(clean_bin(message.content), "debug") - flow.reply() - - def handle_tcp_error(self, flow): - if self.stream: - self.stream.add(flow) - self.add_event("Error in TCP connection to {}: {}".format( - repr(flow.server_conn.address), - flow.error - ), "info") - self.run_script_hook("tcp_error", flow) - flow.reply() - - def handle_tcp_close(self, flow): - self.state.delete_flow(flow) - if self.stream: - self.stream.add(flow) - self.run_script_hook("tcp_close", flow) - flow.reply() + def handle_tcp_message(self, m): + self.run_script_hook("tcp_message", m) + m.reply() def shutdown(self): super(FlowMaster, self).shutdown() |