Skip to content

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

Code review changes

Krishnasis Mandalfcd4feb91128
diff --git a/modules/sfp_spur.py b/modules/sfp_spur.py
index 4842dce2..20bb4d8e 100644
--- a/modules/sfp_spur.py
+++ b/modules/sfp_spur.py
@@ -56,7 +56,7 @@ class sfp_spur(SpiderFootPlugin):
# What events this module produces
def producedEvents(self):
return ["IP_ADDRESS", "MALICIOUS_IPADDR", "RAW_RIR_DATA",
- "GEO_INFO", "COMPANY_NAME", "AFFILIATE_MALICIOUS_IPADDR"]
+ "GEO_INFO", "COMPANY_NAME", "MALICIOUS_AFFILIATE_IPADDR"]
# Check whether the IP Address is malicious using spur.us API
# https://spur.us/app/docs
@@ -187,6 +187,9 @@ class sfp_spur(SpiderFootPlugin):
if eventName.startswith("NETBLOCK_"):
evt = SpiderFootEvent("GEOINFO", geoInfo, self.__name__, ipEvt)
self.notifyListeners(evt)
+ elif eventName.startswith("AFFILIATE_"):
+ # Don't report GEOINFO for Affiliates
+ pass
else:
evt = SpiderFootEvent("GEOINFO", geoInfo, self.__name__, event)
self.notifyListeners(evt)
@@ -200,6 +203,9 @@ class sfp_spur(SpiderFootPlugin):
if eventName.startswith("NETBLOCK_"):
evt = SpiderFootEvent("COMPANY_NAME", orgName, self.__name__, ipEvt)
self.notifyListeners(evt)
+ elif eventName.startswith("AFFILIATE_"):
+ # Don't report COMPANY_NAME for Affiliates
+ pass
else:
evt = SpiderFootEvent("COMPANY_NAME", orgName, self.__name__, event)
self.notifyListeners(evt)
@@ -226,7 +232,7 @@ class sfp_spur(SpiderFootPlugin):
evt = SpiderFootEvent("MALICIOUS_IPADDR", maliciousIPDesc, self.__name__, ipEvt)
self.notifyListeners(evt)
elif eventName.startswith("AFFILIATE_"):
- evt = SpiderFootEvent("AFFILIATE_MALICIOUS_IPADDR", maliciousIPDesc, self.__name__, event)
+ evt = SpiderFootEvent("MALICIOUS_AFFILIATE_IPADDR", maliciousIPDesc, self.__name__, event)
self.notifyListeners(evt)
else:
evt = SpiderFootEvent("MALICIOUS_IPADDR", maliciousIPDesc, self.__name__, event)
diff --git a/modules/sfp_twilio.py b/modules/sfp_twilio.py
index d784c83a..a9fd9536 100644
--- a/modules/sfp_twilio.py
+++ b/modules/sfp_twilio.py
@@ -67,7 +67,7 @@ class sfp_twilio(SpiderFootPlugin):
return None
if res['code'] == '404':
- self.sf.error("Invalid phone number.", False)
+ self.sf.debug("Phone number not found.")
return None
if res['code'] == '429':