Initial support for SQLite (90% approx).

Initial support for Firebird (30% approx).
Initial support for Access (10% approx).
Shared libraries code/installation scripts ported to 64bit, directory structure adapted.
Minor code adjustments.

lib/core/agent.py

@@ -182,6 +182,11 @@ class Agent:
         @rtype: C{str}
         """
 
+        # SQLite version 2 does not support neither CAST() nor IFNULL(),
+        # introduced only in SQLite version 3
+        if kb.dbms == "SQLite":
+            return field
+
         if field.startswith("(CASE"):
             nulledCastedField = field
         else:
@@ -252,12 +257,12 @@ class Agent:
         @return: query fields (columns) and more details
         @rtype: C{str}
         """
-
+        prefixRegex          = "(?:\s+(?:FIRST|SKIP)\s+\d+)*"
         fieldsSelectTop      = re.search("\ASELECT\s+TOP\s+[\d]+\s+(.+?)\s+FROM", query, re.I)
-        fieldsSelectDistinct = re.search("\ASELECT\s+DISTINCT\((.+?)\)\s+FROM", query, re.I)
-        fieldsSelectCase     = re.search("\ASELECT\s+(\(CASE WHEN\s+.+\s+END\))", query, re.I)
-        fieldsSelectFrom     = re.search("\ASELECT\s+(.+?)\s+FROM\s+", query, re.I)
-        fieldsSelect         = re.search("\ASELECT\s+(.*)", query, re.I)
+        fieldsSelectDistinct = re.search("\ASELECT%s\s+DISTINCT\((.+?)\)\s+FROM" % prefixRegex, query, re.I)
+        fieldsSelectCase     = re.search("\ASELECT%s\s+(\(CASE WHEN\s+.+\s+END\))" % prefixRegex, query, re.I)
+        fieldsSelectFrom     = re.search("\ASELECT%s\s+(.+?)\s+FROM\s+" % prefixRegex, query, re.I)
+        fieldsSelect         = re.search("\ASELECT%s\s+(.*)" % prefixRegex, query, re.I)
         fieldsNoSelect       = query
 
         if fieldsSelectTop:
@@ -284,7 +289,7 @@ class Agent:
         if kb.dbms == "MySQL":
             concatenatedQuery = "CONCAT(%s,%s)" % (query1, query2)
 
-        elif kb.dbms in ( "PostgreSQL", "Oracle" ):
+        elif kb.dbms in ( "PostgreSQL", "Oracle", "SQLite" ):
             concatenatedQuery = "%s||%s" % (query1, query2)
 
         elif kb.dbms == "Microsoft SQL Server":
@@ -342,7 +347,7 @@ class Agent:
             elif fieldsNoSelect:
                 concatenatedQuery = "CONCAT('%s',%s,'%s')" % (temp.start, concatenatedQuery, temp.stop)
 
-        elif kb.dbms in ( "PostgreSQL", "Oracle" ):
+        elif kb.dbms in ( "PostgreSQL", "Oracle", "SQLite" ):
             if fieldsSelectCase:
                 concatenatedQuery  = concatenatedQuery.replace("SELECT ", "'%s'||" % temp.start, 1)
                 concatenatedQuery += "||'%s'" % temp.stop
@@ -483,9 +488,13 @@ class Agent:
         untilFrom     = limitedQuery[:fromIndex]
         fromFrom      = limitedQuery[fromIndex+1:]
 
-        if kb.dbms in ( "MySQL", "PostgreSQL" ):
+        if kb.dbms in ( "MySQL", "PostgreSQL", "SQLite" ):
             limitStr = queries[kb.dbms].limit % (num, 1)
             limitedQuery += " %s" % limitStr
+            
+        elif kb.dbms == "Firebird":
+            limitStr = queries[kb.dbms].limit % (num+1, num+1)
+            limitedQuery += " %s" % limitStr
 
         elif kb.dbms == "Oracle":
             if " ORDER BY " in limitedQuery and "(SELECT " in limitedQuery:

lib/core/common.py

