Minor adjustments

bdamele · bdamele · commit a654a426efd3 · 2010-03-03T16:19:17.000Z
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -48,6 +48,7 @@
 from lib.core.exception import sqlmapFilePathException
 from lib.core.exception import sqlmapNoneDataException
 from lib.core.exception import sqlmapSyntaxException
+from lib.core.settings import DESCRIPTION
 from lib.core.settings import IS_WIN
 from lib.core.settings import SITE
 from lib.core.settings import SQL_STATEMENTS
@@ -515,9 +516,9 @@ def banner():
     """
 
     print """
+    %s - %s
     %s
-    %s
-    """ % (VERSION_STRING, SITE)
+    """ % (VERSION_STRING, DESCRIPTION, SITE)
     
 def parsePasswordHash(password):
     blank = " " * 8
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
@@ -46,12 +46,12 @@
                                "aCred":             "string",
                                "aCert":             "string",
                                "proxy":             "string",
+                               "ignoreProxy":       "boolean",
                                "threads":           "integer",
                                "delay":             "float",
                                "timeout":           "float",
                                "retries":           "integer",
-                               "scope":             "string",
-                               "ignoreProxy":       "boolean"
+                               "scope":             "string"
                              },
 
             "Injection":     {
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -28,7 +28,8 @@
 
 # sqlmap version and site
 VERSION            = "0.8-rc7"
-VERSION_STRING     = "sqlmap/%s - automatic SQL injection and database takeover tool" % VERSION
+VERSION_STRING     = "sqlmap/%s" % VERSION
+DESCRIPTION        = "automatic SQL injection and database takeover tool"
 SITE               = "http://sqlmap.sourceforge.net"
 
 # sqlmap logger
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
@@ -111,6 +111,10 @@ def cmdLineParser():
         request.add_option("--proxy", dest="proxy",
                            help="Use a HTTP proxy to connect to the target url")
 
+        request.add_option("--ignore-proxy", dest="ignoreProxy",
+                            action="store_true",
+                           help="Ignore system default HTTP proxy")
+
         request.add_option("--threads", dest="threads", type="int", default=1,
                            help="Maximum number of concurrent HTTP "
                                 "requests (default 1)")
@@ -129,10 +133,6 @@ def cmdLineParser():
         request.add_option("--scope", dest="scope", 
                            help="Regexp to filter targets from provided proxy log")
 
-        request.add_option("--ignore-proxy", dest="ignoreProxy",
-                            action="store_true",
-                           help="Ignore system default HTTP proxy")
-
         # Injection options
         injection = OptionGroup(parser, "Injection", "These options can be "
                                 "used to specify which parameters to test "
diff --git a/sqlmap.conf b/sqlmap.conf
@@ -81,6 +81,10 @@ aCert =
 # Syntax: http://address:port
 proxy = 
 
+# Ignore system default HTTP proxy
+# Valid: True or False
+ignoreProxy = False
+
 # Maximum number of concurrent HTTP requests (handled with Python threads)
 # to be used in the inference SQL injection attack.
 # Valid: integer
@@ -107,10 +111,6 @@ retries = 3
 # Example: (google|yahoo)
 scope = 
 
-# Ignore system default HTTP proxy
-# Valid: True or False
-ignoreProxy = False
-
 [Injection]
 
 # Testable parameter(s) comma separated. By default all GET/POST/Cookie
