conf.unescape->kb.unescape

lib/core/option.py

@@ -1402,7 +1402,6 @@ def __setConfAttributes():
     conf.tests = []
     conf.trafficFP = None
     conf.wFileType = None
-    conf.unescape = True
 
 def __setKnowledgeBaseAttributes(flushAll=True):
     """
@@ -1518,6 +1517,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
     kb.threadException = False
     kb.timeValidCharsRun = 0
     kb.uChar = NULL
+    kb.unescape = True
     kb.unionDuplicates = False
     kb.xpCmdshellAvailable = False
 

lib/core/unescaper.py

@@ -6,13 +6,13 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.common import Backend
-from lib.core.data import conf
+from lib.core.data import kb
 from lib.core.datatype import AttribDict
 from lib.core.settings import EXCLUDE_UNESCAPE
 
 class Unescaper(AttribDict):
     def unescape(self, expression, quote=True, dbms=None):
-        if not conf.unescape:
+        if not kb.unescape:
             return expression
 
         if expression is None:

plugins/generic/enumeration.py

@@ -2466,7 +2466,7 @@ class Enumeration:
                 dataToStdout("No output\n")
 
     def sqlFile(self):
-        conf.unescape = False
+        kb.unescape = False
 
         infoMsg = "executing SQL statements from given file(s)"
         logger.info(infoMsg)
@@ -2484,4 +2484,4 @@ class Enumeration:
 
             conf.dumper.query(query, self.sqlQuery(query))
 
-        conf.unescape = True
+        kb.unescape = True