From 088c815567743dcff976b8c3b1a99a1fe48de8e5 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sat, 19 Mar 2011 18:28:51 +0000
Subject: [PATCH] minor update (exposing --tor switch)

---
 lib/core/optiondict.py |  2 ++
 lib/parse/cmdline.py   |  7 ++++---
 sqlmap.conf            | 10 +++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index 0a4a62a3a..88f87a82a 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -160,7 +160,9 @@ optDict = {
                                "checkPayload":      "boolean",
                                "cleanup":           "boolean",
                                "googlePage":        "integer",
+                               "parseErrors":       "boolean",
                                "replicate":         "boolean",
+                               "tor":               "boolean",
                                "verbose":           "integer"
                              },
           }
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 718cd1e24..55af03c28 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -495,6 +495,10 @@ def cmdLineParser():
                                   action="store_true", default=False,
                                   help="Replicate dumped data into a sqlite3 database")
 
+        miscellaneous.add_option("--tor", dest="tor", 
+                                  action="store_true", default=False,
+                                  help="Use default Tor (Vidalia/Privoxy/Polipo) proxy address")
+
         # Hidden and/or experimental options
         parser.add_option("--profile", dest="profile", action="store_true",
                           default=False, help=SUPPRESS_HELP)
@@ -514,9 +518,6 @@ def cmdLineParser():
         parser.add_option("--technique", dest="technique", type="int",
                           default=0, help=SUPPRESS_HELP)
 
-        parser.add_option("--tor", dest="tor", action="store_true",
-                          default=False, help=SUPPRESS_HELP)
-
         parser.add_option_group(target)
         parser.add_option_group(request)
         parser.add_option_group(optimization)
diff --git a/sqlmap.conf b/sqlmap.conf
index d52dbe2c7..f8d88080a 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -510,7 +510,7 @@ beep = False
 # IDS detection testing of injection payloads.
 checkPayload = False
 
-# Clean up the DBMS by sqlmap specific UDF and tables
+# Clean up the DBMS by sqlmap specific UDF and tables.
 # Valid: True or False
 cleanup = False
 
@@ -518,12 +518,12 @@ cleanup = False
 # Valid: True or False
 forms = False
 
-# Use google dork results from specified page number
+# Use google dork results from specified page number.
 # Valid: integer
 # Default: 1
 googlePage = 1
 
-# Parse DBMS error messages from response pages
+# Parse DBMS error messages from response pages.
 # Valid: True or False
 parseErrors = False
 
@@ -531,6 +531,10 @@ parseErrors = False
 # Valid: True or False
 replicate = False
 
+# Use default Tor (Vidalia/Privoxy/Polipo) proxy address.
+# Valid: True or False
+replicate = False
+
 # Verbosity level.
 # Valid: integer between 0 and 6
 # 0: Show only error and critical messages