mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-09-07 12:54:45 +03:00
Fixes #3692
This commit is contained in:
parent
4e84b741ef
commit
3b7dd2c357
|
@ -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.5.127"
|
VERSION = "1.3.5.128"
|
||||||
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)
|
||||||
|
|
|
@ -131,7 +131,8 @@ class Fingerprint(GenericFingerprint):
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
if re.search(r"-log$", kb.data.banner):
|
if banVer:
|
||||||
|
if re.search(r"-log$", kb.data.banner or ""):
|
||||||
banVer += ", logging enabled"
|
banVer += ", logging enabled"
|
||||||
|
|
||||||
banVer = Format.getDbms([banVer])
|
banVer = Format.getDbms([banVer])
|
||||||
|
|
|
@ -70,6 +70,8 @@ class Fingerprint(GenericFingerprint):
|
||||||
|
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
|
if banVer:
|
||||||
banVer = Format.getDbms([banVer])
|
banVer = Format.getDbms([banVer])
|
||||||
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,8 @@ class Fingerprint(GenericFingerprint):
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
if re.search(r"-log$", kb.data.banner):
|
if banVer:
|
||||||
|
if re.search(r"-log$", kb.data.banner or ""):
|
||||||
banVer += ", logging enabled"
|
banVer += ", logging enabled"
|
||||||
|
|
||||||
banVer = Format.getDbms([banVer])
|
banVer = Format.getDbms([banVer])
|
||||||
|
|
|
@ -45,6 +45,8 @@ class Fingerprint(GenericFingerprint):
|
||||||
|
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
|
if banVer:
|
||||||
banVer = Format.getDbms([banVer])
|
banVer = Format.getDbms([banVer])
|
||||||
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
||||||
|
|
||||||
|
|
|
@ -49,10 +49,11 @@ class Fingerprint(GenericFingerprint):
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
if re.search(r"-log$", kb.data.banner):
|
if banVer:
|
||||||
|
if re.search(r"-log$", kb.data.banner or ""):
|
||||||
banVer += ", logging enabled"
|
banVer += ", logging enabled"
|
||||||
|
|
||||||
banVer = Format.getDbms([banVer] if banVer else None)
|
banVer = Format.getDbms([banVer])
|
||||||
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
||||||
|
|
||||||
htmlErrorFp = Format.getErrorParsedDBMSes()
|
htmlErrorFp = Format.getErrorParsedDBMSes()
|
||||||
|
|
|
@ -45,6 +45,8 @@ class Fingerprint(GenericFingerprint):
|
||||||
|
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
|
if banVer:
|
||||||
banVer = Format.getDbms([banVer])
|
banVer = Format.getDbms([banVer])
|
||||||
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
||||||
|
|
||||||
|
|
|
@ -127,10 +127,11 @@ class Fingerprint(GenericFingerprint):
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
if banVer and re.search(r"-log$", kb.data.banner):
|
if banVer:
|
||||||
|
if banVer and re.search(r"-log$", kb.data.banner or ""):
|
||||||
banVer += ", logging enabled"
|
banVer += ", logging enabled"
|
||||||
|
|
||||||
banVer = Format.getDbms([banVer] if banVer else None)
|
banVer = Format.getDbms([banVer])
|
||||||
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
||||||
|
|
||||||
htmlErrorFp = Format.getErrorParsedDBMSes()
|
htmlErrorFp = Format.getErrorParsedDBMSes()
|
||||||
|
|
|
@ -47,6 +47,8 @@ class Fingerprint(GenericFingerprint):
|
||||||
|
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
|
if banVer:
|
||||||
banVer = Format.getDbms([banVer])
|
banVer = Format.getDbms([banVer])
|
||||||
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,8 @@ class Fingerprint(GenericFingerprint):
|
||||||
|
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
|
if banVer:
|
||||||
banVer = Format.getDbms([banVer])
|
banVer = Format.getDbms([banVer])
|
||||||
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,8 @@ class Fingerprint(GenericFingerprint):
|
||||||
|
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
|
if banVer:
|
||||||
banVer = Format.getDbms([banVer])
|
banVer = Format.getDbms([banVer])
|
||||||
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,8 @@ class Fingerprint(GenericFingerprint):
|
||||||
|
|
||||||
if kb.bannerFp:
|
if kb.bannerFp:
|
||||||
banVer = kb.bannerFp.get("dbmsVersion")
|
banVer = kb.bannerFp.get("dbmsVersion")
|
||||||
|
|
||||||
|
if banVer:
|
||||||
banVer = Format.getDbms([banVer])
|
banVer = Format.getDbms([banVer])
|
||||||
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user