From 22b3fa074999f6d8ad94d3069a29ff79fdf02d10 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 27 Feb 2012 15:28:36 +0000 Subject: [PATCH] minor update --- lib/controller/controller.py | 13 +++++++++++-- lib/core/session.py | 9 --------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/controller/controller.py b/lib/controller/controller.py index 389c63006..28453cab5 100644 --- a/lib/controller/controller.py +++ b/lib/controller/controller.py @@ -173,8 +173,17 @@ def __randomFillBlankFields(value): return retVal def __saveToHashDB(): - kb.injections = [_ for _ in kb.injections if _ and _.place is not None and _.parameter is not None] - hashDBWrite(HASHDB_KEYS.KB_INJECTIONS, kb.injections, True) + injections = hashDBRetrieve(HASHDB_KEYS.KB_INJECTIONS, True) or [] + injections.extend(_ for _ in kb.injections if _ and _.place is not None and _.parameter is not None) + + _ = dict() + for injection in injections: + key = (injection.place, injection.parameter, injection.ptype) + if key not in _: + _[key] = injection + else: + _[key].data.update(injection.data) + hashDBWrite(HASHDB_KEYS.KB_INJECTIONS, _.values(), True) _ = hashDBRetrieve(HASHDB_KEYS.KB_ABS_FILE_PATHS, True) or set() _.update(kb.absFilePaths) diff --git a/lib/core/session.py b/lib/core/session.py index bd7e5a980..57d771f08 100644 --- a/lib/core/session.py +++ b/lib/core/session.py @@ -124,15 +124,6 @@ def setOs(): if condition: dataToSessionFile("[%s][%s][%s][OS][%s]\n" % (conf.url, kb.injection.place, safeFormatString(conf.parameters[kb.injection.place]), Backend.getOs())) -def setRemoteTempPath(): - condition = ( - not kb.resumedQueries or ( kb.resumedQueries.has_key(conf.url) and - not kb.resumedQueries[conf.url].has_key("Remote temp path") ) - ) - - if condition: - dataToSessionFile("[%s][%s][%s][Remote temp path][%s]\n" % (conf.url, kb.injection.place, safeFormatString(conf.parameters[kb.injection.place]), safeFormatString(conf.tmpPath))) - def setXpCmdshellAvailability(available): condition = ( not kb.resumedQueries or ( kb.resumedQueries.has_key(conf.url) and