minor fixes

stamparm · stamparm · commit b45ae10da40e · 2012-04-11T21:36:37.000Z
diff --git a/lib/controller/checks.py b/lib/controller/checks.py
@@ -349,7 +349,7 @@ def genCmpPayload():
                             if not injectable and not conf.string:
                                 trueSet = set(extractTextTagContent(truePage))
                                 falseSet = set(extractTextTagContent(falsePage))
-                                candidate = reduce(lambda x, y: x or (y.strip() if y.strip() in (kb.pageTemplate or "") else None), (trueSet - falseSet), None)
+                                candidate = reduce(lambda x, y: x or (y.strip() if y.strip() in (kb.pageTemplate or "") and y.strip() not in falsePage else None), (trueSet - falseSet), None)
                                 if candidate:
                                     conf.string = candidate
                                     infoMsg = "%s parameter '%s' seems to be '%s' injectable (with --string=%s)" % (place, parameter, title, repr(candidate).lstrip('u'))
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -2161,8 +2161,8 @@ def extractTextTagContent(page):
     Returns list containing content from "textual" tags
     """
 
-    page = re.sub(r"(?si)[^\s]*%s[^<]*" % REFLECTED_VALUE_MARKER, "", page or "")
-    return [_.group('result') for _ in re.finditer(TEXT_TAG_REGEX, page)]
+    page = re.sub(r"(?si)[^\s>]*%s[^<]*" % REFLECTED_VALUE_MARKER, "", page or "")
+    return filter(None, (_.group('result').strip() for _ in re.finditer(TEXT_TAG_REGEX, page)))
 
 def trimAlphaNum(value):
     """
