mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2026-06-20 22:49:59 +00:00
Couple of bug fixes
This commit is contained in:
parent
bc4ce6e44a
commit
e24678fc31
11 changed files with 66 additions and 34 deletions
|
|
@ -27,11 +27,11 @@ class HTMLHandler(ContentHandler):
|
|||
|
||||
self._dbms = None
|
||||
self._page = (page or "")
|
||||
self._urldecodedPage = urldecode(self._page)
|
||||
try:
|
||||
self._lower_page = self._page.lower()
|
||||
self._lowerPage = self._urldecodedPage.lower() # Note: keyword pre-filter must match the page that re.search() runs on (the URL-decoded one)
|
||||
except SystemError: # https://bugs.python.org/issue18183
|
||||
self._lower_page = None
|
||||
self._urldecoded_page = urldecode(self._page)
|
||||
self._lowerPage = None
|
||||
|
||||
self.dbms = None
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ class HTMLHandler(ContentHandler):
|
|||
keywords = sorted(keywords, key=len)
|
||||
kb.cache.regex[regexp] = keywords[-1].lower()
|
||||
|
||||
if ('|' in regexp or kb.cache.regex[regexp] in (self._lower_page or kb.cache.regex[regexp])) and re.search(regexp, self._urldecoded_page, re.I):
|
||||
if ('|' in regexp or kb.cache.regex[regexp] in (self._lowerPage or kb.cache.regex[regexp])) and re.search(regexp, self._urldecodedPage, re.I):
|
||||
self.dbms = self._dbms
|
||||
self._markAsErrorPage()
|
||||
kb.forkNote = kb.forkNote or attrs.get("fork")
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ def parseSitemap(url, retVal=None, visited=None):
|
|||
raise SqlmapSyntaxException(errMsg)
|
||||
|
||||
if content:
|
||||
content = re.sub(r"", "", content, flags=re.DOTALL)
|
||||
content = re.sub(r"<!--.*?-->", "", content, flags=re.DOTALL) # Note: strip (possibly multi-line) XML comments so commented-out <loc> entries aren't harvested
|
||||
|
||||
for match in re.finditer(r"<\w*?loc[^>]*>\s*([^<]+)", content, re.I):
|
||||
if abortedFlag:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue