This commit refactors ARP and DHCP poisoning:

DHCP poisoning now works on Windows, additionaly it's been optimized for performance improvements
ARP poisoning has been optimized with and internal cache and some algo improvements

cve-details-parser.py has been added to the utils/ directory to help adding exploits to the BrowserSniper config file

I'm currently working on adding to the filepwn plugin all of the missing options that bdfproxy stand-alone has

core/servers/dns/DNSchef.py

@@ -47,7 +47,7 @@ from core.logger import logger
 from mitmflib.dnslib import *
 from IPy import IP
 
-formatter = logging.Formatter("%(asctime)s %(clientip)s [DNSChef] %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
+formatter = logging.Formatter("%(asctime)s %(clientip)s [DNS] %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
 log = logger().setup_logger("DNSChef", formatter)
 
 # DNSHandler Mixin. The class contains generic functions to parse DNS requests and
@@ -300,6 +300,8 @@ class DNSHandler():
     
     # Obtain a response from a real DNS server.
     def proxyrequest(self, request, host, port="53", protocol="udp"):
+        clientip = {'clientip': self.client_address[0]}
+
         reply = None
         try:
             if DNSChef().ipv6:
@@ -337,12 +339,13 @@ class DNSHandler():
 
                 sock.close()
 
-        except Exception, e:
+        except Exception as e:
             log.warning("Could not proxy request: {}".format(e), extra=clientip)
         else:
             return reply
 
     def hstsbypass(self, real_domain, fake_domain, nameservers, d):
+        clientip = {'clientip': self.client_address[0]}
 
         log.info("Resolving '{}' to '{}' for HSTS bypass".format(fake_domain, real_domain), extra=clientip)
 
@@ -477,7 +480,7 @@ class DNSChef(ConfigWatcher):
                 self.startUDP()
         except socket.error as e:
             if "Address already in use" in e:
-                shutdown("\n[DNSChef] Unable to start DNS server on port {}: port already in use".format(self.config['MITMf']['DNS']['port']))
+                shutdown("\n[DNS] Unable to start DNS server on port {}: port already in use".format(self.config['MITMf']['DNS']['port']))
 
     # Initialize and start the DNS Server        
     def startUDP(self):

core/servers/http/HTTPserver.py

@@ -17,13 +17,16 @@
 #
 import logging
 import threading
+import sys
 
+from core.utils import shutdown
 from core.configwatcher import ConfigWatcher
 from flask import Flask
 
 class HTTPserver(ConfigWatcher):
 
     server = Flask("HTTPserver")
+    func_list = []
 
     __shared_state = {}
 
@@ -31,6 +34,16 @@ class HTTPserver(ConfigWatcher):
         self.__dict__ = self.__shared_state
 
     def start_flask(self):
+
+        @self.server.route('/', defaults={'path': '/'})
+        @self.server.route('/<path:path>')
+        def catch_all(path):
+            for func in self.func_list:
+                resp = func(path)
+                if resp:
+                    return resp
+            return path
+
         self.server.run(debug=False, host='0.0.0.0', port=int(self.config['MITMf']['HTTP']['port']))
 
     def start(self):
@@ -39,6 +52,9 @@ class HTTPserver(ConfigWatcher):
         server_thread.setDaemon(True)
         server_thread.start()
 
+    def add_endpoint(self, function):
+        self.func_list.append(function)
+
     def setup_http_logger(self):
         formatter = logging.Formatter("%(asctime)s [HTTP] %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
         flask_logger = logging.getLogger('werkzeug')

core/servers/smb/KarmaSMB.py

@@ -49,14 +49,16 @@
 #       hosting. *CAREFUL!!!*
 #
 
+
 import sys
 import os
 import argparse
 import logging
 import ntpath
 import ConfigParser
+from threading import Thread
 
-from mitmflib.impacket import LOG as logger
+from mitmflib.impacket.examples import logger
 from mitmflib.impacket import smbserver, smb, version
 import mitmflib.impacket.smb3structs as smb2
 from mitmflib.impacket.smb import FILE_OVERWRITE, FILE_OVERWRITE_IF, FILE_WRITE_DATA, FILE_APPEND_DATA, GENERIC_WRITE
@@ -65,8 +67,10 @@ from mitmflib.impacket.nt_errors import STATUS_USER_SESSION_DELETED, STATUS_SUCC
 from mitmflib.impacket.smbserver import SRVSServer, decodeSMBString, findFirst2, STATUS_SMB_BAD_TID, encodeSMBString, \
     getFileTime, queryPathInformation
 
-class KarmaSMBServer():
+
+class KarmaSMBServer(Thread):
     def __init__(self, smb_challenge, smb_port, smb2Support = False):
+        Thread.__init__(self)
         self.server = 0
         self.defaultFile = None
         self.extensions = {}
@@ -105,7 +109,7 @@ class KarmaSMBServer():
         if smb2Support:
             smbConfig.set("global", "SMB2Support", "True")
 
-        self.server = smbserver.SMBSERVER(('0.0.0.0',int(smb_port)), config_parser = smbConfig)
+        self.server = smbserver.SMBSERVER(('0.0.0.0', int(smb_port)), config_parser = smbConfig)
         self.server.processConfigFile()
 
         # Unregistering some dangerous and unwanted commands
@@ -144,7 +148,6 @@ class KarmaSMBServer():
         respSetup = ''
         respParameters = ''
         respData = ''
-        errorCode = STATUS_SUCCESS
         findFirst2Parameters = smb.SMBFindFirst2_Parameters( recvPacket['Flags2'], data = parameters)
 
         # 1. Let's grab the extension and map the file's contents we will deliver
@@ -159,11 +162,6 @@ class KarmaSMBServer():
         else:
             targetFile = self.defaultFile
 
-        if (len(data) > 0):
-            findFirst2Data = smb.SMBFindFirst2_Data(data)
-        else:
-            findFirst2Data = ''
-
         if connData['ConnectedShares'].has_key(recvPacket['Tid']):
             path = connData['ConnectedShares'][recvPacket['Tid']]['path']
 
@@ -282,9 +280,7 @@ class KarmaSMBServer():
         errorCode = 0
 
         queryPathInfoParameters = smb.SMBQueryPathInformation_Parameters(flags = recvPacket['Flags2'], data = parameters)
-        if len(data) > 0: 
-           queryPathInfoData = smb.SMBQueryPathInformation_Data(data)
-  
+
         if connData['ConnectedShares'].has_key(recvPacket['Tid']):
             path = ''
             try:
@@ -327,7 +323,7 @@ class KarmaSMBServer():
         connData = smbServer.getConnectionData(connId)
         # We're closing the connection trying to flush the client's
         # cache.
-        if connData['MS15011']['StopConnection'] == True:
+        if connData['MS15011']['StopConnection'] is True:
             return [smb2.SMB2Error()], None, STATUS_USER_SESSION_DELETED
         return self.origsmb2Close(connId, smbServer, recvPacket)
 
@@ -391,7 +387,7 @@ class KarmaSMBServer():
         connData = smbServer.getConnectionData(connId)
 
         respSMBCommand = smb2.SMB2QueryDirectory_Response()
-        queryDirectoryRequest   = smb2.SMB2QueryDirectory(recvPacket['Data'])
+        #queryDirectoryRequest   = smb2.SMB2QueryDirectory(recvPacket['Data'])
 
         errorCode = 0xff
         respSMBCommand['Buffer'] = '\x00' 

core/servers/smb/SMBserver.py

@@ -25,7 +25,7 @@ class SMBserver(ConfigWatcher):
         try:
             if self.mode == 'normal':
 
-                formatter = logging.Formatter("%(asctime)s [SMBserver] %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
+                formatter = logging.Formatter("%(asctime)s [SMB] %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
                 self.conf_impacket_logger(formatter)
 
                 server = smbserver.SimpleSMBServer(listenPort=self.port)
@@ -62,8 +62,6 @@ class SMBserver(ConfigWatcher):
 
         LOG.setLevel(logging.INFO)
         LOG.propagate = False
-        logging.getLogger('smbserver').setLevel(logging.INFO)
-        logging.getLogger('impacket').setLevel(logging.INFO)
 
         fileHandler = logging.FileHandler("./logs/mitmf.log")
         streamHandler = logging.StreamHandler(sys.stdout)