SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.
Python attacksurfacecticybersecurityfootprintinghackinginformation-gatheringinformation-securityinfosecintelligence-gatheringosintosint-frameworkosint-reconnaissanceosint-toolpentestingpythonreconsecurity-toolsthreat-intelligencethreatintel
fix abort bug (#1585)
TheTechromancer0de73393bbcf
diff --git a/sfscan.py b/sfscan.pyindex c2bc2358..6c44aa16 100644--- a/sfscan.py+++ b/sfscan.py@@ -397,22 +397,14 @@ class SpiderFootScanner():# Check in case the user requested to stop the scan between modules# initializing- for mod in list(self.__moduleInstances.values()):- if mod.checkForStop():- self.__setStatus('ABORTING')- aborted = True- break+ scanstatus = self.__dbh.scanInstanceGet(self.__scanId)+ if scanstatus and scanstatus[5] == "ABORT-REQUESTED":+ aborted = True# start threadsif not aborted:self.waitForThreads()- if aborted:- self.__sf.status(f"Scan [{self.__scanId}] aborted.")- self.__setStatus("ABORTED", None, time.time() * 1000)- else:- self.__sf.status(f"Scan [{self.__scanId}] completed.")- self.__setStatus("FINISHED", None, time.time() * 1000)except BaseException as e:exc_type, exc_value, exc_traceback = sys.exc_info()self.__sf.error(f"Unhandled exception ({e.__class__.__name__}) encountered during scan."@@ -425,6 +417,7 @@ class SpiderFootScanner():def waitForThreads(self):counter = 0+ aborted = Falsetry:if not self.eventQueue:@@ -442,6 +435,11 @@ class SpiderFootScanner():log_status = counter % 100 == 0counter += 1+ scanstatus = self.__dbh.scanInstanceGet(self.__scanId)+ self.__sf.debug(str(scanstatus))+ if scanstatus and scanstatus[5] == "ABORT-REQUESTED":+ raise AssertionError("ABORT-REQUESTED")+try:sfEvent = self.eventQueue.get_nowait()self.__sf.debug(f"waitForThreads() got event, {sfEvent.eventType}, from eventQueue.")@@ -466,7 +464,7 @@ class SpiderFootScanner():else:# save on CPU- sleep(.01)+ sleep(.1)continueif not isinstance(sfEvent, SpiderFootEvent):@@ -485,14 +483,20 @@ class SpiderFootScanner():if sfEvent.eventType in watchedEvents or "*" in watchedEvents:mod.incomingEventQueue.put(deepcopy(sfEvent))- except (KeyboardInterrupt, AssertionError) as e:- self.__sf.status(f"Scan [{self.__scanId}] aborted, {e}.")+ except (KeyboardInterrupt, AssertionError):+ aborted = Truefinally:# tell the modules to stopfor mod in self.__moduleInstances.values():mod._stopScanning = Trueself.__sharedThreadPool.shutdown(wait=True)+ if aborted:+ self.__sf.status(f"Scan [{self.__scanId}] aborted.")+ self.__setStatus("ABORTED", None, time.time() * 1000)+ else:+ self.__sf.status(f"Scan [{self.__scanId}] completed.")+ self.__setStatus("FINISHED", None, time.time() * 1000)def threadsFinished(self, log_status=False):if self.eventQueue is None: