@@ -5645,7 +5645,7 @@ def pollProcess(process, suppress_errors=False):
56455645
56465646def parseRequestFile (reqFile , checkParams = True ):
56475647 """
5648- Parses WebScarab and Burp logs and adds results to the target URL list
5648+ Parses WebScarab, Burp and HAR logs and adds results to the target URL list
56495649
56505650 >>> handle, reqFile = tempfile.mkstemp(suffix=".req")
56515651 >>> content = b"POST / HTTP/1.0\\ nUser-agent: foobar\\ nHost: www.example.com\\ n\\ nid=1\\ n"
@@ -5689,7 +5689,23 @@ def _parseBurpLog(content):
56895689 Parses Burp logs
56905690 """
56915691
5692- if not re .search (BURP_REQUEST_REGEX , content , re .I | re .S ):
5692+ if re .search (r"\A\s*\{.*\"entries\"" , content [:1000 ], re .S ):
5693+ reqResList = []
5694+ try :
5695+ entries = json .loads (content )["log" ]["entries" ]
5696+ except (ValueError , KeyError , TypeError ):
5697+ entries = []
5698+ for entry in entries : # Note: HAR (HTTP Archive) logs (e.g. ZAP, browsers) - re-serialized into raw requests
5699+ try :
5700+ request = entry ["request" ]
5701+ url = request ["url" ]
5702+ headers = [(_ ["name" ], _ ["value" ]) for _ in request .get ("headers" , []) if not _ ["name" ].startswith (':' )]
5703+ if not any (_ [0 ].upper () == HTTP_HEADER .HOST .upper () for _ in headers ):
5704+ headers .insert (0 , (HTTP_HEADER .HOST , _urllib .parse .urlsplit (url ).netloc ))
5705+ reqResList .append ("%s %s HTTP/1.1\n %s\n \n %s" % (request ["method" ], url , "\n " .join ("%s: %s" % _ for _ in headers ), (request .get ("postData" ) or {}).get ("text" ) or "" ))
5706+ except (KeyError , TypeError , AttributeError ):
5707+ continue
5708+ elif not re .search (BURP_REQUEST_REGEX , content , re .I | re .S ):
56935709 if re .search (BURP_XML_HISTORY_REGEX , content , re .I | re .S ):
56945710 reqResList = []
56955711 for match in re .finditer (BURP_XML_HISTORY_REGEX , content , re .I | re .S ):
0 commit comments