From 8e60acae5d61f8edcb3fff69b345f50827f1b433 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Sat, 19 Feb 2011 21:03:55 +0000 Subject: [PATCH] Added support for --scope also in WebScarab logs (-l) --- lib/core/option.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index ce3173a17..9ded7beed 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -150,12 +150,15 @@ def __feedTargetsDict(reqFile, addedTargetUrls): """ Parses web scarab logs (POST method not supported) """ + reqResList = content.split(WEBSCARAB_SPLITTER) + getPostReq = False for request in reqResList: url = extractRegexResult(r"URL: (?P.+?)\n", request, re.I) method = extractRegexResult(r"METHOD: (?P.+?)\n", request, re.I) cookie = extractRegexResult(r"COOKIE: (?P.+?)\n", request, re.I) + getPostReq = True if not method or not url: logger.debug("Invalid log data") @@ -168,9 +171,13 @@ def __feedTargetsDict(reqFile, addedTargetUrls): logger.warning(warnMsg) continue - if not kb.targetUrls or url not in addedTargetUrls: - kb.targetUrls.add((url, method, None, cookie)) - addedTargetUrls.add(url) + if conf.scope: + getPostReq &= re.search(conf.scope, url) is not None + + if getPostReq: + if not kb.targetUrls or url not in addedTargetUrls: + kb.targetUrls.add((url, method, None, cookie)) + addedTargetUrls.add(url) def __parseBurpLog(content): """