direct connection supported only on Windows machines

stamparm · stamparm · commit 6762f592c1d9 · 2010-04-13T08:57:47.000Z
diff --git a/plugins/dbms/access/connector.py b/plugins/dbms/access/connector.py
@@ -30,6 +30,8 @@
 from lib.core.data import conf
 from lib.core.data import logger
 from lib.core.exception import sqlmapConnectionException
+from lib.core.exception import sqlmapUnsupportedFeatureException
+from lib.core.settings import IS_WIN
 
 from plugins.generic.connector import Connector as GenericConnector
 
@@ -46,32 +48,25 @@ def __init__(self):
         GenericConnector.__init__(self)
 
     def connect(self):
+        if not IS_WIN:
+            errMsg  = "currently, direct connection to Microsoft Access database(s) "
+            errMsg += "is restricted to Windows platforms"
+            raise sqlmapUnsupportedFeatureException, errMsg
+
         self.initConnection()
+        self.checkFileDb()
 
-        lastMsg = None
-        for connString in ('Driver={Microsoft Access Driver (*.mdb)};Dbq=%s;Uid=Admin;Pwd=;' % self.db, 'DSN=%s' % self.db):
-            try:
-                self.connector = pyodbc.connect(connString)
-                break
-            except pyodbc.Error, msg:
-                lastMsg = msg
-            except pyodbc.OperationalError, msg:
-                raise sqlmapConnectionException, msg[1]
-        if not self.connector:
-            raise sqlmapConnectionException, lastMsg[1]
+        try:
+            self.connector = pyodbc.connect('Driver={Microsoft Access Driver (*.mdb)};Dbq=%s;Uid=Admin;Pwd=;' % self.db)
+        except (pyodbc.Error, pyodbc.OperationalError), msg:
+            raise sqlmapConnectionException, msg[1]
 
         self.setCursor()
         self.connected()
 
     def fetchall(self):
         try:
-            output = self.cursor.fetchall()
-            for i in xrange(len(output)):
-                for j in xrange(len(output[i])):
-                    if type(output[i][j]) == str and output[i][j].find('\0') != -1:
-                        output[i][j] = output[i][j][:output[i][j].find('\0')].rstrip()
-            return output
-
+            return self.cursor.fetchall()
         except pyodbc.ProgrammingError, msg:
             logger.log(8, msg[1])
             return None
