SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.
Python attacksurfacecticybersecurityfootprintinghackinginformation-gatheringinformation-securityinfosecintelligence-gatheringosintosint-frameworkosint-reconnaissanceosint-toolpentestingpythonreconsecurity-toolsthreat-intelligencethreatintel
modules: Remove redundant else after return (#1202)
bcolesdf27a241d095
diff --git a/modules/sfp_adblock.py b/modules/sfp_adblock.pyindex 1c31a428..153d813d 100644--- a/modules/sfp_adblock.py+++ b/modules/sfp_adblock.py@@ -107,12 +107,12 @@ class sfp_adblock(SpiderFootPlugin):else:pagetype = "_INTERNAL"- if eventData not in self.results:- self.results[eventData] = True- else:+ if eventData in self.results:self.sf.debug("Already checked this page for AdBlock matching, skipping.")return+ self.results[eventData] = True+try:if self.rules and self.rules.should_block(eventData):evt = SpiderFootEvent("URL_ADBLOCKED" + pagetype, eventData,diff --git a/modules/sfp_alienvault.py b/modules/sfp_alienvault.pyindex 2ff0749a..756039e2 100644--- a/modules/sfp_alienvault.py+++ b/modules/sfp_alienvault.py@@ -163,12 +163,11 @@ class sfp_alienvault(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return- else:- self.results[eventData] = True++ self.results[eventData] = Trueif eventName == 'NETBLOCK_OWNER':if not self.opts['netblocklookup']:diff --git a/modules/sfp_badpackets.py b/modules/sfp_badpackets.pyindex e1e286b3..829b8857 100644--- a/modules/sfp_badpackets.py+++ b/modules/sfp_badpackets.py@@ -167,7 +167,6 @@ class sfp_badpackets(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")returndiff --git a/modules/sfp_bingsearch.py b/modules/sfp_bingsearch.pyindex 373cfdd2..65ced374 100644--- a/modules/sfp_bingsearch.py+++ b/modules/sfp_bingsearch.py@@ -90,8 +90,8 @@ class sfp_bingsearch(SpiderFootPlugin):if eventData in self.results:self.sf.debug("Already did a search for " + eventData + ", skipping.")return None- else:- self.results[eventData] = True++ self.results[eventData] = True# Sites hosted on the domaindiff --git a/modules/sfp_bingsharedip.py b/modules/sfp_bingsharedip.pyindex d5e5d6bb..9d1e9013 100644--- a/modules/sfp_bingsharedip.py+++ b/modules/sfp_bingsharedip.py@@ -101,7 +101,6 @@ class sfp_bingsharedip(SpiderFootPlugin):self.errorState = Truereturn None- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return Nonediff --git a/modules/sfp_bitcoin.py b/modules/sfp_bitcoin.pyindex 84038624..a50a01d1 100644--- a/modules/sfp_bitcoin.py+++ b/modules/sfp_bitcoin.py@@ -76,8 +76,8 @@ class sfp_bitcoin(SpiderFootPlugin):if sourceData in self.results:return None- else:- self.results[sourceData] = True++ self.results[sourceData] = Trueself.sf.debug(f"Received event, {eventName}, from {srcModuleName}")diff --git a/modules/sfp_blockchain.py b/modules/sfp_blockchain.pyindex f95b422a..24b846b2 100644--- a/modules/sfp_blockchain.py+++ b/modules/sfp_blockchain.py@@ -73,12 +73,11 @@ class sfp_blockchain(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = True# Wallet balanceres = self.sf.fetchUrl("https://blockchain.info/balance?active=" + eventData,diff --git a/modules/sfp_botscout.py b/modules/sfp_botscout.pyindex 815428c5..0904d951 100644--- a/modules/sfp_botscout.py+++ b/modules/sfp_botscout.py@@ -90,9 +90,8 @@ class sfp_botscout(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:- self.sf.debug("Skipping " + eventData + " as already searched.")+ self.sf.debug(f"Skipping {eventData} as already searched.")returnself.results[eventData] = Truediff --git a/modules/sfp_builtwith.py b/modules/sfp_builtwith.pyindex d04ad801..da01b498 100644--- a/modules/sfp_builtwith.py+++ b/modules/sfp_builtwith.py@@ -138,12 +138,11 @@ class sfp_builtwith(SpiderFootPlugin):self.errorState = Truereturn None- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Truedata = self.queryDomainInfo(eventData)if data is not None:diff --git a/modules/sfp_circllu.py b/modules/sfp_circllu.pyindex 13977742..7af0d8d3 100644--- a/modules/sfp_circllu.py+++ b/modules/sfp_circllu.py@@ -150,12 +150,11 @@ class sfp_circllu(SpiderFootPlugin):self.errorState = Truereturn None- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueif eventName in ['IP_ADDRESS', 'NETBLOCK_OWNER']:# CIRCL.LU limit the maximum subnet size to 23diff --git a/modules/sfp_clearbit.py b/modules/sfp_clearbit.pyindex ce2b1fbe..c0ee2d54 100644--- a/modules/sfp_clearbit.py+++ b/modules/sfp_clearbit.py@@ -128,12 +128,11 @@ class sfp_clearbit(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Truedata = self.query(eventData)if not data:diff --git a/modules/sfp_commoncrawl.py b/modules/sfp_commoncrawl.pyindex d45a4a8a..2b3b8b1c 100644--- a/modules/sfp_commoncrawl.py+++ b/modules/sfp_commoncrawl.py@@ -143,8 +143,8 @@ class sfp_commoncrawl(SpiderFootPlugin):if eventData in self.results:return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueif len(self.indexBase) == 0:self.indexBase = self.getLatestIndexes()diff --git a/modules/sfp_darksearch.py b/modules/sfp_darksearch.pyindex a5dbbee5..6a58a72b 100644--- a/modules/sfp_darksearch.py+++ b/modules/sfp_darksearch.py@@ -109,9 +109,10 @@ class sfp_darksearch(SpiderFootPlugin):return Noneif eventData in self.results:+ self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueself.sf.debug(f"Received event, {eventName}, from {srcModuleName}")diff --git a/modules/sfp_digitaloceanspace.py b/modules/sfp_digitaloceanspace.pyindex 29b7d38c..6f7bdb73 100644--- a/modules/sfp_digitaloceanspace.py+++ b/modules/sfp_digitaloceanspace.py@@ -153,8 +153,8 @@ class sfp_digitaloceanspace(SpiderFootPlugin):if eventData in self.results:return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueself.sf.debug(f"Received event, {eventName}, from {srcModuleName}")diff --git a/modules/sfp_emailformat.py b/modules/sfp_emailformat.pyindex bf5337de..afa06e88 100644--- a/modules/sfp_emailformat.py+++ b/modules/sfp_emailformat.py@@ -73,8 +73,8 @@ class sfp_emailformat(SpiderFootPlugin):if eventData in self.results:return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueself.sf.debug(f"Received event, {eventName}, from {srcModuleName}")diff --git a/modules/sfp_etherscan.py b/modules/sfp_etherscan.pyindex 162803e9..7f84492c 100644--- a/modules/sfp_etherscan.py+++ b/modules/sfp_etherscan.py@@ -115,12 +115,11 @@ class sfp_etherscan(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Truedata = self.query(eventData)if data is None:diff --git a/modules/sfp_filemeta.py b/modules/sfp_filemeta.pyindex 3ed06397..4e389521 100644--- a/modules/sfp_filemeta.py+++ b/modules/sfp_filemeta.py@@ -74,8 +74,8 @@ class sfp_filemeta(SpiderFootPlugin):if eventData in self.results:return None- else:- self.results[eventData] = True++ self.results[eventData] = Truefor fileExt in self.opts['fileexts']:if self.checkForStop():diff --git a/modules/sfp_googleobjectstorage.py b/modules/sfp_googleobjectstorage.pyindex 40c8a758..ea58846a 100644--- a/modules/sfp_googleobjectstorage.py+++ b/modules/sfp_googleobjectstorage.py@@ -151,8 +151,8 @@ class sfp_googleobjectstorage(SpiderFootPlugin):if eventData in self.results:return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueself.sf.debug(f"Received event, {eventName}, from {srcModuleName}")diff --git a/modules/sfp_googlesafebrowsing.py b/modules/sfp_googlesafebrowsing.pyindex 2e7eaa0f..0d3c1710 100644--- a/modules/sfp_googlesafebrowsing.py+++ b/modules/sfp_googlesafebrowsing.py@@ -182,12 +182,11 @@ class sfp_googlesafebrowsing(SpiderFootPlugin):self.errorState = Truereturn None- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = TrueevtType = ""if eventName in ["IP_ADDRESS", "AFFILIATE_IPADDR"]:diff --git a/modules/sfp_googlesearch.py b/modules/sfp_googlesearch.pyindex 422ddb45..ab0f837c 100644--- a/modules/sfp_googlesearch.py+++ b/modules/sfp_googlesearch.py@@ -97,8 +97,8 @@ class sfp_googlesearch(SpiderFootPlugin):if eventData in self.results:self.sf.debug("Already did a search for " + eventData + ", skipping.")return None- else:- self.results[eventData] = True++ self.results[eventData] = True# Sites hosted on the domainres = self.sf.googleIterate(diff --git a/modules/sfp_greynoise.py b/modules/sfp_greynoise.pyindex 2642257f..e17e035b 100644--- a/modules/sfp_greynoise.py+++ b/modules/sfp_greynoise.py@@ -136,12 +136,11 @@ class sfp_greynoise(SpiderFootPlugin):self.errorState = Truereturn None- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueif eventName == 'NETBLOCK_OWNER':if not self.opts['netblocklookup']:diff --git a/modules/sfp_haveibeenpwned.py b/modules/sfp_haveibeenpwned.pyindex 9b1d96da..66577a5c 100644--- a/modules/sfp_haveibeenpwned.py+++ b/modules/sfp_haveibeenpwned.py@@ -174,12 +174,11 @@ class sfp_haveibeenpwned(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Truedata = self.query(eventData)if data is not None:diff --git a/modules/sfp_hunter.py b/modules/sfp_hunter.pyindex f3026c33..d10c5156 100644--- a/modules/sfp_hunter.py+++ b/modules/sfp_hunter.py@@ -121,12 +121,11 @@ class sfp_hunter(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueif self.opts['api_key'] == "":self.sf.error("You enabled sfp_hunter but did not set an API key!")diff --git a/modules/sfp_intfiles.py b/modules/sfp_intfiles.pyindex 053b170d..20f9be72 100644--- a/modules/sfp_intfiles.py+++ b/modules/sfp_intfiles.py@@ -63,8 +63,8 @@ class sfp_intfiles(SpiderFootPlugin):if eventData in self.results:return None- else:- self.results[eventData] = True++ self.results[eventData] = Truefor fileExt in self.opts['fileexts']:if "." + fileExt.lower() in eventData.lower():diff --git a/modules/sfp_ipapicom.py b/modules/sfp_ipapicom.pyindex 200ea044..8ee2103b 100644--- a/modules/sfp_ipapicom.py+++ b/modules/sfp_ipapicom.py@@ -118,12 +118,11 @@ class sfp_ipapicom(SpiderFootPlugin):self.errorState = Truereturn None- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Truedata = self.query(eventData)diff --git a/modules/sfp_ipinfo.py b/modules/sfp_ipinfo.pyindex ef97d9c1..17691c0d 100644--- a/modules/sfp_ipinfo.py+++ b/modules/sfp_ipinfo.py@@ -116,7 +116,6 @@ class sfp_ipinfo(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")returndiff --git a/modules/sfp_junkfiles.py b/modules/sfp_junkfiles.pyindex a62e2d13..9a8a0350 100644--- a/modules/sfp_junkfiles.py+++ b/modules/sfp_junkfiles.py@@ -93,8 +93,8 @@ class sfp_junkfiles(SpiderFootPlugin):if eventData in self.results:return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueif host in self.skiphosts:self.sf.debug("Skipping " + host + " because it doesn't return 404s.")diff --git a/modules/sfp_keybase.py b/modules/sfp_keybase.pyindex e0634ed9..25510fba 100644--- a/modules/sfp_keybase.py+++ b/modules/sfp_keybase.py@@ -122,7 +122,6 @@ class sfp_keybase(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return Nonediff --git a/modules/sfp_malwarepatrol.py b/modules/sfp_malwarepatrol.pyindex 84336dd6..a94b4814 100644--- a/modules/sfp_malwarepatrol.py+++ b/modules/sfp_malwarepatrol.py@@ -116,12 +116,11 @@ class sfp_malwarepatrol(SpiderFootPlugin):self.errorState = Truereturn None- # Don't look up stuff twiceif eventData in self.results:self.sf.debug("Skipping " + eventData + " as already searched.")return None- else:- self.results[eventData] = True++ self.results[eventData] = TrueevtType = ""if eventName in ['IP_ADDRESS', 'AFFILIATE_IPADDR']:diff --git a/modules/sfp_onioncity.py b/modules/sfp_onioncity.pyindex 82649268..bf642801 100644--- a/modules/sfp_onioncity.py+++ b/modules/sfp_onioncity.py@@ -91,10 +91,10 @@ class sfp_onioncity(SpiderFootPlugin):return Noneif eventData in self.results:- self.sf.debug("Already did a search for " + eventData + ", skipping.")+ self.sf.debug(f"Already did a search for {eventData}, skipping.")return None- else:- self.results[eventData] = True++ self.results[eventData] = True# Sites hosted on the domainres = self.sf.googleIterate(diff --git a/modules/sfp_openbugbounty.py b/modules/sfp_openbugbounty.pyindex 6900d9e5..1634163c 100644--- a/modules/sfp_openbugbounty.py+++ b/modules/sfp_openbugbounty.py@@ -104,12 +104,11 @@ class sfp_openbugbounty(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueobb = self.queryOBB(eventData)if obb:diff --git a/modules/sfp_openstreetmap.py b/modules/sfp_openstreetmap.pyindex 867ad1e0..5f0639fa 100644--- a/modules/sfp_openstreetmap.py+++ b/modules/sfp_openstreetmap.py@@ -101,8 +101,8 @@ class sfp_openstreetmap(SpiderFootPlugin):if eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueaddress = eventDatadiff --git a/modules/sfp_pastebin.py b/modules/sfp_pastebin.pyindex fed0286b..c5f7ac5d 100644--- a/modules/sfp_pastebin.py+++ b/modules/sfp_pastebin.py@@ -97,8 +97,8 @@ class sfp_pastebin(SpiderFootPlugin):if eventData in self.results:return None- else:- self.results[eventData] = True++ self.results[eventData] = Truefor dom in list(self.domains.keys()):target = self.domains[dom]diff --git a/modules/sfp_projectdiscovery.py b/modules/sfp_projectdiscovery.pyindex 1919b95d..65ad584b 100644--- a/modules/sfp_projectdiscovery.py+++ b/modules/sfp_projectdiscovery.py@@ -112,7 +112,6 @@ class sfp_projectdiscovery(SpiderFootPlugin):self.errorState = Truereturn None- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return Nonediff --git a/modules/sfp_reversewhois.py b/modules/sfp_reversewhois.pyindex e0efab60..5140dc75 100644--- a/modules/sfp_reversewhois.py+++ b/modules/sfp_reversewhois.py@@ -112,12 +112,11 @@ class sfp_reversewhois(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return- else:- self.results[eventData] = True++ self.results[eventData] = Truedomains, registrars = self.query(eventData)diff --git a/modules/sfp_riskiq.py b/modules/sfp_riskiq.pyindex d997fd50..c1af144b 100644--- a/modules/sfp_riskiq.py+++ b/modules/sfp_riskiq.py@@ -170,12 +170,11 @@ class sfp_riskiq(SpiderFootPlugin):self.errorState = Truereturn None- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueif eventName in ['DOMAIN_NAME']:ret = self.query(eventData, "PSSL")diff --git a/modules/sfp_robtex.py b/modules/sfp_robtex.pyindex efb76f64..20e91683 100644--- a/modules/sfp_robtex.py+++ b/modules/sfp_robtex.py@@ -104,7 +104,6 @@ class sfp_robtex(SpiderFootPlugin):self.sf.debug("Ignoring " + eventName + ", from self.")return- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")returndiff --git a/modules/sfp_s3bucket.py b/modules/sfp_s3bucket.pyindex ad185c2d..47663aa6 100644--- a/modules/sfp_s3bucket.py+++ b/modules/sfp_s3bucket.py@@ -153,8 +153,8 @@ class sfp_s3bucket(SpiderFootPlugin):if eventData in self.results:return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueself.sf.debug(f"Received event, {eventName}, from {srcModuleName}")diff --git a/modules/sfp_seon.py b/modules/sfp_seon.pyindex 23474f93..22d8253f 100644--- a/modules/sfp_seon.py+++ b/modules/sfp_seon.py@@ -139,12 +139,11 @@ class sfp_seon(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = TruedataFound = Falseif eventName == "IP_ADDRESS" or eventName == "IPV6_ADDRESS":diff --git a/modules/sfp_shodan.py b/modules/sfp_shodan.pyindex 093f4eee..64fe5c66 100644--- a/modules/sfp_shodan.py+++ b/modules/sfp_shodan.py@@ -174,12 +174,11 @@ class sfp_shodan(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return- else:- self.results[eventData] = True++ self.results[eventData] = Trueif eventName == "DOMAIN_NAME":hosts = self.searchHosts(eventData)diff --git a/modules/sfp_skymem.py b/modules/sfp_skymem.pyindex 532efb66..d97a2dbf 100644--- a/modules/sfp_skymem.py+++ b/modules/sfp_skymem.py@@ -71,8 +71,8 @@ class sfp_skymem(SpiderFootPlugin):if eventData in self.results:return- else:- self.results[eventData] = True++ self.results[eventData] = Trueself.sf.debug(f"Received event, {eventName}, from {srcModuleName}")diff --git a/modules/sfp_slideshare.py b/modules/sfp_slideshare.pyindex 966df331..57008267 100644--- a/modules/sfp_slideshare.py+++ b/modules/sfp_slideshare.py@@ -74,8 +74,8 @@ class sfp_slideshare(SpiderFootPlugin):if eventData in self.results:return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueself.sf.debug(f"Received event, {eventName}, from {srcModuleName}")diff --git a/modules/sfp_snov.py b/modules/sfp_snov.pyindex af9b2634..3b7b7987 100644--- a/modules/sfp_snov.py+++ b/modules/sfp_snov.py@@ -162,7 +162,6 @@ class sfp_snov(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")returndiff --git a/modules/sfp_sociallinks.py b/modules/sfp_sociallinks.pyindex 998dbb4d..53844154 100644--- a/modules/sfp_sociallinks.py+++ b/modules/sfp_sociallinks.py@@ -149,12 +149,11 @@ class sfp_sociallinks(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueif eventName == "PHONE_NUMBER":data = self.queryTelegram(eventData, eventName)diff --git a/modules/sfp_socialprofiles.py b/modules/sfp_socialprofiles.pyindex 34e8ad01..a7fb620d 100644--- a/modules/sfp_socialprofiles.py+++ b/modules/sfp_socialprofiles.py@@ -142,7 +142,6 @@ class sfp_socialprofiles(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")returndiff --git a/modules/sfp_spur.py b/modules/sfp_spur.pyindex 3df44aee..0795c62b 100644--- a/modules/sfp_spur.py+++ b/modules/sfp_spur.py@@ -148,7 +148,6 @@ class sfp_spur(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")returndiff --git a/modules/sfp_template.py b/modules/sfp_template.pyindex b2c77f11..d223397b 100644--- a/modules/sfp_template.py+++ b/modules/sfp_template.py@@ -270,11 +270,12 @@ class sfp_template(SpiderFootPlugin):if self.errorState:return- # Don't look up stuff twice+ # Check if the module has already analysed this event data.if eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return+ # Add the event data to results dictionary to prevent duplicate queries.# If eventData might be something large, set the key to a hash# of the value instead of the value, to avoid memory abuse.self.results[eventData] = Truediff --git a/modules/sfp_threatcrowd.py b/modules/sfp_threatcrowd.pyindex b47660c0..a9601be8 100644--- a/modules/sfp_threatcrowd.py+++ b/modules/sfp_threatcrowd.py@@ -128,12 +128,11 @@ class sfp_threatcrowd(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Trueif eventName.startswith("AFFILIATE") and not self.opts['checkaffiliates']:return Nonediff --git a/modules/sfp_threatminer.py b/modules/sfp_threatminer.pyindex 843c0314..555567aa 100644--- a/modules/sfp_threatminer.py+++ b/modules/sfp_threatminer.py@@ -133,7 +133,6 @@ class sfp_threatminer(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return@@ -143,22 +142,20 @@ class sfp_threatminer(SpiderFootPlugin):if eventName == 'NETBLOCK_OWNER':if not self.opts['netblocklookup']:return- else:- if IPNetwork(eventData).prefixlen < self.opts['maxnetblock']:- self.sf.debug("Network size bigger than permitted: "- + str(IPNetwork(eventData).prefixlen) + " > "- + str(self.opts['maxnetblock']))- return+ if IPNetwork(eventData).prefixlen < self.opts['maxnetblock']:+ self.sf.debug("Network size bigger than permitted: "+ + str(IPNetwork(eventData).prefixlen) + " > "+ + str(self.opts['maxnetblock']))+ returnif eventName == 'NETBLOCK_MEMBER':if not self.opts['subnetlookup']:return- else:- if IPNetwork(eventData).prefixlen < self.opts['maxsubnet']:- self.sf.debug("Network size bigger than permitted: "- + str(IPNetwork(eventData).prefixlen) + " > "- + str(self.opts['maxsubnet']))- return+ if IPNetwork(eventData).prefixlen < self.opts['maxsubnet']:+ self.sf.debug("Network size bigger than permitted: "+ + str(IPNetwork(eventData).prefixlen) + " > "+ + str(self.opts['maxsubnet']))+ returnqrylist = list()if eventName.startswith("NETBLOCK_"):diff --git a/modules/sfp_tldsearch.py b/modules/sfp_tldsearch.pyindex dd338ed9..a1eb9084 100644--- a/modules/sfp_tldsearch.py+++ b/modules/sfp_tldsearch.py@@ -152,8 +152,8 @@ class sfp_tldsearch(SpiderFootPlugin):if eventData in self.results:return- else:- self.results[eventData] = True++ self.results[eventData] = Truekeyword = self.sf.domainKeyword(eventData, self.opts['_internettlds'])self.sf.debug("Keyword extracted from " + eventData + ": " + keyword)@@ -161,8 +161,8 @@ class sfp_tldsearch(SpiderFootPlugin):if keyword in self.results:return- else:- self.results[keyword] = True++ self.results[keyword] = True# Look through all TLDs for the existence of this target keywordfor tld in self.opts['_internettlds']:diff --git a/modules/sfp_tool_dnstwist.py b/modules/sfp_tool_dnstwist.pyindex b59c17d5..6a106fb6 100644--- a/modules/sfp_tool_dnstwist.py+++ b/modules/sfp_tool_dnstwist.py@@ -82,7 +82,6 @@ class sfp_tool_dnstwist(SpiderFootPlugin):if self.errorState:return- # Don't look up stuff twice, check IP == IP hereif eventData in self.results:self.sf.debug("Skipping " + eventData + " as already scanned.")returndiff --git a/modules/sfp_trashpanda.py b/modules/sfp_trashpanda.pyindex fcd6f273..89708136 100644--- a/modules/sfp_trashpanda.py+++ b/modules/sfp_trashpanda.py@@ -125,12 +125,11 @@ class sfp_trashpanda(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return None- else:- self.results[eventData] = True++ self.results[eventData] = Truedata = self.query(eventData, eventName)diff --git a/modules/sfp_urlscan.py b/modules/sfp_urlscan.pyindex 4295d948..4cb51e83 100644--- a/modules/sfp_urlscan.py+++ b/modules/sfp_urlscan.py@@ -109,7 +109,6 @@ class sfp_urlscan(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")returndiff --git a/modules/sfp_whoisology.py b/modules/sfp_whoisology.pyindex 0f0b88e8..ac6e0bf7 100644--- a/modules/sfp_whoisology.py+++ b/modules/sfp_whoisology.py@@ -127,12 +127,11 @@ class sfp_whoisology(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return- else:- self.results[eventData] = True++ self.results[eventData] = Truerec = self.query(eventData, "email")myres = list()diff --git a/modules/sfp_whoxy.py b/modules/sfp_whoxy.pyindex a39d06cf..cb0989a7 100644--- a/modules/sfp_whoxy.py+++ b/modules/sfp_whoxy.py@@ -138,7 +138,6 @@ class sfp_whoxy(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")returndiff --git a/modules/sfp_wigle.py b/modules/sfp_wigle.pyindex 874e2635..f62a579b 100644--- a/modules/sfp_wigle.py+++ b/modules/sfp_wigle.py@@ -188,7 +188,6 @@ class sfp_wigle(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")returndiff --git a/modules/sfp_wikileaks.py b/modules/sfp_wikileaks.pyindex 471bd6d0..83fa2db3 100644--- a/modules/sfp_wikileaks.py+++ b/modules/sfp_wikileaks.py@@ -78,7 +78,6 @@ class sfp_wikileaks(SpiderFootPlugin):self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")returndiff --git a/modules/sfp_xforce.py b/modules/sfp_xforce.pyindex d0f011a4..9af1d965 100644--- a/modules/sfp_xforce.py+++ b/modules/sfp_xforce.py@@ -199,7 +199,6 @@ class sfp_xforce(SpiderFootPlugin):self.errorState = Truereturn- # Don't look up stuff twiceif eventData in self.results:self.sf.debug(f"Skipping {eventData}, already checked.")return