WPAD Poisoner back online, removed options in config file and rellative code for choosing which DNS server to use. (there really was not point in keeping it)

the --basic and --force options and the EXE serving in the Responder plugin have been removed, until I can find a better way of implementing them.
Modified and re-added the JS-keylogger and SMBauth plugins

core/sslstrip/ClientRequest.py

@@ -192,21 +192,14 @@ class ClientRequest(Request):
         else:
             
             mitmf_logger.debug("[ClientRequest] Host not cached.")
-            
-            if self.urlMonitor.getResolver() == 'dnschef':
+            self.customResolver.port = self.urlMonitor.getResolverPort()
 
-                self.customResolver.port = self.urlMonitor.getResolverPort()
-
-                try:
-                    mitmf_logger.debug("[ClientRequest] Resolving with DNSChef")
-                    address = str(self.customResolver.query(host)[0].address)
-                    return defer.succeed(address)
-                except Exception:
-                    mitmf_logger.debug("[ClientRequest] Exception occured, falling back to Twisted")
-                    return reactor.resolve(host)
-
-            elif self.urlMonitor.getResolver() == 'twisted':
-                mitmf_logger.debug("[ClientRequest] Resolving with Twisted")
+            try:
+                mitmf_logger.debug("[ClientRequest] Resolving with DNSChef")
+                address = str(self.customResolver.query(host)[0].address)
+                return defer.succeed(address)
+            except Exception:
+                mitmf_logger.debug("[ClientRequest] Exception occured, falling back to Twisted")
                 return reactor.resolve(host)
 
     def process(self):

core/sslstrip/ServerConnection.py

@@ -71,7 +71,8 @@ class ServerConnection(HTTPClient):
             try:
                 user_agent = parse(self.headers['user-agent'])
                 self.clientInfo = "{} [type:{}-{} os:{}] ".format(self.client.getClientIP(), user_agent.browser.family, user_agent.browser.version[0], user_agent.os.family)
-            except:
+            except Exception as e:
+                mitmf_logger.debug("[ServerConnection] Failed to parse client UA: {}".format(e))
                 self.clientInfo = "{} ".format(self.client.getClientIP())
 
             mitmf_logger.info(self.clientInfo + "Sending Request: {}".format(self.headers['host']))
@@ -135,7 +136,7 @@ class ServerConnection(HTTPClient):
                 self.isCompressed = True
 
         elif (key.lower()== 'strict-transport-security'):
-            mitmf_logger.info("{} Zapped a strict-trasport-security header".format(self.client.getClientIP()))
+            mitmf_logger.info("{} Zapped a strict-trasport-security header".format(self.clientInfo))
 
         elif (key.lower() == 'content-length'):
             self.contentLength = value
@@ -181,7 +182,7 @@ class ServerConnection(HTTPClient):
             mitmf_logger.debug("[ServerConnection] Read from server {} bytes of data".format(len(data)))
 
         data = self.replaceSecureLinks(data)
-        res = self.plugins.hook()
+        res  = self.plugins.hook()
         data = res['data']
 
         if (self.contentLength != None):

core/sslstrip/URLMonitor.py

@@ -53,10 +53,6 @@ class URLMonitor:
 
         return URLMonitor._instance
     
-    #This is here because I'm lazy
-    def getResolver(self):
-        return ConfigWatcher.getInstance().getConfig()['MITMf']['DNS']['resolver'].lower()
-    
     #This is here because I'm lazy
     def getResolverPort(self):
         return int(ConfigWatcher.getInstance().getConfig()['MITMf']['DNS']['port'])