From 00449f1402f0acc94a9e9555fb2ce19d1d7e6d89 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 20 Oct 2010 09:54:17 +0000 Subject: [PATCH] fix/upgrade/chicken soup --- lib/controller/handler.py | 4 ++-- lib/techniques/error/use.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/controller/handler.py b/lib/controller/handler.py index ff9af8b17..1aad55252 100644 --- a/lib/controller/handler.py +++ b/lib/controller/handler.py @@ -81,9 +81,9 @@ def setHandler(): continue - handler = dbmsMap() + kb.misc.handler = handler = dbmsMap() conf.dbmsConnector = dbmsConn() - + if conf.direct: logger.debug("forcing timeout to 10 seconds") conf.timeout = 10 diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py index 386136ff7..6b6b1b899 100644 --- a/lib/techniques/error/use.py +++ b/lib/techniques/error/use.py @@ -43,6 +43,8 @@ def errorUse(expression, resumeValue=True): startLimiter = "" endLimiter = "" + expressionUnescaped = expression + if resumeValue: output = resume(expression, payload) else: @@ -61,7 +63,9 @@ def errorUse(expression, resumeValue=True): startLimiter = unescaper.unescape("'%s'" % ERROR_START_CHAR) endLimiter = unescaper.unescape("'%s'" % ERROR_END_CHAR) else: - expressionUnescaped = unescaper.unescape(expression) + expressionUnescaped = kb.misc.handler.unescape(expression) + startLimiter = kb.misc.handler.unescape("'%s'" % ERROR_START_CHAR) + endLimiter = kb.misc.handler.unescape("'%s'" % ERROR_END_CHAR) debugMsg = "query: %s" % expressionUnescaped logger.debug(debugMsg)