From 1286cc0913bd6d25c65658a38f129b83ca439e11 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 20 Apr 2011 12:41:58 +0000
Subject: [PATCH] now showing trimmed output in for of warning message (UNION
 and ERROR techniques affected)

---
 lib/techniques/error/use.py        | 14 ++++++++++++++
 lib/techniques/inband/union/use.py | 10 ++++++++++
 2 files changed, 24 insertions(+)

diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
index b023ad3a3..ab44866a0 100644
--- a/lib/techniques/error/use.py
+++ b/lib/techniques/error/use.py
@@ -52,6 +52,8 @@ def __oneShotErrorUse(expression, field):
 
     while True:
         check = "%s(?P<result>.*?)%s" % (kb.misc.start, kb.misc.stop)
+        trimcheck = "%s(?P<result>.*?)</" % (kb.misc.start)
+
         nulledCastedField = agent.nullAndCastField(field)
 
         if Backend.getIdentifiedDbms() == DBMS.MYSQL:
@@ -82,6 +84,18 @@ def __oneShotErrorUse(expression, field):
 
         if output:
             output = getUnicode(output, kb.pageEncoding)
+        else:
+            trimmed = extractRegexResult(trimcheck, page, re.DOTALL | re.IGNORECASE) \
+                or extractRegexResult(trimcheck, listToStrValue(headers.headers \
+                if headers else None), re.DOTALL | re.IGNORECASE) \
+                or extractRegexResult(trimcheck, threadData.lastRedirectMsg[1] \
+                if threadData.lastRedirectMsg and threadData.lastRedirectMsg[0] == \
+                threadData.lastRequestUID else None, re.DOTALL | re.IGNORECASE)
+
+            if trimmed:
+                warnMsg  = "trimmed output output detected: "
+                warnMsg += trimmed
+                logger.warn(warnMsg)
 
         if isinstance(output, basestring):
             output = htmlunescape(output).replace("<br>", "\n")
diff --git a/lib/techniques/inband/union/use.py b/lib/techniques/inband/union/use.py
index 4976f0353..866201c86 100644
--- a/lib/techniques/inband/union/use.py
+++ b/lib/techniques/inband/union/use.py
@@ -44,6 +44,7 @@ def __oneShotUnionUse(expression, unpack=True):
     global reqCount
 
     check = "(?P<result>%s.*%s)" % (kb.misc.start, kb.misc.stop)
+    trimcheck = "%s(?P<result>.*?)</" % (kb.misc.start)
 
     # Prepare expression with delimiters
     expression = agent.concatQuery(expression, unpack)
@@ -72,6 +73,15 @@ def __oneShotUnionUse(expression, unpack=True):
 
     if output:
         output = getUnicode(output, kb.pageEncoding)
+    else:
+        trimmed = extractRegexResult(trimcheck, removeReflectiveValues(page, payload), re.DOTALL | re.IGNORECASE) \
+                or extractRegexResult(trimcheck, removeReflectiveValues(listToStrValue(headers.headers \
+                if headers else None), payload, True), re.DOTALL | re.IGNORECASE)
+
+        if trimmed:
+            warnMsg  = "trimmed output output detected: "
+            warnMsg += trimmed
+            logger.warn(warnMsg)
 
     return output