- Made user_agent lib optional for Kali

byt3bl33d3r · Jan 22, 2015 · b46b4dc · b46b4dc
1 parent 5100458
commit b46b4dc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/libs/bdfactory b/libs/bdfactory
diff --git a/libs/sslstrip/ServerConnection.py b/libs/sslstrip/ServerConnection.py
@@ -19,7 +19,11 @@
 import logging, re, string, random, zlib, gzip, StringIO, sys
 import plugins
 
-from user_agents import parse
+try:
+    from user_agents import parse
+except:
+    pass
+
 from twisted.web.http import HTTPClient
 from URLMonitor import URLMonitor
 from libs.sergioproxy.ProxyPlugins import ProxyPlugins
@@ -74,8 +78,8 @@ def isHsts(self):
 
     def sendRequest(self):
         if self.command == 'GET':
-            user_agent = parse(self.headers['user-agent'])
             try:
+                user_agent = parse(self.headers['user-agent'])
                 self.clientInfo = "%s [type:%s-%s os:%s] "  % (self.client.getClientIP(), user_agent.browser.family, user_agent.browser.version[0], user_agent.os.family)
             except:
                 self.clientInfo = "%s " % self.client.getClientIP()

diff --git a/mitmf.py b/mitmf.py
@@ -6,13 +6,14 @@
 from libs.sslstrip.CookieCleaner import CookieCleaner
 from libs.sergioproxy.ProxyPlugins import ProxyPlugins
 
-import sys, logging, traceback, string, os
+import sys
+import logging
 import argparse
 
 try:
     import user_agents
 except:
-    sys.exit("[-] user_agents library not installed!")
+    pass
 
 try:
     from configobj import ConfigObj
@@ -94,7 +95,7 @@
     logging.basicConfig(level=log_level, format="%(asctime)s %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
     logFormatter = logging.Formatter("%(asctime)s %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
     rootLogger = logging.getLogger()
-    
+
     fileHandler = logging.FileHandler("./logs/mitmf.log")
     fileHandler.setFormatter(logFormatter)
     rootLogger.addHandler(fileHandler)
+26 −0		README.md
+1 −1		backdoor.py
+4 −1		elfbin.py
+1 −1		install.sh
+40 −2		intel/MachoIntel32.py
+46 −2		intel/MachoIntel64.py
+4 −4		intel/WinIntelPE32.py
+3 −3		intel/WinIntelPE64.py
+19 −3		intel/intelCore.py
+5 −0		machobin.py
+148 −0		payloadtests.py
+8 −2		pebin.py
+2 −1		update.sh