From f622995a2930f673c56383afde049cd39a159ee1 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Thu, 22 Dec 2011 12:20:21 +0000
Subject: [PATCH] compatibility with partial union and error technique resumed
 data

---
 lib/controller/checks.py     | 1 -
 lib/controller/controller.py | 8 ++++++--
 lib/core/common.py           | 1 -
 lib/core/target.py           | 1 +
 lib/techniques/error/use.py  | 4 ++++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index 8f59bcdffaf..9f3cadead1e 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -472,7 +472,6 @@ def genCmpPayload():
                         injection.data[stype].comment = comment
                         injection.data[stype].templatePayload = templatePayload
                         injection.data[stype].matchRatio = kb.matchRatio
-                        injection.data[stype].chars = kb.chars
 
                         injection.conf.textOnly = conf.textOnly
                         injection.conf.titles = conf.titles
diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index 29fdf3d9c73..8127bc02ff1 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -176,12 +176,16 @@ def __saveToSessionFile():
 
         setInjection(inj)
 
-def __saveAbsFilePaths():
+def __saveToHashDB():
     key = "kb.absFilePaths"
     value = unserializeObject(conf.hashDB.retrieve(key)) or set()
     value.update(kb.absFilePaths)
     conf.hashDB.write(key, serializeObject(value))
 
+    key = "kb.chars"
+    if not conf.hashDB.retrieve(key):
+        conf.hashDB.write(key, serializeObject(kb.chars))
+
 def __saveToResultsFile():
     if not conf.resultsFP:
         return
@@ -568,7 +572,7 @@ def start():
 
                 __saveToSessionFile()
                 __saveToResultsFile()
-                __saveAbsFilePaths()
+                __saveToHashDB()
                 __showInjections()
                 __selectInjection()
 
diff --git a/lib/core/common.py b/lib/core/common.py
index 6edc36ab09c..9920e1478e2 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -2505,7 +2505,6 @@ def initTechnique(technique=None):
         if data:
             kb.pageTemplate, kb.errorIsNone = getPageTemplate(data.templatePayload, kb.injection.place)
             kb.matchRatio = data.matchRatio
-            kb.chars = data.chars
 
             # Restoring stored conf options
             for key, value in kb.injection.conf.items():
diff --git a/lib/core/target.py b/lib/core/target.py
index bae9de675b8..c6826e68f7f 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -210,6 +210,7 @@ def __resumeHashDBValues():
     """
 
     kb.absFilePaths = unserializeObject(conf.hashDB.retrieve("kb.absFilePaths")) or kb.absFilePaths
+    kb.chars = unserializeObject(conf.hashDB.retrieve("kb.chars")) or kb.chars
 
 def __setOutputResume():
     """
diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
index 627db3362d2..f3fb205aabc 100644
--- a/lib/techniques/error/use.py
+++ b/lib/techniques/error/use.py
@@ -130,6 +130,10 @@ def __oneShotErrorUse(expression, field):
 
         conf.hashDB.write(expression, retVal)
 
+    else:
+        check = "%s(?P<result>.*?)%s" % (kb.chars.start, kb.chars.stop)
+        retVal = extractRegexResult(check, retVal, re.DOTALL | re.IGNORECASE) or retVal
+
     return safecharencode(retVal) if kb.safeCharEncode else retVal
 
 def __errorFields(expression, expressionFields, expressionFieldsList, expected=None, num=None, resumeValue=True):