proper naming

This commit is contained in:
Bernardo Damele 2012-07-06 15:13:50 +01:00
parent 373fea03a3
commit fb7fe552b7
4 changed files with 9 additions and 15 deletions

View File

@ -80,11 +80,6 @@ class Filesystem(GenericFilesystem):
return chunkName 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): def stackedReadFile(self, rFile):
infoMsg = "fetching file: '%s'" % rFile infoMsg = "fetching file: '%s'" % rFile
logger.info(infoMsg) logger.info(infoMsg)

View File

@ -25,7 +25,7 @@ class Filesystem(GenericFilesystem):
def __init__(self): def __init__(self):
GenericFilesystem.__init__(self) GenericFilesystem.__init__(self)
def unionReadFile(self, rFile): def nonStackedReadFile(self, rFile):
infoMsg = "fetching file: '%s'" % rFile infoMsg = "fetching file: '%s'" % rFile
logger.info(infoMsg) logger.info(infoMsg)
@ -61,7 +61,7 @@ class Filesystem(GenericFilesystem):
if conf.direct or isTechniqueAvailable(PAYLOAD.TECHNIQUE.UNION): if conf.direct or isTechniqueAvailable(PAYLOAD.TECHNIQUE.UNION):
warnMsg += ", going to fall-back to simpler UNION technique" warnMsg += ", going to fall-back to simpler UNION technique"
logger.warn(warnMsg) logger.warn(warnMsg)
result = self.unionReadFile(rFile) result = self.nonStackedReadFile(rFile)
else: else:
raise sqlmapNoneDataException, warnMsg raise sqlmapNoneDataException, warnMsg
else: else:

View File

@ -20,11 +20,6 @@ class Filesystem(GenericFilesystem):
GenericFilesystem.__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): def stackedReadFile(self, rFile):
infoMsg = "fetching file: '%s'" % rFile infoMsg = "fetching file: '%s'" % rFile
logger.info(infoMsg) logger.info(infoMsg)

View File

@ -167,8 +167,8 @@ class Filesystem:
return True return True
def unionReadFile(self, rFile): def nonStackedReadFile(self, rFile):
errMsg = "'unionReadFile' method must be defined " errMsg = "'nonStackedReadFile' method must be defined "
errMsg += "into the specific DBMS plugin" errMsg += "into the specific DBMS plugin"
raise sqlmapUndefinedMethod, errMsg raise sqlmapUndefinedMethod, errMsg
@ -202,7 +202,11 @@ class Filesystem:
fileContent = self.stackedReadFile(rFile) fileContent = self.stackedReadFile(rFile)
elif Backend.isDbms(DBMS.MYSQL): 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: else:
errMsg = "none of the SQL injection techniques detected can " errMsg = "none of the SQL injection techniques detected can "
errMsg += "be used to read files from the underlying file " errMsg += "be used to read files from the underlying file "