Skip to content

SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.

Modules: return upon unexpected event type (#1671)

bcolesa75977e93d70
diff --git a/modules/sfp_cleanbrowsing.py b/modules/sfp_cleanbrowsing.py
index f6342c81..daf6e9b8 100644
--- a/modules/sfp_cleanbrowsing.py
+++ b/modules/sfp_cleanbrowsing.py
@@ -147,6 +147,7 @@ class sfp_cleanbrowsing(SpiderFootPlugin):
blacklist_type = "BLACKLISTED_COHOST"
else:
self.debug(f"Unexpected event type {eventName}, skipping")
+ return
# Check that it resolves first, as it becomes a valid
# malicious host only if NOT resolved by CleanBrowsing DNS.
diff --git a/modules/sfp_cloudflaredns.py b/modules/sfp_cloudflaredns.py
index 6e6be7fc..13ec7801 100644
--- a/modules/sfp_cloudflaredns.py
+++ b/modules/sfp_cloudflaredns.py
@@ -112,6 +112,7 @@ class sfp_cloudflaredns(SpiderFootPlugin):
e = "BLACKLISTED_COHOST"
else:
self.debug(f"Unexpected event type {eventName}, skipping")
+ return
family = self.sf.normalizeDNS(self.queryFamilyDNS(eventData))
malware = self.sf.normalizeDNS(self.queryMalwareDNS(eventData))
diff --git a/modules/sfp_comodo.py b/modules/sfp_comodo.py
index 7079ef7e..1d5003f6 100644
--- a/modules/sfp_comodo.py
+++ b/modules/sfp_comodo.py
@@ -111,6 +111,7 @@ class sfp_comodo(SpiderFootPlugin):
blacklist_type = "BLACKLISTED_COHOST"
else:
self.debug(f"Unexpected event type {eventName}, skipping")
+ return
# Check that it resolves first, as it becomes a valid
# malicious host only if NOT resolved by Comodo Secure DNS.
diff --git a/modules/sfp_dns_for_family.py b/modules/sfp_dns_for_family.py
index 4997c76f..e613791a 100644
--- a/modules/sfp_dns_for_family.py
+++ b/modules/sfp_dns_for_family.py
@@ -99,6 +99,7 @@ class sfp_dns_for_family(SpiderFootPlugin):
blacklist_type = "BLACKLISTED_COHOST"
else:
self.debug(f"Unexpected event type {eventName}, skipping")
+ return
res = self.queryAddr(eventData)
diff --git a/modules/sfp_gleif.py b/modules/sfp_gleif.py
index 8d643eca..40a35516 100644
--- a/modules/sfp_gleif.py
+++ b/modules/sfp_gleif.py
@@ -192,8 +192,6 @@ class sfp_gleif(SpiderFootPlugin):
self.debug(f"Skipping {eventData}, already checked.")
return
- self.results[eventData] = True
-
self.debug(f"Received event, {eventName}, from {srcModuleName}")
leis = list()
@@ -201,6 +199,7 @@ class sfp_gleif(SpiderFootPlugin):
if eventName == "LEI":
leis.append(eventData)
elif eventName == "COMPANY_NAME":
+ self.results[eventData] = True
res = self.searchAutocompletions(eventData)
if res is None:
@@ -238,6 +237,8 @@ class sfp_gleif(SpiderFootPlugin):
if not SpiderFootHelpers.validLEI(lei):
continue
+ self.results[lei] = True
+
e = SpiderFootEvent("LEI", lei, self.__name__, event)
self.notifyListeners(e)
@@ -246,7 +247,7 @@ class sfp_gleif(SpiderFootPlugin):
res = self.retrieveRecord(lei)
if not res:
self.debug(f"Found no results for {eventData}")
- return
+ continue
attributes = res.get('attributes')
if not attributes:
diff --git a/modules/sfp_opendns.py b/modules/sfp_opendns.py
index dd4600f5..3ec39d88 100644
--- a/modules/sfp_opendns.py
+++ b/modules/sfp_opendns.py
@@ -119,6 +119,7 @@ class sfp_opendns(SpiderFootPlugin):
blacklist_type = "BLACKLISTED_COHOST"
else:
self.debug(f"Unexpected event type {eventName}, skipping")
+ return
res = self.queryAddr(eventData)
diff --git a/modules/sfp_quad9.py b/modules/sfp_quad9.py
index 8f9a3e7d..4b8f60f3 100644
--- a/modules/sfp_quad9.py
+++ b/modules/sfp_quad9.py
@@ -112,6 +112,7 @@ class sfp_quad9(SpiderFootPlugin):
blacklist_type = "BLACKLISTED_COHOST"
else:
self.debug(f"Unexpected event type {eventName}, skipping")
+ return
# Check that it resolves first, as it becomes a valid
# malicious host only if NOT resolved by Quad9.
diff --git a/modules/sfp_spyse.py b/modules/sfp_spyse.py
index cce62116..adb01447 100644
--- a/modules/sfp_spyse.py
+++ b/modules/sfp_spyse.py
@@ -366,6 +366,7 @@ class sfp_spyse(SpiderFootPlugin):
self.retrieve_subdomains(event)
else:
self.debug(f"Unexpected event type {event.eventType}, skipping")
+ return
def retrieve_cohosts(self, event):
cohosts = list()
diff --git a/modules/sfp_yandexdns.py b/modules/sfp_yandexdns.py
index ae5b671e..2e56cd0e 100644
--- a/modules/sfp_yandexdns.py
+++ b/modules/sfp_yandexdns.py
@@ -115,6 +115,7 @@ class sfp_yandexdns(SpiderFootPlugin):
blacklist_type = "BLACKLISTED_COHOST"
else:
self.debug(f"Unexpected event type {eventName}, skipping")
+ return
res = self.queryAddr(eventData)
diff --git a/modules/sfp_zoneh.py b/modules/sfp_zoneh.py
index 820a4cf6..0a7e6a22 100644
--- a/modules/sfp_zoneh.py
+++ b/modules/sfp_zoneh.py
@@ -130,6 +130,7 @@ class sfp_zoneh(SpiderFootPlugin):
evtType = 'DEFACED_AFFILIATE_IPADDR'
else:
self.debug(f"Unexpected event type {eventName}, skipping")
+ return
if self.checkForStop():
return