Done with previous refactoring

This commit is contained in:
Bernardo Damele 2011-01-20 00:01:06 +00:00
parent 701947490b
commit 50c02fbb37
8 changed files with 14 additions and 14 deletions

View File

@ -132,7 +132,7 @@ class Fingerprint(GenericFingerprint):
value += DBMS.ACCESS value += DBMS.ACCESS
return value return value
actVer = formatDBMSfp() + " (%s)" % (self.__sandBoxCheck()) actVer = format.getDbms() + " (%s)" % (self.__sandBoxCheck())
blank = " " * 15 blank = " " * 15
value += "active fingerprint: %s" % actVer value += "active fingerprint: %s" % actVer
@ -142,7 +142,7 @@ class Fingerprint(GenericFingerprint):
if re.search("-log$", kb.data.banner): if re.search("-log$", kb.data.banner):
banVer += ", logging enabled" banVer += ", logging enabled"
banVer = formatDBMSfp([banVer]) 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()

View File

@ -50,7 +50,7 @@ class Fingerprint(GenericFingerprint):
value += DBMS.FIREBIRD value += DBMS.FIREBIRD
return value return value
actVer = formatDBMSfp() + " (%s)" % (self.__dialectCheck()) actVer = format.getDbms() + " (%s)" % (self.__dialectCheck())
blank = " " * 15 blank = " " * 15
value += "active fingerprint: %s" % actVer value += "active fingerprint: %s" % actVer
@ -60,7 +60,7 @@ class Fingerprint(GenericFingerprint):
if re.search("-log$", kb.data.banner): if re.search("-log$", kb.data.banner):
banVer += ", logging enabled" banVer += ", logging enabled"
banVer = formatDBMSfp([banVer]) 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()

View File

@ -84,7 +84,7 @@ class Fingerprint(GenericFingerprint):
value += DBMS.MAXDB value += DBMS.MAXDB
return value return value
actVer = formatDBMSfp() + " (%s)" % self.__versionCheck() actVer = format.getDbms() + " (%s)" % self.__versionCheck()
blank = " " * 15 blank = " " * 15
value += "active fingerprint: %s" % actVer value += "active fingerprint: %s" % actVer

View File

@ -42,7 +42,7 @@ class Fingerprint(GenericFingerprint):
value += "%s\n" % dbmsOsFp value += "%s\n" % dbmsOsFp
value += "back-end DBMS: " value += "back-end DBMS: "
actVer = formatDBMSfp() actVer = format.getDbms()
if not conf.extensiveFp: if not conf.extensiveFp:
value += actVer value += actVer

View File

@ -46,13 +46,13 @@ class Fingerprint(GenericFingerprint):
value += DBMS.ORACLE value += DBMS.ORACLE
return value return value
actVer = formatDBMSfp() actVer = format.getDbms()
blank = " " * 15 blank = " " * 15
value += "active fingerprint: %s" % actVer value += "active fingerprint: %s" % actVer
if kb.bannerFp: if kb.bannerFp:
banVer = kb.bannerFp["dbmsVersion"] if 'dbmsVersion' in kb.bannerFp else None banVer = kb.bannerFp["dbmsVersion"] if 'dbmsVersion' in kb.bannerFp else None
banVer = formatDBMSfp([banVer]) 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()

View File

@ -49,13 +49,13 @@ class Fingerprint(GenericFingerprint):
value += DBMS.PGSQL value += DBMS.PGSQL
return value return value
actVer = formatDBMSfp() actVer = format.getDbms()
blank = " " * 15 blank = " " * 15
value += "active fingerprint: %s" % actVer value += "active fingerprint: %s" % actVer
if kb.bannerFp: if kb.bannerFp:
banVer = kb.bannerFp["dbmsVersion"] if 'dbmsVersion' in kb.bannerFp else None banVer = kb.bannerFp["dbmsVersion"] if 'dbmsVersion' in kb.bannerFp else None
banVer = formatDBMSfp([banVer]) 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()

View File

@ -45,13 +45,13 @@ class Fingerprint(GenericFingerprint):
value += DBMS.SQLITE value += DBMS.SQLITE
return value return value
actVer = formatDBMSfp() actVer = format.getDbms()
blank = " " * 15 blank = " " * 15
value += "active fingerprint: %s" % actVer value += "active fingerprint: %s" % actVer
if kb.bannerFp: if kb.bannerFp:
banVer = kb.bannerFp["dbmsVersion"] banVer = kb.bannerFp["dbmsVersion"]
banVer = formatDBMSfp([banVer]) 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()

View File

@ -45,13 +45,13 @@ class Fingerprint(GenericFingerprint):
value += DBMS.SYBASE value += DBMS.SYBASE
return value return value
actVer = formatDBMSfp() actVer = format.getDbms()
blank = " " * 15 blank = " " * 15
value += "active fingerprint: %s" % actVer value += "active fingerprint: %s" % actVer
if kb.bannerFp: if kb.bannerFp:
banVer = kb.bannerFp["dbmsVersion"] banVer = kb.bannerFp["dbmsVersion"]
banVer = formatDBMSfp([banVer]) 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()