sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-03-03 19:55:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor optimization

Browse Source
This commit is contained in:
Miroslav Stampar 2011-11-20 19:38:56 +00:00
parent e1a92d59de
commit 7c1af97852
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/core/common.py
View File

@ -309,7 +309,7 @@ class DynamicContentItem:
class Format: class Format:
@staticmethod @staticmethod
def humanize(values, chain=" or "): def humanize(values, chain=" or "):
strJoin = "|".join([v for v in values]) strJoin = "|".join(v for v in values)
return strJoin.replace("|", chain) return strJoin.replace("|", chain)
@ -330,7 +330,7 @@ class Format:
if versions is None: if versions is None:
return Backend.getDbms() return Backend.getDbms()
else: else:
return "%s %s" % (Backend.getDbms(), " and ".join([v for v in versions])) return "%s %s" % (Backend.getDbms(), " and ".join(v for v in versions))
@staticmethod @staticmethod
def getErrorParsedDBMSes(): def getErrorParsedDBMSes():
@ -350,7 +350,7 @@ class Format:
elif len(kb.htmlFp) == 1: elif len(kb.htmlFp) == 1:
htmlParsed = kb.htmlFp[0] htmlParsed = kb.htmlFp[0]
elif len(kb.htmlFp) > 1: elif len(kb.htmlFp) > 1:
htmlParsed = " or ".join([htmlFp for htmlFp in kb.htmlFp]) htmlParsed = " or ".join(htmlFp for htmlFp in kb.htmlFp)
return htmlParsed return htmlParsed
@ -932,7 +932,7 @@ def readInput(message, default=None, checkBatch=True):
if checkBatch and conf.batch: if checkBatch and conf.batch:
if isinstance(default, (list, tuple, set)): if isinstance(default, (list, tuple, set)):
options = ",".join([getUnicode(opt, UNICODE_ENCODING) for opt in default]) options = ",".join(getUnicode(opt, UNICODE_ENCODING) for opt in default)
elif default: elif default:
options = getUnicode(default, UNICODE_ENCODING) options = getUnicode(default, UNICODE_ENCODING)
else: else:
@ -980,7 +980,7 @@ def randomInt(length=4):
@rtype: C{str} @rtype: C{str}
""" """
return int("".join([random.choice(string.digits if i!=0 else string.digits.replace('0', '')) for i in xrange(0, length)])) return int("".join(random.choice(string.digits if i!=0 else string.digits.replace('0', '')) for i in xrange(0, length)))
def randomStr(length=4, lowercase=False, alphabet=None): def randomStr(length=4, lowercase=False, alphabet=None):
""" """
@ -992,11 +992,11 @@ def randomStr(length=4, lowercase=False, alphabet=None):
""" """
if alphabet: if alphabet:
rndStr = "".join([random.choice(alphabet) for _ in xrange(0, length)]) rndStr = "".join(random.choice(alphabet) for _ in xrange(0, length))
elif lowercase: elif lowercase:
rndStr = "".join([random.choice(string.lowercase) for _ in xrange(0, length)]) rndStr = "".join(random.choice(string.lowercase) for _ in xrange(0, length))
else: else:
rndStr = "".join([random.choice(string.letters) for _ in xrange(0, length)]) rndStr = "".join(random.choice(string.letters) for _ in xrange(0, length))
return rndStr return rndStr
@ -1307,7 +1307,7 @@ def expandAsteriskForColumns(expression):
if columnsDict and conf.db in columnsDict and conf.tbl in columnsDict[conf.db]: if columnsDict and conf.db in columnsDict and conf.tbl in columnsDict[conf.db]:
columns = columnsDict[conf.db][conf.tbl].keys() columns = columnsDict[conf.db][conf.tbl].keys()
columns.sort() columns.sort()
columnsStr = ", ".join([column for column in columns]) columnsStr = ", ".join(column for column in columns)
expression = expression.replace("*", columnsStr, 1) expression = expression.replace("*", columnsStr, 1)
infoMsg = "the query with column names is: " infoMsg = "the query with column names is: "
@ -1359,7 +1359,7 @@ def parseUnionPage(output, expression, partial=False, condition=None, sort=True)
) )
if partial or not condition: if partial or not condition:
logOutput = "".join(["%s%s%s" % (DUMP_START_MARKER, replaceNewlineTabs(value), DUMP_STOP_MARKER) for value in output]) logOutput = "".join("%s%s%s" % (DUMP_START_MARKER, replaceNewlineTabs(value), DUMP_STOP_MARKER) for value in output)
dataToSessionFile("[%s][%s][%s][%s][%s]\n" % (conf.url, kb.injection.place, conf.parameters[kb.injection.place], expression, logOutput)) dataToSessionFile("[%s][%s][%s][%s][%s]\n" % (conf.url, kb.injection.place, conf.parameters[kb.injection.place], expression, logOutput))
if sort: if sort:
@ -2774,7 +2774,7 @@ def removeReflectiveValues(content, payload, suppressWarning=False):
while 2 * REFLECTED_NON_ALPHA_NUM_REGEX in regex: while 2 * REFLECTED_NON_ALPHA_NUM_REGEX in regex:
regex = regex.replace(2 * REFLECTED_NON_ALPHA_NUM_REGEX, REFLECTED_NON_ALPHA_NUM_REGEX) regex = regex.replace(2 * REFLECTED_NON_ALPHA_NUM_REGEX, REFLECTED_NON_ALPHA_NUM_REGEX)
if all([part.lower() in content.lower() for part in regex.split(REFLECTED_NON_ALPHA_NUM_REGEX)]): # fast optimization check if all(part.lower() in content.lower() for part in regex.split(REFLECTED_NON_ALPHA_NUM_REGEX)): # fast optimization check
parts = regex.split(REFLECTED_NON_ALPHA_NUM_REGEX) parts = regex.split(REFLECTED_NON_ALPHA_NUM_REGEX)
if len(parts) > REFLECTED_MAX_REGEX_PARTS: # preventing CPU hogs if len(parts) > REFLECTED_MAX_REGEX_PARTS: # preventing CPU hogs
regex = "%s.+?%s" % (REFLECTED_NON_ALPHA_NUM_REGEX.join(parts[:REFLECTED_MAX_REGEX_PARTS/2]), REFLECTED_NON_ALPHA_NUM_REGEX.join(parts[-REFLECTED_MAX_REGEX_PARTS/2:])) regex = "%s.+?%s" % (REFLECTED_NON_ALPHA_NUM_REGEX.join(parts[:REFLECTED_MAX_REGEX_PARTS/2]), REFLECTED_NON_ALPHA_NUM_REGEX.join(parts[-REFLECTED_MAX_REGEX_PARTS/2:]))