Patch for an Issue #56 (full target url is now being written to a output .CSV file in multi target mode)

This commit is contained in:
Miroslav Stampar 2012-12-27 21:15:44 +01:00
parent cb91729913
commit 3d01890147
2 changed files with 3 additions and 3 deletions

View File

@ -29,6 +29,7 @@ from lib.core.common import intersect
from lib.core.common import parseTargetUrl from lib.core.common import parseTargetUrl
from lib.core.common import randomStr from lib.core.common import randomStr
from lib.core.common import readInput from lib.core.common import readInput
from lib.core.common import safeCSValue
from lib.core.common import showHttpErrorCodes from lib.core.common import showHttpErrorCodes
from lib.core.common import urlencode from lib.core.common import urlencode
from lib.core.common import urldecode from lib.core.common import urldecode
@ -220,7 +221,7 @@ def _saveToResultsFile():
for key, value in results.items(): for key, value in results.items():
place, parameter = key place, parameter = key
line = "%s,%s,%s,%s%s" % (conf.url, place, parameter, "".join(map(lambda x: techniques[x][0].upper(), sorted(value))), os.linesep) line = "%s,%s,%s,%s%s" % (safeCSValue(kb.originalUrls.get(conf.url) or conf.url), place, parameter, "".join(map(lambda x: techniques[x][0].upper(), sorted(value))), os.linesep)
conf.resultsFP.writelines(line) conf.resultsFP.writelines(line)
if not results: if not results:

View File

@ -1108,7 +1108,6 @@ def parseTargetUrl():
conf.httpHeaders = filter(lambda (key, value): key != HTTPHEADER.HOST, conf.httpHeaders) conf.httpHeaders = filter(lambda (key, value): key != HTTPHEADER.HOST, conf.httpHeaders)
conf.httpHeaders.append((HTTPHEADER.HOST, getHostHeader(conf.url))) conf.httpHeaders.append((HTTPHEADER.HOST, getHostHeader(conf.url)))
if originalUrl != conf.url:
kb.originalUrls[conf.url] = originalUrl kb.originalUrls[conf.url] = originalUrl
def expandAsteriskForColumns(expression): def expandAsteriskForColumns(expression):