sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-02-21 14:02:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Couple of patches

Browse Source
This commit is contained in:
Miroslav Stampar 2020-01-08 10:37:59 +01:00
parent 239e4d7927
commit c95c370254
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/common.py
View File

@ -1080,7 +1080,7 @@ def readInput(message, default=None, checkBatch=True, boolean=False):
logger.debug(debugMsg) logger.debug(debugMsg)
if retVal is None: if retVal is None:
if checkBatch and conf.get("batch") or conf.get("api"): if checkBatch and conf.get("batch") or any(conf.get(_) for _ in ("api", "nonInteractive")):
if isListLike(default): if isListLike(default):
options = ','.join(getUnicode(opt, UNICODE_ENCODING) for opt in default) options = ','.join(getUnicode(opt, UNICODE_ENCODING) for opt in default)
elif default: elif default:

5
lib/core/option.py
View File

@ -330,8 +330,13 @@ def _setRequestFromFile():
infoMsg = "parsing second-order HTTP request from '%s'" % conf.secondReq infoMsg = "parsing second-order HTTP request from '%s'" % conf.secondReq
logger.info(infoMsg) logger.info(infoMsg)
try:
target = next(parseRequestFile(conf.secondReq, False)) target = next(parseRequestFile(conf.secondReq, False))
kb.secondReq = target kb.secondReq = target
except StopIteration:
errMsg = "specified second-order HTTP request file '%s' " % conf.secondReq
errMsg += "does not contain a valid HTTP request"
raise SqlmapDataException(errMsg)
def _setCrawler(): def _setCrawler():
if not conf.crawlDepth: if not conf.crawlDepth:

2
lib/core/settings.py
View File

@ -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.4.1.14" VERSION = "1.4.1.15"
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)

2
lib/core/testing.py
View File

@ -178,7 +178,7 @@ def fuzzTest():
open(config, "w+").write("\n".join(lines)) open(config, "w+").write("\n".join(lines))
cmd = "%s %s -c %s --batch --flush-session --technique=%s --banner" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "sqlmap.py")), config, random.sample("BEUQ", 1)[0]) cmd = "%s %s -c %s --non-interactive --flush-session --technique=%s --banner" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "sqlmap.py")), config, random.sample("BEUQ", 1)[0])
output = shellExec(cmd) output = shellExec(cmd)
if "Traceback" in output: if "Traceback" in output:

3
lib/parse/cmdline.py
View File

@ -781,6 +781,9 @@ def cmdLineParser(argv=None):
parser.add_argument("--force-pivoting", dest="forcePivoting", action="store_true", parser.add_argument("--force-pivoting", dest="forcePivoting", action="store_true",
help=SUPPRESS) help=SUPPRESS)
parser.add_argument("--non-interactive", dest="nonInteractive", action="store_true",
help=SUPPRESS)
parser.add_argument("--gui", dest="gui", action="store_true", parser.add_argument("--gui", dest="gui", action="store_true",
help=SUPPRESS) help=SUPPRESS)