Minor improvement to UNION file write

This commit is contained in:
Miroslav Stampar 2015-07-26 17:02:46 +02:00
parent 64b45f2ac2
commit 401905b2dd
3 changed files with 9 additions and 1 deletions

View File

@ -79,7 +79,9 @@ class Agent(object):
retVal = "" retVal = ""
if where is None and isTechniqueAvailable(kb.technique): if kb.forceWhere:
where = kb.forceWhere
elif where is None and isTechniqueAvailable(kb.technique):
where = kb.injection.data[kb.technique].where where = kb.injection.data[kb.technique].where
if kb.injection.place is not None: if kb.injection.place is not None:

View File

@ -1795,6 +1795,7 @@ def _setKnowledgeBaseAttributes(flushAll=True):
kb.followSitemapRecursion = None kb.followSitemapRecursion = None
kb.forcedDbms = None kb.forcedDbms = None
kb.forcePartialUnion = False kb.forcePartialUnion = False
kb.forceWhere = None
kb.futileUnion = None kb.futileUnion = None
kb.headersFp = {} kb.headersFp = {}
kb.heuristicDbms = None kb.heuristicDbms = None

View File

@ -7,6 +7,8 @@ See the file 'doc/COPYING' for copying permission
from lib.core.common import isNumPosStrValue from lib.core.common import isNumPosStrValue
from lib.core.common import isTechniqueAvailable from lib.core.common import isTechniqueAvailable
from lib.core.common import popValue
from lib.core.common import pushValue
from lib.core.common import randomStr from lib.core.common import randomStr
from lib.core.common import singleTimeWarnMessage from lib.core.common import singleTimeWarnMessage
from lib.core.data import conf from lib.core.data import conf
@ -97,8 +99,11 @@ class Filesystem(GenericFilesystem):
debugMsg = "exporting the %s file content to file '%s'" % (fileType, dFile) debugMsg = "exporting the %s file content to file '%s'" % (fileType, dFile)
logger.debug(debugMsg) logger.debug(debugMsg)
pushValue(kb.forceWhere)
kb.forceWhere = PAYLOAD.WHERE.NEGATIVE
sqlQuery = "%s INTO DUMPFILE '%s'" % (fcEncodedStr, dFile) sqlQuery = "%s INTO DUMPFILE '%s'" % (fcEncodedStr, dFile)
unionUse(sqlQuery, unpack=False) unionUse(sqlQuery, unpack=False)
kb.forceWhere = popValue()
warnMsg = "expect junk characters inside the " warnMsg = "expect junk characters inside the "
warnMsg += "file as a leftover from UNION query" warnMsg += "file as a leftover from UNION query"