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

some more refactoring

Browse Source
This commit is contained in:
Miroslav Stampar 2012-02-16 13:46:01 +00:00
parent 32ca99da53
commit 6632aa7308
5 changed files with 75 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/core/common.py
View File

@ -374,14 +374,11 @@ class Backend:
_ = readInput(msg, default='1') _ = readInput(msg, default='1')
if isinstance(_, basestring) and _.isdigit() and int(_) in ( 1, 2 ): if isinstance(_, basestring) and _.isdigit() and int(_) in ( 1, 2 ):
if int(_) == 1: kb.arch = 32 if int(_) == 1 else 64
kb.arch = 32
else:
kb.arch = 64
break break
else: else:
warnMsg = "invalid value, valid values are 1 and 2" warnMsg = "invalid value. Valid values are 1 and 2"
logger.warn(warnMsg) logger.warn(warnMsg)
return kb.arch return kb.arch
@ -482,10 +479,8 @@ class Backend:
if Backend.getVersionList() is None: if Backend.getVersionList() is None:
return False return False
for dbmsVersion in Backend.getVersionList(): for _ in Backend.getVersionList():
if dbmsVersion == UNKNOWN_DBMS_VERSION: if _ != UNKNOWN_DBMS_VERSION and _ in versionList:
continue
elif dbmsVersion in versionList:
return True return True
return False return False

62
lib/parse/banner.py
View File

@ -30,64 +30,64 @@ class MSSQLBannerHandler(ContentHandler):
def __init__(self, banner, info): def __init__(self, banner, info):
ContentHandler.__init__(self) ContentHandler.__init__(self)
self.__banner = sanitizeStr(banner) self._banner = sanitizeStr(banner)
self.__inVersion = False self._inVersion = False
self.__inServicePack = False self._inServicePack = False
self.__release = None self._release = None
self.__version = "" self._version = ""
self.__versionAlt = None self._versionAlt = None
self.__servicePack = "" self._servicePack = ""
self.__info = info self._info = info
def __feedInfo(self, key, value): def _feedInfo(self, key, value):
value = sanitizeStr(value) value = sanitizeStr(value)
if value in ( None, "None" ): if value in ( None, "None" ):
return return
self.__info[key] = value self._info[key] = value
def startElement(self, name, attrs): def startElement(self, name, attrs):
if name == "signatures": if name == "signatures":
self.__release = sanitizeStr(attrs.get("release")) self._release = sanitizeStr(attrs.get("release"))
elif name == "version": elif name == "version":
self.__inVersion = True self._inVersion = True
elif name == "servicepack": elif name == "servicepack":
self.__inServicePack = True self._inServicePack = True
def characters(self, data): def characters(self, data):
if self.__inVersion: if self._inVersion:
self.__version += sanitizeStr(data) self._version += sanitizeStr(data)
elif self.__inServicePack: elif self._inServicePack:
self.__servicePack += sanitizeStr(data) self._servicePack += sanitizeStr(data)
def endElement(self, name): def endElement(self, name):
if name == "signature": if name == "signature":
for version in (self.__version, self.__versionAlt): for version in (self._version, self._versionAlt):
regObj = getCompiledRegex(" %s[\.\ ]+" % version) regObj = getCompiledRegex(" %s[\.\ ]+" % version)
if version and regObj.search(self.__banner): if version and regObj.search(self._banner):
self.__feedInfo("dbmsRelease", self.__release) self._feedInfo("dbmsRelease", self._release)
self.__feedInfo("dbmsVersion", self.__version) self._feedInfo("dbmsVersion", self._version)
self.__feedInfo("dbmsServicePack", self.__servicePack) self._feedInfo("dbmsServicePack", self._servicePack)
break break
self.__version = "" self._version = ""
self.__versionAlt = None self._versionAlt = None
self.__servicePack = "" self._servicePack = ""
elif name == "version": elif name == "version":
self.__inVersion = False self._inVersion = False
self.__version = self.__version.replace(" ", "") self._version = self._version.replace(" ", "")
regObj = getCompiledRegex(r"\A(?P<major>\d+)\.00\.(?P<build>\d+)\Z") regObj = getCompiledRegex(r"\A(?P<major>\d+)\.00\.(?P<build>\d+)\Z")
match = regObj.search(self.__version) match = regObj.search(self._version)
self.__versionAlt = "%s.0.%s.0" % (match.group('major'), match.group('build')) if match else None self._versionAlt = "%s.0.%s.0" % (match.group('major'), match.group('build')) if match else None
elif name == "servicepack": elif name == "servicepack":
self.__inServicePack = False self._inServicePack = False
self.__servicePack = self.__servicePack.replace(" ", "") self._servicePack = self._servicePack.replace(" ", "")
def bannerParser(banner): def bannerParser(banner):
""" """

70
lib/parse/handler.py
View File

