minor cosmetics

This commit is contained in:
Miroslav Stampar
2010-12-03 22:28:09 +00:00
parent 5d37df6104
commit 5764816891
16 changed files with 45 additions and 45 deletions

View File

@@ -38,7 +38,7 @@ class Abstraction(Web, UDF, xp_cmdshell):
if self.webBackdoorUrl and not kb.stackedTest:
self.webBackdoorRunCmd(cmd)
elif kb.dbms in ( DBMS.MYSQL, DBMS.POSTGRESQL ):
elif kb.dbms in ( DBMS.MYSQL, DBMS.PGSQL ):
self.udfExecCmd(cmd, silent=silent)
elif kb.dbms == DBMS.MSSQL:
@@ -52,7 +52,7 @@ class Abstraction(Web, UDF, xp_cmdshell):
if self.webBackdoorUrl and not kb.stackedTest:
return self.webBackdoorRunCmd(cmd)
elif kb.dbms in ( DBMS.MYSQL, DBMS.POSTGRESQL ):
elif kb.dbms in ( DBMS.MYSQL, DBMS.PGSQL ):
return self.udfEvalCmd(cmd, first, last)
elif kb.dbms == DBMS.MSSQL:
@@ -90,7 +90,7 @@ class Abstraction(Web, UDF, xp_cmdshell):
logger.info(infoMsg)
else:
if kb.dbms in ( DBMS.MYSQL, DBMS.POSTGRESQL ):
if kb.dbms in ( DBMS.MYSQL, DBMS.PGSQL ):
infoMsg = "going to use injected sys_eval and sys_exec "
infoMsg += "user-defined functions for operating system "
infoMsg += "command execution"
@@ -148,7 +148,7 @@ class Abstraction(Web, UDF, xp_cmdshell):
warnMsg += "the session user is not a database administrator"
logger.warn(warnMsg)
if kb.dbms in ( DBMS.MYSQL, DBMS.POSTGRESQL ):
if kb.dbms in ( DBMS.MYSQL, DBMS.PGSQL ):
self.udfInjectSys()
elif kb.dbms == DBMS.MSSQL:
if mandatory:

View File

@@ -192,7 +192,7 @@ class Metasploit:
debugMsg += "injection will be successful"
logger.debug(debugMsg)
elif kb.dbms == DBMS.POSTGRESQL:
elif kb.dbms == DBMS.PGSQL:
choose = True
warnMsg = "by default PostgreSQL on Windows runs as "
@@ -229,7 +229,7 @@ class Metasploit:
break
elif choice == "1":
if kb.dbms == DBMS.POSTGRESQL:
if kb.dbms == DBMS.PGSQL:
logger.warn("beware that the VNC injection might not work")
break
@@ -554,7 +554,7 @@ class Metasploit:
# This is useful for sqlmap because on PostgreSQL it is not
# possible to write files bigger than 8192 bytes abusing the
# lo_export() feature implemented in sqlmap.
if kb.dbms == DBMS.POSTGRESQL:
if kb.dbms == DBMS.PGSQL:
self.__fileFormat = "exe-small"
else:
self.__fileFormat = "exe"
@@ -656,7 +656,7 @@ class Metasploit:
self.__forgeMsfConsoleResource()
self.__forgeMsfConsoleCmd()
if kb.dbms in ( DBMS.MYSQL, DBMS.POSTGRESQL ):
if kb.dbms in ( DBMS.MYSQL, DBMS.PGSQL ):
self.uncPath = "\\\\\\\\%s\\\\%s" % (self.lhostStr, self.__randFile)
else:
self.uncPath = "\\\\%s\\%s" % (self.lhostStr, self.__randFile)

View File

@@ -101,7 +101,7 @@ class UDF:
return output
def udfCheckNeeded(self):
if ( not conf.rFile or ( conf.rFile and kb.dbms != DBMS.POSTGRESQL ) ) and "sys_fileread" in self.sysUdfs:
if ( not conf.rFile or ( conf.rFile and kb.dbms != DBMS.PGSQL ) ) and "sys_fileread" in self.sysUdfs:
self.sysUdfs.pop("sys_fileread")
if not conf.osPwn:
@@ -142,7 +142,7 @@ class UDF:
if kb.dbms == DBMS.MYSQL:
supportTblType = "longtext"
elif kb.dbms == DBMS.POSTGRESQL:
elif kb.dbms == DBMS.PGSQL:
supportTblType = "text"
self.udfCreateSupportTbl(supportTblType)
@@ -153,7 +153,7 @@ class UDF:
self.udfInjectCore(self.sysUdfs)
def udfInjectCustom(self):
if kb.dbms not in ( DBMS.MYSQL, DBMS.POSTGRESQL ):
if kb.dbms not in ( DBMS.MYSQL, DBMS.PGSQL ):
errMsg = "UDF injection feature is not yet implemented on %s" % kb.dbms
raise sqlmapUnsupportedFeatureException(errMsg)
@@ -235,7 +235,7 @@ class UDF:
if kb.dbms == DBMS.MYSQL:
defaultType = "string"
elif kb.dbms == DBMS.POSTGRESQL:
elif kb.dbms == DBMS.PGSQL:
defaultType = "text"
self.udfs[udfName]["input"] = []