Update for #2597

lib/core/option.py

@@ -149,7 +149,7 @@ from lib.request.pkihandler import HTTPSPKIAuthHandler
 from lib.request.rangehandler import HTTPRangeHandler
 from lib.request.redirecthandler import SmartRedirectHandler
 from lib.request.templates import getPageTemplate
-from lib.utils.collect import RequestCollectorFactory
+from lib.utils.har import HTTPCollectorFactory
 from lib.utils.crawler import crawl
 from lib.utils.deps import checkDependencies
 from lib.utils.search import search
@@ -1830,6 +1830,7 @@ def _setConfAttributes():
     conf.dumpPath = None
     conf.hashDB = None
     conf.hashDBFile = None
+    conf.httpCollector = None
     conf.httpHeaders = []
     conf.hostname = None
     conf.ipv6 = False
@@ -1845,7 +1846,7 @@ def _setConfAttributes():
     conf.scheme = None
     conf.tests = []
     conf.trafficFP = None
-    conf.requestCollectorFactory = None
+    conf.HARCollectorFactory = None
     conf.wFileType = None
 
 def _setKnowledgeBaseAttributes(flushAll=True):
@@ -2230,10 +2231,11 @@ def _setTrafficOutputFP():
 
         conf.trafficFP = openFile(conf.trafficFile, "w+")
 
-def _setupRequestCollector():
-    conf.requestCollectorFactory = RequestCollectorFactory(collect=conf.collectRequests)
-    threadData = getCurrentThreadData()
-    threadData.requestCollector = conf.requestCollectorFactory.create()
+def _setupHTTPCollector():
+    if not conf.harFile:
+        return
+
+    conf.httpCollector = HTTPCollectorFactory(conf.harFile).create()
 
 def _setDNSServer():
     if not conf.dnsDomain:
@@ -2611,7 +2613,7 @@ def init():
     _setTamperingFunctions()
     _setWafFunctions()
     _setTrafficOutputFP()
-    _setupRequestCollector()
+    _setupHTTPCollector()
     _resolveCrossReferences()
     _checkWebSocket()