add generic tcp proxying, fix #374

3 files changed, 29 insertions, 21 deletions

diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index 32a88b4b..33d860ca 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -1260,9 +1260,9 @@ class HTTPHandler(ProtocolHandler):
         Returns False, if the connection should be closed immediately.
         """
         address = tcp.Address.wrap(address)
-        if self.c.check_ignore_address(address):
+        if self.c.config.check_ignore(address):
             self.c.log("Ignore host: %s:%s" % address(), "info")
-            TCPHandler(self.c).handle_messages()
+            TCPHandler(self.c, log=False).handle_messages()
             return False
         else:
             self.expected_form_in = "relative"
@@ -1274,6 +1274,11 @@ class HTTPHandler(ProtocolHandler):
                 self.c.establish_ssl(server=True, client=True)
                 self.c.log("Upgrade to SSL completed.", "debug")
 
+            if self.c.config.check_tcp(address):
+                self.c.log("Generic TCP mode for host: %s:%s" % address(), "info")
+                TCPHandler(self.c).handle_messages()
+                return False
+
             return True
 
     def authenticate(self, request):
diff --git a/libmproxy/protocol/primitives.py b/libmproxy/protocol/primitives.py
index 519693db..1bf7f832 100644
--- a/libmproxy/protocol/primitives.py
+++ b/libmproxy/protocol/primitives.py
@@ -59,8 +59,8 @@ class Flow(stateobject.StateObject):
     A Flow is a collection of objects representing a single transaction.
     This class is usually subclassed for each protocol, e.g. HTTPFlow.
     """
-    def __init__(self, conntype, client_conn, server_conn, live=None):
-        self.conntype = conntype
+    def __init__(self, type, client_conn, server_conn, live=None):
+        self.type = type
         self.id = str(uuid.uuid4())
         self.client_conn = client_conn
         """@type: ClientConnection"""
@@ -78,7 +78,7 @@ class Flow(stateobject.StateObject):
         error=Error,
         client_conn=ClientConnection,
         server_conn=ServerConnection,
-        conntype=str
+        type=str
     )
 
     def get_state(self, short=False):
diff --git a/libmproxy/protocol/tcp.py b/libmproxy/protocol/tcp.py
index a56bf07b..da0c9087 100644
--- a/libmproxy/protocol/tcp.py
+++ b/libmproxy/protocol/tcp.py
@@ -13,6 +13,10 @@ class TCPHandler(ProtocolHandler):
 
     chunk_size = 4096
 
+    def __init__(self, c, log=True):
+        super(TCPHandler, self).__init__(c)
+        self.log = log
+
     def handle_messages(self):
         self.c.establish_server_connection()
 
@@ -63,26 +67,25 @@ class TCPHandler(ProtocolHandler):
                         # if one of the peers is over SSL, we need to send
                         # bytes/strings
                         if not src.ssl_established:
-                            # only ssl to dst, i.e. we revc'd into buf but need
-                            # bytes/string now.
+                            # we revc'd into buf but need bytes/string now.
                             contents = buf[:size].tobytes()
-                        self.c.log(
-                            "%s %s\r\n%s" % (
-                                direction, dst_str, cleanBin(contents)
-                            ),
-                            "debug"
-                        )
+                        if self.log:
+                            self.c.log(
+                                "%s %s\r\n%s" % (
+                                    direction, dst_str, cleanBin(contents)
+                                ),
+                                "info"
+                            )
                         dst.connection.send(contents)
                     else:
                         # socket.socket.send supports raw bytearrays/memoryviews
-                        self.c.log(
-                            "%s %s\r\n%s" % (
-                                direction,
-                                dst_str,
-                                cleanBin(buf.tobytes())
-                            ),
-                            "debug"
-                        )
+                        if self.log:
+                            self.c.log(
+                                "%s %s\r\n%s" % (
+                                    direction, dst_str, cleanBin(buf.tobytes())
+                                ),
+                                "info"
+                            )
                         dst.connection.send(buf[:size])
         except socket.error as e:
             self.c.log("TCP connection closed unexpectedly.", "debug")