sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 09:36:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Miroslav Stampar 2011-06-22 14:39:31 +00:00
parent 938db1b513
commit 84bc8c3a37
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/core/option.py
View File

@ -1325,8 +1325,11 @@ def __cleanupOptions():
if conf.optimize: if conf.optimize:
#conf.predictOutput = True #conf.predictOutput = True
conf.keepAlive = True conf.keepAlive = True
conf.nullConnection = not any([conf.textOnly, conf.titles])
conf.threads = 3 if conf.threads < 3 else conf.threads conf.threads = 3 if conf.threads < 3 else conf.threads
conf.nullConnection = not any([conf.data, conf.textOnly, conf.titles, conf.string, conf.regexp])
if not conf.nullConnection:
debugMsg = "turning off --null-connection switch used indirectly by switch -o"
logger.debug(debugMsg)
if conf.data: if conf.data:
conf.data = urldecode(conf.data) conf.data = urldecode(conf.data)
@ -1337,12 +1340,6 @@ def __cleanupOptions():
if conf.dbms: if conf.dbms:
conf.dbms = conf.dbms.capitalize() conf.dbms = conf.dbms.capitalize()
if conf.optimize and any([conf.data, conf.textOnly, conf.titles]):
conf.nullConnection = False
debugMsg = "turning off --null-connection switch used indirectly by switch -o"
logger.debug(debugMsg)
if conf.timeSec not in kb.explicitSettings: if conf.timeSec not in kb.explicitSettings:
if conf.tor: if conf.tor:
conf.timeSec = 2 * conf.timeSec conf.timeSec = 2 * conf.timeSec
@ -1749,6 +1746,14 @@ def __basicOptionValidation():
errMsg = "switch --data is incompatible with switch --null-connection" errMsg = "switch --data is incompatible with switch --null-connection"
raise sqlmapSyntaxException, errMsg raise sqlmapSyntaxException, errMsg
if conf.string and conf.nullConnection:
errMsg = "switch --string is incompatible with switch --null-connection"
raise sqlmapSyntaxException, errMsg
if conf.regexp and conf.nullConnection:
errMsg = "switch --regexp is incompatible with switch --null-connection"
raise sqlmapSyntaxException, errMsg
if conf.predictOutput and conf.threads > 1: if conf.predictOutput and conf.threads > 1:
errMsg = "switch --predict-output is incompatible with switch --threads" errMsg = "switch --predict-output is incompatible with switch --threads"
raise sqlmapSyntaxException, errMsg raise sqlmapSyntaxException, errMsg