mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-22 09:36:35 +03:00
Implements #3971
This commit is contained in:
parent
fd8028bb18
commit
ab2cae3957
|
@ -2211,6 +2211,13 @@ def _mergeOptions(inputOptions, overrideOptions):
|
||||||
if hasattr(conf, key) and conf[key] is None:
|
if hasattr(conf, key) and conf[key] is None:
|
||||||
conf[key] = value
|
conf[key] = value
|
||||||
|
|
||||||
|
if conf.unstable:
|
||||||
|
if key in ("timeSec", "retries", "timeout"):
|
||||||
|
conf[key] *= 2
|
||||||
|
|
||||||
|
if conf.unstable:
|
||||||
|
conf.forcePartial = True
|
||||||
|
|
||||||
lut = {}
|
lut = {}
|
||||||
for group in optDict.keys():
|
for group in optDict.keys():
|
||||||
lut.update((_.upper(), _) for _ in optDict[group])
|
lut.update((_.upper(), _) for _ in optDict[group])
|
||||||
|
|
|
@ -239,8 +239,9 @@ optDict = {
|
||||||
"offline": "boolean",
|
"offline": "boolean",
|
||||||
"purge": "boolean",
|
"purge": "boolean",
|
||||||
"tmpDir": "string",
|
"tmpDir": "string",
|
||||||
"wizard": "boolean",
|
"unstable": "boolean",
|
||||||
"updateAll": "boolean",
|
"updateAll": "boolean",
|
||||||
|
"wizard": "boolean",
|
||||||
"verbose": "integer",
|
"verbose": "integer",
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ from lib.core.enums import OS
|
||||||
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.3.10.25"
|
VERSION = "1.3.10.26"
|
||||||
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)
|
||||||
|
|
|
@ -734,6 +734,9 @@ def cmdLineParser(argv=None):
|
||||||
miscellaneous.add_argument("--tmp-dir", dest="tmpDir",
|
miscellaneous.add_argument("--tmp-dir", dest="tmpDir",
|
||||||
help="Local directory for storing temporary files")
|
help="Local directory for storing temporary files")
|
||||||
|
|
||||||
|
miscellaneous.add_argument("--unstable", dest="unstable", action="store_true",
|
||||||
|
help="Adjust options for unstable connections")
|
||||||
|
|
||||||
miscellaneous.add_argument("--update", dest="updateAll", action="store_true",
|
miscellaneous.add_argument("--update", dest="updateAll", action="store_true",
|
||||||
help="Update sqlmap")
|
help="Update sqlmap")
|
||||||
|
|
||||||
|
|
|
@ -825,14 +825,18 @@ offline = False
|
||||||
# Local directory for storing temporary files.
|
# Local directory for storing temporary files.
|
||||||
tmpDir =
|
tmpDir =
|
||||||
|
|
||||||
# Simple wizard interface for beginner users.
|
# Adjust options for unstable connections.
|
||||||
# Valid: True or False
|
# Valid: True or False
|
||||||
wizard = False
|
unstable = False
|
||||||
|
|
||||||
# Update sqlmap.
|
# Update sqlmap.
|
||||||
# Valid: True or False
|
# Valid: True or False
|
||||||
updateAll = False
|
updateAll = False
|
||||||
|
|
||||||
|
# Simple wizard interface for beginner users.
|
||||||
|
# Valid: True or False
|
||||||
|
wizard = False
|
||||||
|
|
||||||
# Verbosity level.
|
# Verbosity level.
|
||||||
# Valid: integer between 0 and 6
|
# Valid: integer between 0 and 6
|
||||||
# 0: Show only error and critical messages
|
# 0: Show only error and critical messages
|
||||||
|
|
Loading…
Reference in New Issue
Block a user