Fix for an Issue #198

This commit is contained in:
Miroslav Stampar 2012-10-09 11:27:19 +02:00
parent 5a91b6e622
commit 10b0fd21dc

View File

@ -217,20 +217,22 @@ def __feedTargetsDict(reqFile, addedTargetUrls):
""" """
Parses burp logs Parses burp logs
""" """
port = None
scheme = None
reqResList = re.findall(BURP_REQUEST_REGEX, content, re.I | re.S) if not re.search(BURP_REQUEST_REGEX, content, re.I | re.S):
if not reqResList:
reqResList = [content] reqResList = [content]
else:
reqResList = re.finditer(BURP_REQUEST_REGEX, content, re.I | re.S)
for request in reqResList: for match in reqResList:
if scheme is None: request = match if isinstance(match, basestring) else match.group(0)
schemePort = re.search(r"(http[\w]*)\:\/\/.*?\:([\d]+).+?={10,}", request, re.I | re.S)
if schemePort: schemePort = re.search(r"(http[\w]*)\:\/\/.*?\:([\d]+).+?={10,}", request, re.I | re.S)
scheme = schemePort.group(1)
port = schemePort.group(2) if schemePort:
scheme = schemePort.group(1)
port = schemePort.group(2)
else:
scheme, port = None, None
if not re.search (r"^[\n]*(GET|POST).*?\sHTTP\/", request, re.I | re.M): if not re.search (r"^[\n]*(GET|POST).*?\sHTTP\/", request, re.I | re.M):
continue continue