Merge pull request #741 from mitmproxy/proxy-refactor-cb

Proxy Refactor

1 files changed, 26 insertions, 0 deletions

diff --git a/libmproxy/proxy/modes/http_proxy.py b/libmproxy/proxy/modes/http_proxy.py
new file mode 100644
index 00000000..90c54cc6
--- /dev/null
+++ b/libmproxy/proxy/modes/http_proxy.py
@@ -0,0 +1,26 @@
+from __future__ import (absolute_import, print_function, division)
+
+from ...protocol import Layer, ServerConnectionMixin
+
+
+class HttpProxy(Layer, ServerConnectionMixin):
+    def __call__(self):
+        layer = self.ctx.next_layer(self)
+        try:
+            layer()
+        finally:
+            if self.server_conn:
+                self._disconnect()
+
+
+class HttpUpstreamProxy(Layer, ServerConnectionMixin):
+    def __init__(self, ctx, server_address):
+        super(HttpUpstreamProxy, self).__init__(ctx, server_address=server_address)
+
+    def __call__(self):
+        layer = self.ctx.next_layer(self)
+        try:
+            layer()
+        finally:
+            if self.server_conn:
+                self._disconnect()