Major code refactoring - moved to one location only (getIdentifiedDBMS() in common.py) the retrieval of identified/fingerprinted DBMS.

Minor bug fixes thanks to previous refactoring too.

plugins/dbms/mssqlserver/enumeration.py

@@ -9,6 +9,7 @@ See the file 'doc/COPYING' for copying permission
 
 from lib.core.agent import agent
 from lib.core.common import arrayizeValue
+from lib.core.common import getIdentifiedDBMS
 from lib.core.common import getRange
 from lib.core.common import isNumPosStrValue
 from lib.core.common import isTechniqueAvailable
@@ -40,7 +41,7 @@ class Enumeration(GenericEnumeration):
             infoMsg += " for database '%s'" % conf.db
         logger.info(infoMsg)
 
-        rootQuery = queries[kb.dbms].tables
+        rootQuery = queries[getIdentifiedDBMS()].tables
 
         if not conf.db:
             if not len(kb.data.cachedDbs):
@@ -110,7 +111,7 @@ class Enumeration(GenericEnumeration):
         return kb.data.cachedTables
 
     def searchTable(self):
-        rootQuery = queries[kb.dbms].search_table
+        rootQuery = queries[getIdentifiedDBMS()].search_table
         foundTbls = {}
         tblList = conf.tbl.split(",")
         tblCond = rootQuery.inband.condition
@@ -194,7 +195,7 @@ class Enumeration(GenericEnumeration):
         return foundTbls
 
     def searchColumn(self):
-        rootQuery = queries[kb.dbms].search_column
+        rootQuery = queries[getIdentifiedDBMS()].search_column
         foundCols = {}
         dbs = {}
         colList = conf.col.split(",")

plugins/dbms/mssqlserver/fingerprint.py

@@ -11,6 +11,7 @@ from lib.core.agent import agent
 from lib.core.common import formatDBMSfp
 from lib.core.common import formatFingerprint
 from lib.core.common import getErrorParsedDBMSesFormatted
+from lib.core.common import getIdentifiedDBMS
 from lib.core.common import getUnicode
 from lib.core.common import randomInt
 from lib.core.data import conf
@@ -72,7 +73,7 @@ class Fingerprint(GenericFingerprint):
         return value
 
     def checkDbms(self):
-        if ((kb.dbms is not None and kb.dbms.lower() in MSSQL_ALIASES) \
+        if ((getIdentifiedDBMS() is not None and getIdentifiedDBMS().lower() in MSSQL_ALIASES) \
            or conf.dbms in MSSQL_ALIASES) and kb.dbmsVersion and \
            kb.dbmsVersion[0].isdigit():
             setDbms("%s %s" % (DBMS.MSSQL, kb.dbmsVersion[0]))