sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-06-18 20:13:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor code restyling

Browse Source
This commit is contained in:
Miroslav Stampar 2012-02-22 15:53:36 +00:00
parent 61a25418a9
commit 6e54cb171f
3 changed files with 78 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/controller/checks.py
View File

@ -328,7 +328,7 @@ def checkSqlInjection(place, parameter, value):
# Useful to set kb.matchRatio at first based on
# the False response content
kb.matchRatio = None
_ = Request.queryPage(genCmpPayload(), place, raise404=False)
Request.queryPage(genCmpPayload(), place, raise404=False)
# If in the comparing stage there was an error
# then anything non-error will be considered as True

8
lib/core/common.py
View File

@ -517,7 +517,7 @@ def paramToDict(place, parameters=None):
testableParameters = OrderedDict()
if conf.parameters.has_key(place) and not parameters:
if place in conf.parameters and not parameters:
parameters = conf.parameters[place]
if place != PLACE.SOAP:
@ -587,7 +587,7 @@ def paramToDict(place, parameters=None):
elif len(conf.testParameter) != len(testableParameters.keys()):
for parameter in conf.testParameter:
if not testableParameters.has_key(parameter):
if parameter not in testableParameters:
warnMsg = "provided parameter '%s' " % parameter
warnMsg += "is not inside the %s" % place
logger.warn(warnMsg)
@ -1087,7 +1087,7 @@ def parseTargetDirect():
import pyodbc
elif dbmsName == DBMS.FIREBIRD:
import kinterbasdb
except ImportError, _:
except ImportError:
errMsg = "sqlmap requires '%s' third-party library " % data[1]
errMsg += "in order to directly connect to the database "
errMsg += "%s. Download from '%s'" % (dbmsName, data[2])
@ -2424,7 +2424,7 @@ def initTechnique(technique=None):
warnMsg += "'%s'" % enumValueToNameLookup(PAYLOAD.TECHNIQUE, technique)
logger.warn(warnMsg)
except sqlmapDataException, _:
except sqlmapDataException:
errMsg = "missing data in old session file(s). "
errMsg += "Please use '--flush-session' to deal "
errMsg += "with this error"

11
plugins/generic/enumeration.py
View File

@ -280,7 +280,7 @@ class Enumeration:
password = parsePasswordHash(password)
if not kb.data.cachedUsersPasswords.has_key(user):
if user not in kb.data.cachedUsersPasswords:
kb.data.cachedUsersPasswords[user] = [password]
else:
kb.data.cachedUsersPasswords[user].append(password)
@ -521,7 +521,7 @@ class Enumeration:
if self.__isAdminFromPrivileges(privileges):
areAdmins.add(user)
if kb.data.cachedUsersPrivileges.has_key(user):
if user in kb.data.cachedUsersPrivileges:
kb.data.cachedUsersPrivileges[user].extend(privileges)
else:
kb.data.cachedUsersPrivileges[user] = list(privileges)
@ -830,7 +830,7 @@ class Enumeration:
if resumeAvailable:
for db, table in kb.brute.tables:
if db == conf.db:
if not kb.data.cachedTables.has_key(conf.db):
if conf.db not in kb.data.cachedTables:
kb.data.cachedTables[conf.db] = [table]
else:
kb.data.cachedTables[conf.db].append(table)
@ -882,7 +882,7 @@ class Enumeration:
db = safeSQLIdentificatorNaming(db)
table = safeSQLIdentificatorNaming(table, True)
if not kb.data.cachedTables.has_key(db):
if db not in kb.data.cachedTables:
kb.data.cachedTables[db] = [table]
else:
kb.data.cachedTables[db].append(table)
@ -1621,7 +1621,7 @@ class Enumeration:
for column in colList:
colLen = len(column)
if not kb.data.dumpedTable.has_key(column):
if column not in kb.data.dumpedTable:
kb.data.dumpedTable[column] = {"length": colLen, "values": []}
for entry in entries:
@ -2360,7 +2360,6 @@ class Enumeration:
def sqlQuery(self, query):
output = None
sqlType = None
getOutput = None
query = query.rstrip(';')