Fix for Issue #43

This commit is contained in:
Miroslav Stampar 2012-06-28 18:47:55 +02:00
parent f495cfa139
commit c8bac658f3
6 changed files with 17 additions and 8 deletions

View File

@ -185,7 +185,8 @@ optDict = {
"checkPayload": "boolean", "checkPayload": "boolean",
"cleanup": "boolean", "cleanup": "boolean",
"dependencies": "boolean", "dependencies": "boolean",
"exact": "boolean", "disableCracking": "boolean",
"disableLike": "boolean",
"googlePage": "integer", "googlePage": "integer",
"mobile": "boolean", "mobile": "boolean",
"pageRank": "boolean", "pageRank": "boolean",

View File

@ -590,9 +590,13 @@ def cmdLineParser():
action="store_true", action="store_true",
help="Check for missing sqlmap dependencies") help="Check for missing sqlmap dependencies")
miscellaneous.add_option("--exact", dest="exact", miscellaneous.add_option("--disable-cracking", dest="disableCracking",
action="store_true", 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", miscellaneous.add_option("--gpage", dest="googlePage", type="int",
help="Use Google dork results from specified page number") help="Use Google dork results from specified page number")

View File

@ -55,7 +55,7 @@ def __oneShotUnionUse(expression, unpack=True, limited=False):
if retVal is None: if retVal is None:
check = "(?P<result>%s.*%s)" % (kb.chars.start, kb.chars.stop) 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 # Prepare expression with delimiters
injExpression = unescaper.unescape(agent.concatQuery(expression, unpack)) injExpression = unescaper.unescape(agent.concatQuery(expression, unpack))

View File

@ -1033,7 +1033,7 @@ class Enumeration:
logger.error(errMsg) logger.error(errMsg)
bruteForce = True bruteForce = True
if bruteForce or colList and conf.exact: if bruteForce or colList and conf.disableLike:
resumeAvailable = False resumeAvailable = False
for tbl in tblList: for tbl in tblList:

View File

@ -169,7 +169,7 @@ class Miscellaneous:
message += "[1] as LIKE %s names (default)\n" % what message += "[1] as LIKE %s names (default)\n" % what
message += "[2] as exact %s names" % 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': if not choice or choice == '1':
choice = '1' choice = '1'

View File

@ -632,9 +632,13 @@ cleanup = False
# Valid: True or False # Valid: True or False
dependencies = False dependencies = False
# Prefer usage of exactly provided identificator names. # Disable password hash cracking mechanism.
# Valid: True or False # 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. # Use Google dork results from specified page number.
# Valid: integer # Valid: integer