fix for Feature #136

stamparm · stamparm · commit c4040ab29722 · 2010-08-31T14:25:37.000Z
diff --git a/plugins/dbms/sqlite/enumeration.py b/plugins/dbms/sqlite/enumeration.py
@@ -68,16 +68,6 @@ def getDbs(self):
 
         return []
 
-    def getColumns(self, onlyColNames=False):
-        errMsg  = "on SQLite it is not possible to enumerate database "
-        errMsg += "table columns"
-
-        if conf.dumpTable or conf.dumpAll:
-            errMsg += ", provide them with -C option"
-            raise sqlmapUnsupportedFeatureException, errMsg
-
-        logger.warn(errMsg)
-
     def dumpAll(self):
         errMsg = "on SQLite you must specify the table and columns to dump"
         raise sqlmapUnsupportedFeatureException, errMsg
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
@@ -871,15 +871,21 @@ def getColumns(self, onlyColNames=False):
                                                         conf.db, conf.db,
                                                         conf.db, conf.tbl)
                 query += condQuery.replace("[DB]", conf.db)
+            elif kb.dbms == "SQLite":
+                query = rootQuery["inband"]["query"] % conf.tbl
 
             value = inject.getValue(query, blind=False)
 
             if value:
                 table = {}
                 columns = {}
-
-                for column, colType in value:
-                    columns[column] = colType
+                
+                if kb.dbms == "SQLite":
+                    for match in re.finditer(r"(\w+) ([A-Z]+)[,\r\n]", value):
+                        columns[match.group(1)] = match.group(2)
+                else:
+                    for column, colType in value:
+                        columns[column] = colType
 
                 table[conf.tbl] = columns
                 kb.data.cachedColumns[conf.db] = table
diff --git a/xml/queries.xml b/xml/queries.xml
@@ -320,7 +320,9 @@
             <inband query="SELECT tbl_name FROM sqlite_master WHERE type='table' ORDER BY 1"/>
             <blind query="SELECT tbl_name FROM sqlite_master WHERE type='table' LIMIT %d, 1" count="SELECT COUNT(tbl_name) FROM sqlite_master WHERE type='table'"/>
         </tables>
-        <columns/>
+        <columns>
+            <inband query="SELECT sql FROM sqlite_master WHERE tbl_name='%s'"/>
+        </columns>
         <dump_table>
             <inband query="SELECT %s FROM %s"/>
             <blind query="SELECT %s FROM %s LIMIT %d, 1" count="SELECT COUNT(*) FROM %s"/>
