Skip to content

Commit 41ccf88

Browse files
stamparmstamparm
committed
some more refactoring
1 parent 0a039d8 commit 41ccf88

6 files changed

Lines changed: 59 additions & 55 deletions

File tree

‎lib/core/common.py‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,37 +1867,35 @@ def getFileItems(filename, commentPrefix='#', unicode_=True, lowercase=False, un
18671867
Returns newline delimited items contained inside file
18681868
"""
18691869

1870-
retVal = []
1870+
retVal = list() if not unique else set()
18711871

18721872
checkFile(filename)
18731873

1874-
if unicode_:
1875-
f = codecs.open(filename, 'r', UNICODE_ENCODING)
1876-
else:
1877-
f = open(filename, 'r')
1878-
1879-
for line in f.readlines(): # xreadlines doesn't return unicode strings when codec.open() is used
1880-
if commentPrefix:
1881-
if line.find(commentPrefix) != -1:
1882-
line = line[:line.find(commentPrefix)]
1874+
with codecs.open(filename, 'r', UNICODE_ENCODING) if unicode_ else open(filename, 'r') as f:
1875+
for line in (f.readlines() if unicode_ else f.xreadlines()): # xreadlines doesn't return unicode strings when codec.open() is used
1876+
if commentPrefix:
1877+
if line.find(commentPrefix) != -1:
1878+
line = line[:line.find(commentPrefix)]
18831879

1884-
line = line.strip()
1880+
line = line.strip()
18851881

1886-
if not unicode_:
1887-
try:
1888-
line = str.encode(line)
1889-
except UnicodeDecodeError:
1890-
continue
1891-
if line:
1892-
if lowercase:
1893-
line = line.lower()
1882+
if not unicode_:
1883+
try:
1884+
line = str.encode(line)
1885+
except UnicodeDecodeError:
1886+
continue
18941887

1895-
if unique and line in retVal:
1896-
continue
1888+
if line:
1889+
if lowercase:
1890+
line = line.lower()
18971891

1898-
retVal.append(line)
1892+
if unique and line in retVal:
1893+
continue
18991894

1900-
f.close()
1895+
if unique:
1896+
retVal.add(line)
1897+
else:
1898+
retVal.append(line)
19011899

19021900
return retVal
19031901

@@ -3019,8 +3017,11 @@ def asciifyUrl(url, forceQuote=False):
30193017
# apparently not an url
30203018
return url
30213019

3020+
if all(char in string.printable for char in url):
3021+
return url
3022+
30223023
# idna-encode domain
3023-
hostname = parts.hostname.encode('idna')
3024+
hostname = parts.hostname.encode("idna")
30243025

30253026
# UTF8-quote the other parts. We check each part individually if
30263027
# if needs to be quoted - that should catch some additional user
@@ -3031,14 +3032,14 @@ def quote(s, safe):
30313032
# Triggers on non-ascii characters - another option would be:
30323033
# urllib.quote(s.replace('%', '')) != s.replace('%', '')
30333034
# which would trigger on all %-characters, e.g. "&".
3034-
if s.encode('ascii', 'replace') != s or forceQuote:
3035-
return urllib.quote(s.encode('utf8'), safe=safe)
3035+
if s.encode("ascii", "replace") != s or forceQuote:
3036+
return urllib.quote(s.encode("utf8"), safe=safe)
30363037
return s
30373038

30383039
username = quote(parts.username, '')
30393040
password = quote(parts.password, safe='')
30403041
path = quote(parts.path, safe='/')
3041-
query = quote(parts.query, safe='&=')
3042+
query = quote(parts.query, safe="&=")
30423043

30433044
# put everything back together
30443045
netloc = hostname
@@ -3076,7 +3077,7 @@ def geturl(self):
30763077
warnMsg = "badly formed HTML at the given url ('%s'). Will try to filter it" % url
30773078
logger.warning(warnMsg)
30783079
response.seek(0)
3079-
filtered = _("".join(re.findall(r'<form(?!.+<form).+?</form>', response.read(), re.I | re.S)), response.geturl())
3080+
filtered = _("".join(re.findall(r"<form(?!.+<form).+?</form>", response.read(), re.I | re.S)), response.geturl())
30803081
try:
30813082
forms = ParseResponse(filtered, backwards_compat=False)
30823083
except ParseError:
@@ -3089,7 +3090,7 @@ def geturl(self):
30893090
if forms:
30903091
for form in forms:
30913092
for control in form.controls:
3092-
if hasattr(control, 'items'):
3093+
if hasattr(control, "items"):
30933094
# if control has selectable items select first non-disabled
30943095
for item in control.items:
30953096
if not item.disabled:

‎lib/core/option.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,6 +1490,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
14901490
kb.chars.dollar = ":%s:" % randomStr(length=1, lowercase=True)
14911491

14921492
if flushAll:
1493+
kb.headerPaths = {}
14931494
kb.keywords = set(getFileItems(paths.SQL_KEYWORDS))
14941495
kb.scanOnlyGoogleGETs = None
14951496
kb.tamperFunctions = []

‎lib/parse/cmdline.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ def cmdLineParser():
545545
miscellaneous = OptionGroup(parser, "Miscellaneous")
546546

547547
miscellaneous.add_option("-z", dest="mnemonics",
548-
help="Use mnemonics for shorter parameter setup")
548+
help="Use short mnemonics (e.g. \"flu,bat,ban,tec=EU\")")
549549

550550
miscellaneous.add_option("--beep", dest="beep",
551551
action="store_true",

‎lib/parse/handler.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"""
99

1010
import re
11+
1112
from xml.sax.handler import ContentHandler
1213
from lib.core.common import sanitizeStr
1314

@@ -33,19 +34,20 @@ def __feedInfo(self, key, value):
3334
if value in ( None, "None" ):
3435
return
3536

36-
if key in ( "dbmsVersion" ):
37+
if key == "dbmsVersion":
3738
self.__info[key] = value
3839
else:
3940
if key not in self.__info.keys():
4041
self.__info[key] = set()
4142

42-
for v in value.split("|"):
43-
self.__info[key].add(v)
43+
for _ in value.split("|"):
44+
self.__info[key].add(_)
4445

4546
def startElement(self, name, attrs):
4647
if name == "regexp":
4748
self.__regexp = sanitizeStr(attrs.get("value"))
4849
_ = re.match("\A[A-Za-z0-9]+", self.__regexp) # minor trick avoiding compiling of large amount of regexes
50+
4951
if _ and _.group(0).lower() in self.__banner.lower() or not _:
5052
self.__match = re.search(self.__regexp, self.__banner, re.I | re.M)
5153
else:

‎lib/parse/headers.py‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
See the file 'doc/COPYING' for copying permission
88
"""
99

10+
import itertools
1011
import os
1112

1213
from lib.core.common import checkFile
@@ -15,31 +16,31 @@
1516
from lib.core.data import paths
1617
from lib.parse.handler import FingerprintHandler
1718

19+
1820
def headersParser(headers):
1921
"""
2022
This function calls a class that parses the input HTTP headers to
2123
fingerprint the back-end database management system operating system
2224
and the web application technology
2325
"""
2426

25-
topHeaders = {
26-
"cookie": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "cookie.xml"),
27-
"microsoftsharepointteamservices": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "sharepoint.xml"),
28-
"server": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "server.xml"),
29-
"servlet-engine": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "servlet.xml"),
30-
"set-cookie": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "cookie.xml"),
31-
"x-aspnet-version": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "x-aspnet-version.xml"),
32-
"x-powered-by": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "x-powered-by.xml")
33-
}
34-
35-
for header in headers:
36-
if header in topHeaders:
37-
value = headers[header]
38-
xmlfile = topHeaders[header]
39-
40-
checkFile(xmlfile)
41-
42-
handler = FingerprintHandler(value, kb.headersFp)
43-
44-
parseXmlFile(xmlfile, handler)
45-
parseXmlFile(paths.GENERIC_XML, handler)
27+
if not kb.headerPaths:
28+
kb.headerPaths = {
29+
"cookie": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "cookie.xml"),
30+
"microsoftsharepointteamservices": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "sharepoint.xml"),
31+
"server": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "server.xml"),
32+
"servlet-engine": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "servlet.xml"),
33+
"set-cookie": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "cookie.xml"),
34+
"x-aspnet-version": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "x-aspnet-version.xml"),
35+
"x-powered-by": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "x-powered-by.xml")
36+
}
37+
38+
for header in itertools.ifilter(lambda x: x in kb.headerPaths, headers):
39+
value = headers[header]
40+
xmlfile = kb.headerPaths[header]
41+
checkFile(xmlfile)
42+
43+
handler = FingerprintHandler(value, kb.headersFp)
44+
45+
parseXmlFile(xmlfile, handler)
46+
parseXmlFile(paths.GENERIC_XML, handler)

‎plugins/generic/enumeration.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from lib.core.common import filterPairValues
2020
from lib.core.common import getRange
2121
from lib.core.common import getCompiledRegex
22-
from lib.core.common import getFileItems
2322
from lib.core.common import getUnicode
2423
from lib.core.common import isNoneValue
2524
from lib.core.common import isNumPosStrValue

0 commit comments

Comments
 (0)