Minor fix and consistency: do not ask to include all tests if level and risk are at the max settings already

This commit is contained in:
Bernardo Damele 2015-02-20 10:21:44 +00:00
parent f547a776d8
commit 201b605f9b

View File

@ -111,12 +111,12 @@ def checkSqlInjection(place, parameter, value):
msg += "Do you want to skip test payloads specific for other DBMSes? [Y/n]"
kb.reduceTests = [] if readInput(msg, default='Y').upper() != 'Y' else (Backend.getErrorParsedDBMSes() or [kb.heuristicDbms])
if kb.extendTests is None:
if kb.extendTests is None and (conf.level < 5 or conf.risk < 3):
_ = (Format.getErrorParsedDBMSes() if Backend.getErrorParsedDBMSes() else kb.heuristicDbms)
msg = "do you want to include all tests for '%s' " % _
msg += "extending provided level (%d) and risk (%s) values? [Y/n]" % (conf.level, conf.risk)
kb.extendTests = [] if readInput(msg, default='Y').upper() != 'Y' else (Backend.getErrorParsedDBMSes() or [kb.heuristicDbms])
elif kb.extendTests is None and conf.level < 5 and conf.risk < 3:
elif kb.extendTests is None and (conf.level < 5 or conf.risk < 3):
msg = "do you want to include all tests for '%s' " % conf.dbms
msg += "extending provided level (%d) and risk (%s)? [Y/n]" % (conf.level, conf.risk)
kb.extendTests = [] if readInput(msg, default='Y').upper() != 'Y' else ([conf.dbms])