mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-12-01 22:13:53 +03:00
Removing --disable... switches and making changes in default choice(s) for respectable sections
This commit is contained in:
parent
07a85874fe
commit
c1a14257a4
|
@ -190,8 +190,6 @@ optDict = {
|
||||||
"checkPayload": "boolean",
|
"checkPayload": "boolean",
|
||||||
"cleanup": "boolean",
|
"cleanup": "boolean",
|
||||||
"dependencies": "boolean",
|
"dependencies": "boolean",
|
||||||
"disableHash": "boolean",
|
|
||||||
"disableLike": "boolean",
|
|
||||||
"googlePage": "integer",
|
"googlePage": "integer",
|
||||||
"mobile": "boolean",
|
"mobile": "boolean",
|
||||||
"pageRank": "boolean",
|
"pageRank": "boolean",
|
||||||
|
|
|
@ -610,14 +610,6 @@ def cmdLineParser():
|
||||||
action="store_true",
|
action="store_true",
|
||||||
help="Check for missing sqlmap dependencies")
|
help="Check for missing sqlmap dependencies")
|
||||||
|
|
||||||
miscellaneous.add_option("--disable-hash", dest="disableHash",
|
|
||||||
action="store_true",
|
|
||||||
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")
|
||||||
|
|
||||||
|
|
|
@ -362,7 +362,7 @@ def attackDumpedTable():
|
||||||
if attack_dict:
|
if attack_dict:
|
||||||
message = "recognized possible password hashes in column%s " % ("s" if len(col_passwords) > 1 else "")
|
message = "recognized possible password hashes in column%s " % ("s" if len(col_passwords) > 1 else "")
|
||||||
message += "'%s'. Do you want to " % ", ".join(col for col in col_passwords)
|
message += "'%s'. Do you want to " % ", ".join(col for col in col_passwords)
|
||||||
message += "crack them via a dictionary-based attack? [Y/n/q]"
|
message += "crack them via a dictionary-based attack? [y/N/q]"
|
||||||
test = readInput(message, default="Y")
|
test = readInput(message, default="Y")
|
||||||
|
|
||||||
if test[0] in ("n", "N"):
|
if test[0] in ("n", "N"):
|
||||||
|
|
|
@ -1073,7 +1073,7 @@ class Enumeration:
|
||||||
logger.error(errMsg)
|
logger.error(errMsg)
|
||||||
bruteForce = True
|
bruteForce = True
|
||||||
|
|
||||||
if bruteForce or colList and conf.disableLike:
|
if bruteForce or colList:
|
||||||
resumeAvailable = False
|
resumeAvailable = False
|
||||||
|
|
||||||
for tbl in tblList:
|
for tbl in tblList:
|
||||||
|
@ -1785,9 +1785,7 @@ class Enumeration:
|
||||||
kb.data.dumpedTable["__infos__"] = {"count": entriesCount,
|
kb.data.dumpedTable["__infos__"] = {"count": entriesCount,
|
||||||
"table": safeSQLIdentificatorNaming(tbl, True),
|
"table": safeSQLIdentificatorNaming(tbl, True),
|
||||||
"db": safeSQLIdentificatorNaming(conf.db)}
|
"db": safeSQLIdentificatorNaming(conf.db)}
|
||||||
if not conf.disableHash:
|
|
||||||
attackDumpedTable()
|
attackDumpedTable()
|
||||||
|
|
||||||
conf.dumper.dbTableValues(kb.data.dumpedTable)
|
conf.dumper.dbTableValues(kb.data.dumpedTable)
|
||||||
|
|
||||||
except sqlmapConnectionException, e:
|
except sqlmapConnectionException, e:
|
||||||
|
|
|
@ -176,10 +176,10 @@ class Miscellaneous:
|
||||||
|
|
||||||
def likeOrExact(self, what):
|
def likeOrExact(self, what):
|
||||||
message = "do you want sqlmap to consider provided %s(s):\n" % what
|
message = "do you want sqlmap to consider provided %s(s):\n" % what
|
||||||
message += "[1] as LIKE %s names (default)\n" % what
|
message += "[1] as LIKE %s names\n" % what
|
||||||
message += "[2] as exact %s names" % what
|
message += "[2] as exact %s names (default)" % what
|
||||||
|
|
||||||
choice = readInput(message, default='1') if not conf.disableLike else '2'
|
choice = readInput(message, default='2')
|
||||||
|
|
||||||
if not choice or choice == '1':
|
if not choice or choice == '1':
|
||||||
choice = '1'
|
choice = '1'
|
||||||
|
|
|
@ -651,14 +651,6 @@ cleanup = False
|
||||||
# Valid: True or False
|
# Valid: True or False
|
||||||
dependencies = False
|
dependencies = False
|
||||||
|
|
||||||
# Disable password hash cracking mechanism.
|
|
||||||
# Valid: True or False
|
|
||||||
disableHash = 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
|
||||||
# Default: 1
|
# Default: 1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user