Merge branch 'taste-proxy-poc' of https://github.com/mlhaigh/flare-fa…

…kenet-ng into taste-proxy-poc

fakenet/fakenet.py

@@ -184,18 +184,9 @@ def start(self):
                 self.logger.error("%s" % e)
 
             else:
-                # Listener provider object
-                #listener_provider_instance = listener_provider(listener_config, listener_name, self.logging_level, self.running_listener_providers)
-
-                # Only pass the listeners to the proxy
-                if ('proxy' in listener_config and 
-                        listener_config['proxy'] == 'True'):
-                    listener_provider_instance = listener_provider(
-                            listener_config, listener_name, self.logging_level, 
-                            self.running_listener_providers, self.diverter)
-                else:
-                    listener_provider_instance = listener_provider(
-                            listener_config, listener_name, self.logging_level)
+
+                listener_provider_instance = listener_provider(
+                        listener_config, listener_name, self.logging_level)
 
                 # Store listener provider object
                 self.running_listener_providers.append(listener_provider_instance)
@@ -210,6 +201,24 @@ def start(self):
         if self.diverter:
             self.diverter.start()
 
+        for listener in self.running_listener_providers:
+
+            # Only listeners that implement acceptListeners(listeners) 
+            # interface receive running_listener_providers
+            try:
+                #if callable(getattr(listener_provider, 'acceptListeners')):
+                listener.acceptListeners(self.running_listener_providers)
+            except:
+                pass
+
+            # Only listeners that implement acceptDiverter(diverter) 
+            # interface receive diverter
+            try:
+            #if callable(getattr(listener_provider, 'acceptDiverter')):
+                listener.acceptDiverter(self.diverter)
+            except Exception as e:
+                pass
+
     def stop(self):
 
         self.logger.info("Stopping...")

fakenet/listeners/DNSListener.py

@@ -29,8 +29,6 @@ def __init__(
             config={}, 
             name='DNSListener', 
             logging_level=logging.INFO, 
-            running_listeners=None,
-            diverter=None
             ):
 
         self.logger = logging.getLogger(name)
@@ -39,8 +37,6 @@ def __init__(
         self.config = config
         self.local_ip = '0.0.0.0'
         self.server = None
-        self.running_listeners = running_listeners
-        self.diverter = diverter
         self.name = 'DNS'
         self.port = 53
 

fakenet/listeners/HTTPListener.py

@@ -40,10 +40,10 @@ def taste(self, data, dport):
 
         for method in request_methods:
             if data.lstrip().startswith(method):
-                return confidence + 2 
+                confidence += 2
 
         if ssl_detector.looks_like_ssl(data):
-            return confidence + 2
+            confidence += 1
 
         return confidence
 
@@ -59,8 +59,7 @@ def __init__(
             config={}, 
             name='HTTPListener', 
             logging_level=logging.DEBUG, 
-            running_listeners=None, 
-            diverter=None):
+            ):
 
         self.logger = logging.getLogger(name)
         self.logger.setLevel(logging_level)