@@ -127,7 +127,7 @@ def formatDBMSfp(versions=None):
     @rtype: C{str}
     """
 
-    if not versions or versions == [None]:
+    if ( not versions or versions == [None] ) and kb.dbmsVersion[0] != "Unknown":
         versions = kb.dbmsVersion
 
     if isinstance(versions, str):
@@ -734,14 +734,19 @@ def getDelayQuery(andCond=False):
         if (kb.dbms == "MySQL" and banVer >= "5.0.12") or (kb.dbms == "PostgreSQL" and banVer >= "8.2"):
             query = queries[kb.dbms].timedelay % conf.timeSec
 
-            if kb.dbms == "MySQL" and andCond:
-                query = query.replace("SELECT ", "")
-
         else:
             query = queries[kb.dbms].timedelay2 % conf.timeSec
+    elif kb.dbms is "Firebird":
+        query = queries[kb.dbms].timedelay
     else:
         query = queries[kb.dbms].timedelay % conf.timeSec
 
+    if andCond:
+        if kb.dbms in ( "MySQL", "SQLite" ):
+            query = query.replace("SELECT ", "")
+        elif kb.dbms is "Firebird":
+            query = "(%s)>0" % query
+
     return query
     
 def getLocalIP():

lib/core/settings.py

@@ -52,18 +52,30 @@ PYVERSION          = sys.version.split()[0]
 # Url to update Microsoft SQL Server XML versions file from
 MSSQL_VERSIONS_URL = "http://www.sqlsecurity.com/FAQs/SQLServerVersionDatabase/tabid/63/Default.aspx"
 
-# Database managemen system specific variables
+# Database management system specific variables
 MSSQL_SYSTEM_DBS   = ( "Northwind", "model", "msdb", "pubs", "tempdb" )
 MYSQL_SYSTEM_DBS   = ( "information_schema", "mysql" )                   # Before MySQL 5.0 only "mysql"
 PGSQL_SYSTEM_DBS   = ( "information_schema", "pg_catalog", "pg_toast" )
 ORACLE_SYSTEM_DBS  = ( "SYSTEM", "SYSAUX" )                              # These are TABLESPACE_NAME
+SQLITE_SYSTEM_DBS   = ( "sqlite_master", "sqlite_temp_master" )
+ACCESS_SYSTEM_DBS   = ( "MSysAccessObjects", "MSysACEs", "MSysObjects", "MSysQueries", "MSysRelationships", "MSysAccessStorage",\
+                        "MSysAccessXML", "MSysModules", "MSysModules2" )
+FIREBIRD_SYSTEM_DBS = ( "RDB$BACKUP_HISTORY", "RDB$CHARACTER_SETS", "RDB$CHECK_CONSTRAINTS", "RDB$COLLATIONS", "RDB$DATABASE",\
+                        "RDB$DEPENDENCIES", "RDB$EXCEPTIONS", "RDB$FIELDS", "RDB$FIELD_DIMENSIONS", " RDB$FILES", "RDB$FILTERS",\
+                        "RDB$FORMATS", "RDB$FUNCTIONS", "RDB$FUNCTION_ARGUMENTS", "RDB$GENERATORS", "RDB$INDEX_SEGMENTS", "RDB$INDICES",\
+                        "RDB$LOG_FILES", "RDB$PAGES", "RDB$PROCEDURES", "RDB$PROCEDURE_PARAMETERS", "RDB$REF_CONSTRAINTS", "RDB$RELATIONS",\
+                        "RDB$RELATION_CONSTRAINTS", "RDB$RELATION_FIELDS", "RDB$ROLES", "RDB$SECURITY_CLASSES", "RDB$TRANSACTIONS", "RDB$TRIGGERS",\
+                        "RDB$TRIGGER_MESSAGES", "RDB$TYPES", "RDB$USER_PRIVILEGES", "RDB$VIEW_RELATIONS" )
 
 MSSQL_ALIASES      = [ "microsoft sql server", "mssqlserver", "mssql", "ms" ]
 MYSQL_ALIASES      = [ "mysql", "my" ]
 PGSQL_ALIASES      = [ "postgresql", "postgres", "pgsql", "psql", "pg" ]
 ORACLE_ALIASES     = [ "oracle", "orcl", "ora", "or" ]
+SQLITE_ALIASES     = [ "sqlite", "sqlite3" ]
+ACCESS_ALIASES     = [ "access", "jet", "microsoft access", "msaccess" ]
+FIREBIRD_ALIASES   = [ "firebird", "mozilla firebird", "interbase", "ibase", "fb" ]
 
-SUPPORTED_DBMS     = MSSQL_ALIASES + MYSQL_ALIASES + PGSQL_ALIASES + ORACLE_ALIASES
+SUPPORTED_DBMS     = MSSQL_ALIASES + MYSQL_ALIASES + PGSQL_ALIASES + ORACLE_ALIASES + SQLITE_ALIASES + ACCESS_ALIASES + FIREBIRD_ALIASES
 SUPPORTED_OS       = ( "linux", "windows" )
 
 SQL_STATEMENTS     = {