automatically increasing default --time-sec value when --tor/--proxy used (not touching anything if explicit --time-sec set)

This commit is contained in:
Miroslav Stampar 2011-04-19 08:34:21 +00:00
parent b79d4f70f3
commit 4d48ac54dc

View File

@ -1203,8 +1203,17 @@ def __cleanupOptions():
if conf.data: if conf.data:
conf.data = urldecode(conf.data) conf.data = urldecode(conf.data)
# to distinguish explicit usafe of --time-sec # to distinguish explicit usage of --time-sec
if conf.timeSec is None: if conf.timeSec is None:
if conf.tor or conf.proxy:
conf.timeSec = 2 * TIME_DEFAULT_DELAY
kb.adjustTimeDelay = False
warnMsg = "increasing default value for "
warnMsg += " --time-sec to %d because " % conf.timeSec
warnMsg += "%s switch used" % ("--tor" if conf.tor else "--proxy")
logger.warn(warnMsg)
else:
conf.timeSec = TIME_DEFAULT_DELAY conf.timeSec = TIME_DEFAULT_DELAY
kb.adjustTimeDelay = True kb.adjustTimeDelay = True
else: else:
@ -1543,6 +1552,10 @@ def __basicOptionValidation():
errMsg = "switch --forms requires usage of -u (--url) switch" errMsg = "switch --forms requires usage of -u (--url) switch"
raise sqlmapSyntaxException, errMsg raise sqlmapSyntaxException, errMsg
if conf.tor and conf.ignoreProxy:
errMsg = "switch --tor is incompatible with switch --ignore-proxy"
raise sqlmapSyntaxException, errMsg
if conf.proxy and conf.ignoreProxy: if conf.proxy and conf.ignoreProxy:
errMsg = "switch --proxy is incompatible with switch --ignore-proxy" errMsg = "switch --proxy is incompatible with switch --ignore-proxy"
raise sqlmapSyntaxException, errMsg raise sqlmapSyntaxException, errMsg