Merge pull request trustedsec#524 from realagentwhite/master

Bug fix and changes
S0U1SB4N3 · May 7, 2020 · 4ab2882 · 4ab2882
2 parents 371a67e + 0585818
commit 4ab2882
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 32 deletions.
diff --git a/modules/intelligence-gathering/autorecon.py b/modules/intelligence-gathering/autorecon.py
@@ -30,7 +30,7 @@
 AFTER_COMMANDS="cd {INSTALL_LOCATION}, pip3 install -r requirements.txt"
 
 # AUTOMATIC LAUNCH
-LAUNCHER="autorecon.py"
+LAUNCHER="autorecon"
 
 # needed for install
 #BYPASS_UPDATE="YES"
diff --git a/modules/wireless/wifite2.py b/modules/wireless/wifite2.py
@@ -8,7 +8,6 @@
 
 # DESCRIPTION OF THE MODULE
 DESCRIPTION="This module will install/update wifite2 - a tool for wireless auditing"
-
 # INSTALL TYPE GIT, SVN, FILE DOWNLOAD
 # OPTIONS = GIT, SVN, FILE
 INSTALL_TYPE="GIT"

diff --git a/ptf b/ptf
@@ -102,4 +102,4 @@ if __name__ == "__main__":
     except Exception as e:
         print_error("[!] DANGER WILL ROBINSON. DANGER WILL ROBINSON. Error has occurred.")
         print_error("[!] It's not possible its due to my coding skillz, it must be you? :-)")
-        print_error(("[!] Printing that error. Get that error. You get it: " + str(e)))
+        print_error(("[!] Printing that error. Get that error. You get it: [" + str(e) + "]"))
diff --git a/src/core.py b/src/core.py
@@ -118,29 +118,29 @@ def count_modules():
 # banner
 banner = bcolors.RED + r"""
 
-                     ______  __ __    ___
-                    |      T|  T  T  /  _]
-                    |      ||  l  | /  [_
-                    l_j  l_j|  _  |Y    _]
-                      |  |  |  |  ||   [_
-                      |  |  |  |  ||     T
-                      l__j  l__j__jl_____j
-
- ____     ___  ____   ______    ___   _____ ______    ___  ____    _____
-|    \   /  _]|    \ |      T  /  _] / ___/|      T  /  _]|    \  / ___/
-|  o  ) /  [_ |  _  Y|      | /  [_ (   \_ |      | /  [_ |  D  )(   \_
-|   _/ Y    _]|  |  |l_j  l_jY    _] \__  Tl_j  l_jY    _]|    /  \__  T
-|  |   |   [_ |  |  |  |  |  |   [_  /  \ |  |  |  |   [_ |    \  /  \ |
-|  |   |     T|  |  |  |  |  |     T \    |  |  |  |     T|  .  Y \    |
-l__j   l_____jl__j__j  l__j  l_____j  \___j  l__j  l_____jl__j\_j  \___j
-
- _____  ____    ____  ___ ___    ___  __    __   ___   ____   __  _
-|     ||    \  /    T|   T   T  /  _]|  T__T  T /   \ |    \ |  l/ ]
-|   __j|  D  )Y  o  || _   _ | /  [_ |  |  |  |Y     Y|  D  )|  ' /
-|  l_  |    / |     ||  \_/  |Y    _]|  |  |  ||  O  ||    / |    \
-|   _] |    \ |  _  ||   |   ||   [_ l  `  '  !|     ||    \ |     Y
-|  T   |  .  Y|  |  ||   |   ||     T \      / l     !|  .  Y|  .  |
-l__j   l__j\_jl__j__jl___j___jl_____j  \_/\_/   \___/ l__j\_jl__j\_j
+
+                            ████████╗██╗  ██╗███████╗                                   
+                            ╚══██╔══╝██║  ██║██╔════╝                                   
+                               ██║   ███████║█████╗                                     
+                               ██║   ██╔══██║██╔══╝                                     
+                               ██║   ██║  ██║███████╗                                   
+                               ╚═╝   ╚═╝  ╚═╝╚══════╝                                   
+                                                                                        
+    ██████╗ ███████╗███╗   ██╗████████╗███████╗███████╗████████╗███████╗██████╗ ███████╗
+    ██╔══██╗██╔════╝████╗  ██║╚══██╔══╝██╔════╝██╔════╝╚══██╔══╝██╔════╝██╔══██╗██╔════╝
+    ██████╔╝█████╗  ██╔██╗ ██║   ██║   █████╗  ███████╗   ██║   █████╗  ██████╔╝███████╗
+    ██╔═══╝ ██╔══╝  ██║╚██╗██║   ██║   ██╔══╝  ╚════██║   ██║   ██╔══╝  ██╔══██╗╚════██║
+    ██║     ███████╗██║ ╚████║   ██║   ███████╗███████║   ██║   ███████╗██║  ██║███████║
+    ╚═╝     ╚══════╝╚═╝  ╚═══╝   ╚═╝   ╚══════╝╚══════╝   ╚═╝   ╚══════╝╚═╝  ╚═╝╚══════╝
+                                                                                        
+    ███████╗██████╗  █████╗ ███╗   ███╗███████╗██╗    ██╗ ██████╗ ██████╗ ██╗  ██╗      
+    ██╔════╝██╔══██╗██╔══██╗████╗ ████║██╔════╝██║    ██║██╔═══██╗██╔══██╗██║ ██╔╝      
+    █████╗  ██████╔╝███████║██╔████╔██║█████╗  ██║ █╗ ██║██║   ██║██████╔╝█████╔╝       
+    ██╔══╝  ██╔══██╗██╔══██║██║╚██╔╝██║██╔══╝  ██║███╗██║██║   ██║██╔══██╗██╔═██╗       
+    ██║     ██║  ██║██║  ██║██║ ╚═╝ ██║███████╗╚███╔███╔╝╚██████╔╝██║  ██║██║  ██╗      
+    ╚═╝     ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝     ╚═╝╚══════╝ ╚══╝╚══╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝      
+
+
 """
 
 banner += bcolors.ENDC + """
@@ -151,7 +151,7 @@ def count_modules():
 banner += """        		   """ + bcolors.backBlue + \
     """Version: %s""" % (grab_version) + bcolors.ENDC + "\n"
 
-banner += bcolors.YELLOW + bcolors.BOLD + """		    Codename: """ + \
+banner += bcolors.YELLOW + bcolors.BOLD + """		        Codename: """ + \
     bcolors.BLUE + """Toolsmith""" + "\n"
 
 banner += """		         """ + bcolors.ENDC + bcolors.backRed + \

diff --git a/src/framework.py b/src/framework.py
@@ -23,8 +23,12 @@
 try: input = raw_input
 except NameError: pass
 
-# print the main welcome banner
-print (banner)
+# If user does not want the awesome banner, do not print it out
+if '-nb' in sys.argv or '--no-banner' in sys.argv:
+    pass
+else:
+    # print the main welcome banner
+    print (banner)
 
 # funny random banner
 import random
@@ -195,10 +199,11 @@ def discover_module_filename(module):
     modules_path = os.getcwd() + "/modules/"
     for path, subdirs, files in os.walk(modules_path):
         for name in sorted(files):
-            if name in ('__init__.py', 'install_update_all.py', 'update_installed.py'): continue
+            if name in ('__init__.py', 'install_update_all.py', 'update_installed.py'):
+                continue
             name_short = name.replace(".py","")
-            name_short = name.replace(".txt", "")
-            if name_short == module: return os.path.join(path, name)
+            if name_short == module:
+                return os.path.join(path, name)
 
     raise Exception("module not found")