@@ -69,8 +68,6 @@ def __init__(
         self.name = name
         self.local_ip  = '0.0.0.0'
         self.server = None
-        self.running_listeners = running_listeners
-        self.diverter = diverter
         self.name = 'HTTP'
         self.port = '80'
 

fakenet/listeners/IRCListener.py

@@ -24,8 +24,6 @@ def __init__(self,
             config, 
             name='IRCListener', 
             logging_level=logging.INFO, 
-            running_listeners=None,
-            diverter=None
             ):
 
         self.logger = logging.getLogger(name)
@@ -35,7 +33,6 @@ def __init__(self,
         self.name = name
         self.local_ip = '0.0.0.0'
         self.server = None
-        self.running_listeners = running_listeners
         self.name = 'IRC'
         self.port = None
 

fakenet/listeners/POPListener.py

@@ -30,8 +30,6 @@ def __init__(self,
             config, 
             name='POPListener', 
             logging_level=logging.INFO, 
-            running_listeners=None,
-            diverter=None
             ):
 
         self.logger = logging.getLogger(name)
@@ -41,7 +39,6 @@ def __init__(self,
         self.name = name
         self.local_ip = '0.0.0.0'
         self.server = None
-        self.running_listeners = running_listeners
         self.name = 'POP'
         self.port = 110
 

fakenet/listeners/ProxyListener.py

@@ -18,8 +18,6 @@
 BUF_SZ = 1024
 IP = '0.0.0.0'
 
-#sys.path.insert(0, './listeners')
-
 class ProxyListener():
 
 
@@ -28,8 +26,6 @@ def __init__(
             config={}, 
             name ='ProxyListener', 
             logging_level=logging.DEBUG, 
-            running_listeners=None,
-            diverter=None
             ):
 
         self.logger = logging.getLogger(name)
@@ -38,8 +34,6 @@ def __init__(
         self.config = config
         self.name = name
         self.server = None
-        self.running_listeners = running_listeners
-        self.diverter = diverter
 
         self.logger.info('Starting...')
 
@@ -76,8 +70,8 @@ def start(self):
 
         self.server.config = self.config
         self.server.logger = self.logger
-        self.server.running_listeners = self.running_listeners
-        self.server.diverter = self.diverter
+        self.server.running_listeners = None
+        self.server.diverter = None
         self.server_thread = threading.Thread(
                 target=self.server.serve_forever)
         self.server_thread.daemon = True
@@ -91,8 +85,13 @@ def stop(self):
         if self.server:
             self.server.shutdown()
             self.server.server_close()
-
 
+    def acceptListeners(self, listeners):
+        self.server.listeners = listeners
+
+    def acceptDiverter(self, diverter):
+        self.server.diverter = diverter
+
 class ThreadedClientSocket(threading.Thread):
 
 
@@ -136,6 +135,7 @@ class ThreadedUDPServer(SocketServer.ThreadingMixIn, SocketServer.UDPServer):
 def get_top_listener(config, data, listeners, diverter, orig_src_ip, 
         orig_src_port, proto):
 
+
     top_listener = None
     top_confidence = 0
     dport = diverter.getOriginalDestPort(orig_src_ip, orig_src_port, proto)
@@ -192,8 +192,9 @@ def handle(self):
 
             orig_src_ip = self.client_address[0]
             orig_src_port = self.client_address[1]
+
             top_listener = get_top_listener(self.server.config, data, 
-                    self.server.running_listeners, self.server.diverter, 
+                    self.server.listeners, self.server.diverter, 
                     orig_src_ip, orig_src_port, 'TCP')
 
             if top_listener:
@@ -250,8 +251,9 @@ def handle(self):
 
             orig_src_ip = self.client_address[0]
             orig_src_port = self.client_address[1]
+
             top_listener = get_top_listener(self.server.config, data, 
-                    self.server.running_listeners, self.server.diverter, 
+                    self.server.listeners, self.server.diverter, 
                     orig_src_ip, orig_src_port, 'UDP')
 
             if top_listener:

fakenet/listeners/RawListener.py

@@ -19,8 +19,6 @@ def __init__(self,
             config, 
             name='RawListener', 
             logging_level=logging.INFO, 
-            running_listeners=None,
-            diverter=None
             ):
 
         self.logger = logging.getLogger(name)
@@ -30,7 +28,6 @@ def __init__(self,
         self.name = name
         self.local_ip = '0.0.0.0'
         self.server = None
-        self.running_listeners = running_listeners
         self.name = 'Raw'
         self.port = 1337
 

fakenet/listeners/SMTPListener.py

@@ -21,8 +21,6 @@ def __init__(
             config, 
             name='SMTPListener', 
             logging_level=logging.INFO,
-            running_listeners=None,
-            diverter=None
             ):
 
         self.logger = logging.getLogger(name)
@@ -32,7 +30,6 @@ def __init__(
         self.name = name
         self.local_ip = '0.0.0.0'
         self.server = None
-        self.running_listeners = running_listeners
         self.name = 'SMTP'
         self.port = 587
 

fakenet/listeners/TFTPListener.py

@@ -39,8 +39,6 @@ def __init__(self,
             config, 
             name='TFTPListener', 
             logging_level=logging.INFO, 
-            running_listeners=None,
-            diverter=None
             ):
 
         self.logger = logging.getLogger(name)
@@ -50,7 +48,6 @@ def __init__(self,
         self.name = name
         self.local_ip = '0.0.0.0'
         self.server = None
-        self.running_listeners = running_listeners
         self.name = 'TFTP'
         self.port = 69