From 6632aa7308a264519aef2e4cb90b1b70ff8158e1 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 16 Feb 2012 13:46:01 +0000 Subject: [PATCH] some more refactoring --- lib/core/common.py | 13 +++----- lib/parse/banner.py | 62 +++++++++++++++++++------------------- lib/parse/handler.py | 70 +++++++++++++++++++++---------------------- xml/banner/cookie.xml | 4 +++ xml/errors.xml | 5 +--- 5 files changed, 75 insertions(+), 79 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 6a7a28fec..20ad267da 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -374,14 +374,11 @@ class Backend: _ = readInput(msg, default='1') if isinstance(_, basestring) and _.isdigit() and int(_) in ( 1, 2 ): - if int(_) == 1: - kb.arch = 32 - else: - kb.arch = 64 + kb.arch = 32 if int(_) == 1 else 64 break else: - warnMsg = "invalid value, valid values are 1 and 2" + warnMsg = "invalid value. Valid values are 1 and 2" logger.warn(warnMsg) return kb.arch @@ -482,10 +479,8 @@ class Backend: if Backend.getVersionList() is None: return False - for dbmsVersion in Backend.getVersionList(): - if dbmsVersion == UNKNOWN_DBMS_VERSION: - continue - elif dbmsVersion in versionList: + for _ in Backend.getVersionList(): + if _ != UNKNOWN_DBMS_VERSION and _ in versionList: return True return False diff --git a/lib/parse/banner.py b/lib/parse/banner.py index 2f77e8a8a..6a030c756 100644 --- a/lib/parse/banner.py +++ b/lib/parse/banner.py @@ -30,64 +30,64 @@ class MSSQLBannerHandler(ContentHandler): def __init__(self, banner, info): ContentHandler.__init__(self) - self.__banner = sanitizeStr(banner) - self.__inVersion = False - self.__inServicePack = False - self.__release = None - self.__version = "" - self.__versionAlt = None - self.__servicePack = "" - self.__info = info + self._banner = sanitizeStr(banner) + self._inVersion = False + self._inServicePack = False + self._release = None + self._version = "" + self._versionAlt = None + self._servicePack = "" + self._info = info - def __feedInfo(self, key, value): + def _feedInfo(self, key, value): value = sanitizeStr(value) if value in ( None, "None" ): return - self.__info[key] = value + self._info[key] = value def startElement(self, name, attrs): if name == "signatures": - self.__release = sanitizeStr(attrs.get("release")) + self._release = sanitizeStr(attrs.get("release")) elif name == "version": - self.__inVersion = True + self._inVersion = True elif name == "servicepack": - self.__inServicePack = True + self._inServicePack = True def characters(self, data): - if self.__inVersion: - self.__version += sanitizeStr(data) - elif self.__inServicePack: - self.__servicePack += sanitizeStr(data) + if self._inVersion: + self._version += sanitizeStr(data) + elif self._inServicePack: + self._servicePack += sanitizeStr(data) def endElement(self, name): if name == "signature": - for version in (self.__version, self.__versionAlt): + for version in (self._version, self._versionAlt): regObj = getCompiledRegex(" %s[\.\ ]+" % version) - if version and regObj.search(self.__banner): - self.__feedInfo("dbmsRelease", self.__release) - self.__feedInfo("dbmsVersion", self.__version) - self.__feedInfo("dbmsServicePack", self.__servicePack) + if version and regObj.search(self._banner): + self._feedInfo("dbmsRelease", self._release) + self._feedInfo("dbmsVersion", self._version) + self._feedInfo("dbmsServicePack", self._servicePack) break - self.__version = "" - self.__versionAlt = None - self.__servicePack = "" + self._version = "" + self._versionAlt = None + self._servicePack = "" elif name == "version": - self.__inVersion = False - self.__version = self.__version.replace(" ", "") + self._inVersion = False + self._version = self._version.replace(" ", "") regObj = getCompiledRegex(r"\A(?P\d+)\.00\.(?P\d+)\Z") - match = regObj.search(self.__version) - self.__versionAlt = "%s.0.%s.0" % (match.group('major'), match.group('build')) if match else None + match = regObj.search(self._version) + self._versionAlt = "%s.0.%s.0" % (match.group('major'), match.group('build')) if match else None elif name == "servicepack": - self.__inServicePack = False - self.__servicePack = self.__servicePack.replace(" ", "") + self._inServicePack = False + self._servicePack = self._servicePack.replace(" ", "") def bannerParser(banner): """ diff --git a/lib/parse/handler.py b/lib/parse/handler.py index b466a2a72..87c8a0a27 100644 --- a/lib/parse/handler.py +++ b/lib/parse/handler.py @@ -21,60 +21,60 @@ class FingerprintHandler(ContentHandler): def __init__(self, banner, info): ContentHandler.__init__(self) - self.__banner = sanitizeStr(banner) - self.__regexp = None - self.__match = None - self.__dbmsVersion = None - self.__techVersion = None - self.__info = info + self._banner = sanitizeStr(banner) + self._regexp = None + self._match = None + self._dbmsVersion = None + self._techVersion = None + self._info = info - def __feedInfo(self, key, value): + def _feedInfo(self, key, value): value = sanitizeStr(value) if value in ( None, "None" ): return if key == "dbmsVersion": - self.__info[key] = value + self._info[key] = value else: - if key not in self.__info.keys(): - self.__info[key] = set() + if key not in self._info.keys(): + self._info[key] = set() for _ in value.split("|"): - self.__info[key].add(_) + self._info[key].add(_) def startElement(self, name, attrs): if name == "regexp": - self.__regexp = sanitizeStr(attrs.get("value")) - _ = re.match("\A[A-Za-z0-9]+", self.__regexp) # minor trick avoiding compiling of large amount of regexes + self._regexp = sanitizeStr(attrs.get("value")) + _ = 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 _: - self.__match = re.search(self.__regexp, self.__banner, re.I | re.M) + if _ and _.group(0).lower() in self._banner.lower() or not _: + self._match = re.search(self._regexp, self._banner, re.I | re.M) else: - self.__match = None + self._match = None - if name == "info" and self.__match: - self.__feedInfo("type", attrs.get("type")) - self.__feedInfo("distrib", attrs.get("distrib")) - self.__feedInfo("release", attrs.get("release")) - self.__feedInfo("codename", attrs.get("codename")) + if name == "info" and self._match: + self._feedInfo("type", attrs.get("type")) + self._feedInfo("distrib", attrs.get("distrib")) + self._feedInfo("release", attrs.get("release")) + self._feedInfo("codename", attrs.get("codename")) - self.__dbmsVersion = sanitizeStr(attrs.get("dbms_version")) - self.__techVersion = sanitizeStr(attrs.get("tech_version")) - self.__sp = sanitizeStr(attrs.get("sp")) + self._dbmsVersion = sanitizeStr(attrs.get("dbms_version")) + self._techVersion = sanitizeStr(attrs.get("tech_version")) + self._sp = sanitizeStr(attrs.get("sp")) - if self.__dbmsVersion.isdigit(): - self.__feedInfo("dbmsVersion", self.__match.group(int(self.__dbmsVersion))) + if self._dbmsVersion.isdigit(): + self._feedInfo("dbmsVersion", self._match.group(int(self._dbmsVersion))) - if self.__techVersion.isdigit(): - self.__feedInfo("technology", "%s %s" % (attrs.get("technology"), self.__match.group(int(self.__techVersion)))) + if self._techVersion.isdigit(): + self._feedInfo("technology", "%s %s" % (attrs.get("technology"), self._match.group(int(self._techVersion)))) else: - self.__feedInfo("technology", attrs.get("technology")) + self._feedInfo("technology", attrs.get("technology")) - if self.__sp.isdigit(): - self.__feedInfo("sp", "Service Pack %s" % self.__match.group(int(self.__sp))) + if self._sp.isdigit(): + self._feedInfo("sp", "Service Pack %s" % self._match.group(int(self._sp))) - self.__regexp = None - self.__match = None - self.__dbmsVersion = None - self.__techVersion = None + self._regexp = None + self._match = None + self._dbmsVersion = None + self._techVersion = None diff --git a/xml/banner/cookie.xml b/xml/banner/cookie.xml index ff1719582..c9e34d2ce 100644 --- a/xml/banner/cookie.xml +++ b/xml/banner/cookie.xml @@ -30,4 +30,8 @@ + + + + diff --git a/xml/errors.xml b/xml/errors.xml index 683fc7d08..4997f7dc2 100644 --- a/xml/errors.xml +++ b/xml/errors.xml @@ -48,10 +48,7 @@ - - - - +