TOR mode help option improvents

owtf · Apr 4, 2014 · 204980f · 204980f
1 parent e436221
commit 204980f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/framework/core.py b/framework/core.py
@@ -159,17 +159,17 @@ def start_reporter(self):
 
     def Start_TOR_Mode(self, Options):
         if Options['TOR_mode'] != None:
-            if Options['TOR_mode'][0] != "help":
-                if tor_manager.TOR_manager.is_tor_running():
-                    self.TOR_process = tor_manager.TOR_manager(self, Options['TOR_mode'])
-                    self.TOR_process = self.TOR_process.Run()
-                else:
-                    tor_manager.TOR_manager.msg_start_tor(self)
-                    tor_manager.TOR_manager.msg_configure_tor(self)
-                    self.Error.FrameworkAbort("TOR Daemon is not running")
+            #if Options['TOR_mode'][0] != "help":
+            if tor_manager.TOR_manager.is_tor_running():
+                self.TOR_process = tor_manager.TOR_manager(self, Options['TOR_mode'])
+                self.TOR_process = self.TOR_process.Run()
             else:
+                tor_manager.TOR_manager.msg_start_tor(self)
                 tor_manager.TOR_manager.msg_configure_tor()
-                self.Error.FrameworkAbort("Configuration help is running")
+                self.Error.FrameworkAbort("TOR Daemon is not running")
+            #else:
+                #tor_manager.TOR_manager.msg_configure_tor()
+                #self.Error.FrameworkAbort("Configuration help is running")
 
     def StartBotnetMode(self, Options):
         self.Proxy_manager = None

diff --git a/framework/http/proxy/tor_manager.py b/framework/http/proxy/tor_manager.py
@@ -97,7 +97,7 @@ def Open_connection(self):
             cprint("Connected to TOR control")
             return s
         except Exception as error:
-            self.core.Error.FrameworkAbort("Can't connect to the TOR daemon : " + error.strerror)
+            self.core.Error.FrameworkAbort("Can't connect to the TOR Control port daemon : " + error.strerror)
 
     #Starts a new TOR_control_process which will renew the IP address.
     def Run(self):
@@ -117,7 +117,10 @@ def is_tor_running():
     @staticmethod
     def msg_start_tor(self):
         cprint ("""Error : TOR daemon is not running
-                (Tips: service tor start)""")
+                (Tips: 
+                Start TOR --> service tor start)
+                See if tor is running --> service tor status
+                """)
 
     #TOR configuration Info
     @staticmethod

diff --git a/owtf.py b/owtf.py
@@ -42,7 +42,7 @@
 from framework import core
 from framework.lib.general import *
 from framework import update
-
+from framework.http.proxy import tor_manager # Is needed for printing configuration help
 def Banner():
     print("""
                   __       ___  
@@ -286,7 +286,9 @@ def ProcessOptions(Core, user_args):
 
     if Arg.TOR_mode:
         Arg.TOR_mode = Arg.TOR_mode.split(":")
-        print(Arg.TOR_mode[0])
+        if(Arg.TOR_mode[0] == "help"):
+            tor_manager.TOR_manager.msg_configure_tor()
+            exit(0);
         if len(Arg.TOR_mode) == 1:
             if Arg.TOR_mode[0] != "help":
                 Usage("Invalid argument for TOR-mode")