Added support for --scope also in WebScarab logs (-l)

This commit is contained in:
Bernardo Damele 2011-02-19 21:03:55 +00:00
parent f30dea74f3
commit 8e60acae5d

View File

@ -150,12 +150,15 @@ def __feedTargetsDict(reqFile, addedTargetUrls):
""" """
Parses web scarab logs (POST method not supported) Parses web scarab logs (POST method not supported)
""" """
reqResList = content.split(WEBSCARAB_SPLITTER) reqResList = content.split(WEBSCARAB_SPLITTER)
getPostReq = False
for request in reqResList: for request in reqResList:
url = extractRegexResult(r"URL: (?P<result>.+?)\n", request, re.I) url = extractRegexResult(r"URL: (?P<result>.+?)\n", request, re.I)
method = extractRegexResult(r"METHOD: (?P<result>.+?)\n", request, re.I) method = extractRegexResult(r"METHOD: (?P<result>.+?)\n", request, re.I)
cookie = extractRegexResult(r"COOKIE: (?P<result>.+?)\n", request, re.I) cookie = extractRegexResult(r"COOKIE: (?P<result>.+?)\n", request, re.I)
getPostReq = True
if not method or not url: if not method or not url:
logger.debug("Invalid log data") logger.debug("Invalid log data")
@ -168,9 +171,13 @@ def __feedTargetsDict(reqFile, addedTargetUrls):
logger.warning(warnMsg) logger.warning(warnMsg)
continue continue
if not kb.targetUrls or url not in addedTargetUrls: if conf.scope:
kb.targetUrls.add((url, method, None, cookie)) getPostReq &= re.search(conf.scope, url) is not None
addedTargetUrls.add(url)
if getPostReq:
if not kb.targetUrls or url not in addedTargetUrls:
kb.targetUrls.add((url, method, None, cookie))
addedTargetUrls.add(url)
def __parseBurpLog(content): def __parseBurpLog(content):
""" """