proper naming

bdamele · bdamele · commit fb7fe552b79b · 2012-07-06T15:13:50.000+01:00
diff --git a/plugins/dbms/mssqlserver/filesystem.py b/plugins/dbms/mssqlserver/filesystem.py
@@ -80,11 +80,6 @@ def __updateDestChunk(self, fileContent, tmpPath):
 
         return chunkName
 
-    def unionReadFile(self, rFile):
-        errMsg = "Microsoft SQL Server does not support file reading "
-        errMsg += "with UNION query SQL injection technique"
-        raise sqlmapUnsupportedFeatureException(errMsg)
-
     def stackedReadFile(self, rFile):
         infoMsg = "fetching file: '%s'" % rFile
         logger.info(infoMsg)
diff --git a/plugins/dbms/mysql/filesystem.py b/plugins/dbms/mysql/filesystem.py
@@ -25,7 +25,7 @@ class Filesystem(GenericFilesystem):
     def __init__(self):
         GenericFilesystem.__init__(self)
 
-    def unionReadFile(self, rFile):
+    def nonStackedReadFile(self, rFile):
         infoMsg = "fetching file: '%s'" % rFile
         logger.info(infoMsg)
 
@@ -61,7 +61,7 @@ def stackedReadFile(self, rFile):
             if conf.direct or isTechniqueAvailable(PAYLOAD.TECHNIQUE.UNION):
                 warnMsg += ", going to fall-back to simpler UNION technique"
                 logger.warn(warnMsg)
-                result = self.unionReadFile(rFile)
+                result = self.nonStackedReadFile(rFile)
             else:
                 raise sqlmapNoneDataException, warnMsg
         else:
diff --git a/plugins/dbms/postgresql/filesystem.py b/plugins/dbms/postgresql/filesystem.py
@@ -20,11 +20,6 @@ def __init__(self):
 
         GenericFilesystem.__init__(self)
 
-    def unionReadFile(self, rFile):
-        errMsg = "PostgreSQL does not support file reading with UNION "
-        errMsg += "query SQL injection technique"
-        raise sqlmapUnsupportedFeatureException, errMsg
-
     def stackedReadFile(self, rFile):
         infoMsg = "fetching file: '%s'" % rFile
         logger.info(infoMsg)
diff --git a/plugins/generic/filesystem.py b/plugins/generic/filesystem.py
@@ -167,8 +167,8 @@ def askCheckWrittenFile(self, wFile, dFile, fileType):
 
         return True
 
-    def unionReadFile(self, rFile):
-        errMsg = "'unionReadFile' method must be defined "
+    def nonStackedReadFile(self, rFile):
+        errMsg = "'nonStackedReadFile' method must be defined "
         errMsg += "into the specific DBMS plugin"
         raise sqlmapUndefinedMethod, errMsg
 
@@ -202,7 +202,11 @@ def readFile(self, rFile):
 
             fileContent = self.stackedReadFile(rFile)
         elif Backend.isDbms(DBMS.MYSQL):
-            fileContent = self.unionReadFile(rFile)
+            debugMsg = "going to read the file with UNION query SQL "
+            debugMsg += "injection technique"
+            logger.debug(debugMsg)
+
+            fileContent = self.nonStackedReadFile(rFile)
         else:
             errMsg = "none of the SQL injection techniques detected can "
             errMsg += "be used to read files from the underlying file "
