mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-25 19:13:48 +03:00
Some fine tuning for #4876
This commit is contained in:
parent
9e17babe7b
commit
8c904bf73c
|
@ -2655,6 +2655,15 @@ def _basicOptionValidation():
|
||||||
errMsg = "invalid regular expression '%s' ('%s')" % (conf.retryOn, getSafeExString(ex))
|
errMsg = "invalid regular expression '%s' ('%s')" % (conf.retryOn, getSafeExString(ex))
|
||||||
raise SqlmapSyntaxException(errMsg)
|
raise SqlmapSyntaxException(errMsg)
|
||||||
|
|
||||||
|
if conf.retries == defaults.retries:
|
||||||
|
conf.retries = 5 * conf.retries
|
||||||
|
|
||||||
|
warnMsg = "increasing default value for "
|
||||||
|
warnMsg += "option '--retries' to %d because " % conf.retries
|
||||||
|
warnMsg += "option '--retry-on' was provided"
|
||||||
|
logger.warn(warnMsg)
|
||||||
|
|
||||||
|
|
||||||
if conf.cookieDel and len(conf.cookieDel):
|
if conf.cookieDel and len(conf.cookieDel):
|
||||||
errMsg = "option '--cookie-del' should contain a single character (e.g. ';')"
|
errMsg = "option '--cookie-del' should contain a single character (e.g. ';')"
|
||||||
raise SqlmapSyntaxException(errMsg)
|
raise SqlmapSyntaxException(errMsg)
|
||||||
|
|
|
@ -20,7 +20,7 @@ from thirdparty import six
|
||||||
from thirdparty.six import unichr as _unichr
|
from thirdparty.six import unichr as _unichr
|
||||||
|
|
||||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||||
VERSION = "1.5.11.0"
|
VERSION = "1.5.11.1"
|
||||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
||||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
||||||
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
||||||
|
|
|
@ -914,11 +914,6 @@ class Connect(object):
|
||||||
warnMsg = "forced retry of the request because of undesired page content"
|
warnMsg = "forced retry of the request because of undesired page content"
|
||||||
logger.warn(warnMsg)
|
logger.warn(warnMsg)
|
||||||
return Connect._retryProxy(**kwargs)
|
return Connect._retryProxy(**kwargs)
|
||||||
else:
|
|
||||||
errMsg = "unable to get the page content not matching "
|
|
||||||
errMsg += "the given regular expression '%s'. Please use as high " % conf.retryOn
|
|
||||||
errMsg += "value for option '--retries' as possible (e.g. 20 or more)"
|
|
||||||
raise SqlmapConnectionException(errMsg)
|
|
||||||
|
|
||||||
processResponse(page, responseHeaders, code, status)
|
processResponse(page, responseHeaders, code, status)
|
||||||
|
|
||||||
|
|
|
@ -161,7 +161,7 @@ timeout = 30
|
||||||
retries = 3
|
retries = 3
|
||||||
|
|
||||||
# Retry request on regexp matching content.
|
# Retry request on regexp matching content.
|
||||||
retries = 3
|
retryOn =
|
||||||
|
|
||||||
# Randomly change value for the given parameter.
|
# Randomly change value for the given parameter.
|
||||||
rParam =
|
rParam =
|
||||||
|
|
Loading…
Reference in New Issue
Block a user