@ -21,60 +21,60 @@ class FingerprintHandler(ContentHandler):
def __init__(self, banner, info): def __init__(self, banner, info):
ContentHandler.__init__(self) ContentHandler.__init__(self)
self.__banner = sanitizeStr(banner) self._banner = sanitizeStr(banner)
self.__regexp = None self._regexp = None
self.__match = None self._match = None
self.__dbmsVersion = None self._dbmsVersion = None
self.__techVersion = None self._techVersion = None
self.__info = info self._info = info
def __feedInfo(self, key, value): def _feedInfo(self, key, value):
value = sanitizeStr(value) value = sanitizeStr(value)
if value in ( None, "None" ): if value in ( None, "None" ):
return return
if key == "dbmsVersion": if key == "dbmsVersion":
self.__info[key] = value self._info[key] = value
else: else:
if key not in self.__info.keys(): if key not in self._info.keys():
self.__info[key] = set() self._info[key] = set()
for _ in value.split("|"): for _ in value.split("|"):
self.__info[key].add(_) self._info[key].add(_)
def startElement(self, name, attrs): def startElement(self, name, attrs):
if name == "regexp": if name == "regexp":
self.__regexp = sanitizeStr(attrs.get("value")) self._regexp = sanitizeStr(attrs.get("value"))
_ = re.match("\A[A-Za-z0-9]+", self.__regexp) # minor trick avoiding compiling of large amount of regexes _ = re.match("\A[A-Za-z0-9]+", self._regexp) # minor trick avoiding compiling of large amount of regexes
if _ and _.group(0).lower() in self.__banner.lower() or not _: if _ and _.group(0).lower() in self._banner.lower() or not _:
self.__match = re.search(self.__regexp, self.__banner, re.I | re.M) self._match = re.search(self._regexp, self._banner, re.I | re.M)
else: else:
self.__match = None self._match = None
if name == "info" and self.__match: if name == "info" and self._match:
self.__feedInfo("type", attrs.get("type")) self._feedInfo("type", attrs.get("type"))
self.__feedInfo("distrib", attrs.get("distrib")) self._feedInfo("distrib", attrs.get("distrib"))
self.__feedInfo("release", attrs.get("release")) self._feedInfo("release", attrs.get("release"))
self.__feedInfo("codename", attrs.get("codename")) self._feedInfo("codename", attrs.get("codename"))
self.__dbmsVersion = sanitizeStr(attrs.get("dbms_version")) self._dbmsVersion = sanitizeStr(attrs.get("dbms_version"))
self.__techVersion = sanitizeStr(attrs.get("tech_version")) self._techVersion = sanitizeStr(attrs.get("tech_version"))
self.__sp = sanitizeStr(attrs.get("sp")) self._sp = sanitizeStr(attrs.get("sp"))
if self.__dbmsVersion.isdigit(): if self._dbmsVersion.isdigit():
self.__feedInfo("dbmsVersion", self.__match.group(int(self.__dbmsVersion))) self._feedInfo("dbmsVersion", self._match.group(int(self._dbmsVersion)))
if self.__techVersion.isdigit(): if self._techVersion.isdigit():
self.__feedInfo("technology", "%s %s" % (attrs.get("technology"), self.__match.group(int(self.__techVersion)))) self._feedInfo("technology", "%s %s" % (attrs.get("technology"), self._match.group(int(self._techVersion))))
else: else:
self.__feedInfo("technology", attrs.get("technology")) self._feedInfo("technology", attrs.get("technology"))
if self.__sp.isdigit(): if self._sp.isdigit():
self.__feedInfo("sp", "Service Pack %s" % self.__match.group(int(self.__sp))) self._feedInfo("sp", "Service Pack %s" % self._match.group(int(self._sp)))
self.__regexp = None self._regexp = None
self.__match = None self._match = None
self.__dbmsVersion = None self._dbmsVersion = None
self.__techVersion = None self._techVersion = None

4
xml/banner/cookie.xml
View File

@ -30,4 +30,8 @@
<regexp value="JServSessionId"> <regexp value="JServSessionId">
<info technology="Apache|JSP"/> <info technology="Apache|JSP"/>
</regexp> </regexp>
<regexp value="CFID|CFTOKEN|CFMAGIC">
<info technology="ColdFusion"/>
</regexp>
</root> </root>

5
xml/errors.xml
View File

@ -48,10 +48,7 @@
<dbms value="IBM DB2"> <dbms value="IBM DB2">
<error regexp="CLI Driver.*DB2"/> <error regexp="CLI Driver.*DB2"/>
<error regexp="DB2 SQL error"/> <error regexp="DB2 SQL error"/>
<error regexp="db2_connect\("/> <error regexp="db2_\w+\("/>
<error regexp="db2_exec\("/>
<error regexp="db2_execute\("/>
<error regexp="db2_fetch_"/>
</dbms> </dbms>
<!-- Informix --> <!-- Informix -->