Fix for Issue #43

stamparm · stamparm · commit c8bac658f374 · 2012-06-28T18:47:55.000+02:00
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
@@ -185,7 +185,8 @@
                                "checkPayload":      "boolean",
                                "cleanup":           "boolean",
                                "dependencies":      "boolean",
-                               "exact":             "boolean",
+                               "disableCracking":   "boolean",
+                               "disableLike":       "boolean",
                                "googlePage":        "integer",
                                "mobile":            "boolean",
                                "pageRank":          "boolean",
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
@@ -590,9 +590,13 @@ def cmdLineParser():
                                   action="store_true",
                                   help="Check for missing sqlmap dependencies")
 
-        miscellaneous.add_option("--exact", dest="exact",
+        miscellaneous.add_option("--disable-cracking", dest="disableCracking",
                                   action="store_true",
-                                  help="Prefer usage of exactly provided identificator names")
+                                  help="Disable password hash cracking mechanism")
+
+        miscellaneous.add_option("--disable-like", dest="disableLike",
+                                  action="store_true",
+                                  help="Disable LIKE search of identificator names")
 
         miscellaneous.add_option("--gpage", dest="googlePage", type="int",
                                   help="Use Google dork results from specified page number")
diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py
@@ -55,7 +55,7 @@ def __oneShotUnionUse(expression, unpack=True, limited=False):
 
     if retVal is None:
         check = "(?P<result>%s.*%s)" % (kb.chars.start, kb.chars.stop)
-        trimcheck = "%s(?P<result>.*?)</" % (kb.chars.start)
+        trimcheck = "%s(?P<result>.*?)<" % (kb.chars.start)
 
         # Prepare expression with delimiters
         injExpression = unescaper.unescape(agent.concatQuery(expression, unpack))
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
@@ -1033,7 +1033,7 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None):
                 logger.error(errMsg)
                 bruteForce = True
 
-        if bruteForce or colList and conf.exact:
+        if bruteForce or colList and conf.disableLike:
             resumeAvailable = False
 
             for tbl in tblList:
diff --git a/plugins/generic/misc.py b/plugins/generic/misc.py
@@ -169,7 +169,7 @@ def likeOrExact(self, what):
         message += "[1] as LIKE %s names (default)\n" % what
         message += "[2] as exact %s names" % what
 
-        choice = readInput(message, default='1') if not conf.exact else '2'
+        choice = readInput(message, default='1') if not conf.disableLike else '2'
 
         if not choice or choice == '1':
             choice = '1'
diff --git a/sqlmap.conf b/sqlmap.conf
@@ -632,9 +632,13 @@ cleanup = False
 # Valid: True or False
 dependencies = False
 
-# Prefer usage of exactly provided identificator names.
+# Disable password hash cracking mechanism.
 # Valid: True or False
-exact = False
+disableCracking = False
+
+# Disable LIKE search of identificator names.
+# Valid: True or False
+disableLike = False
 
 # Use Google dork results from specified page number.
 # Valid: integer
