Skip to content

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

Merge branch 'master' into hotfix/zetalytics

Leo Trubachb9c7b76a7bd5
diff --cc modules/sfp_zetalytics.py
index f32947fb,58da2997..1402e685
--- a/modules/sfp_zetalytics.py
+++ b/modules/sfp_zetalytics.py
@@@ -94,32 -79,29 +95,29 @@@ class sfp_zetalytics(SpiderFootPlugin)
if res["content"] is None:
self.sf.info(f"No Zetalytics info found for {path}?{qs}")
return None
+
try:
- info = json.loads(res["content"])
+ return json.loads(res["content"])
except Exception as e:
- self.sf.error(f"Error processing JSON response from Zetalytics: {e}")
- return None
-
- return info
+ self.sf.error(
+ f"Error processing JSON response from Zetalytics: {e}"
+ )
-
+ return None
def query_subdomains(self, domain):
- info = self.request("/subdomains", {"q": domain})
- return info
+ return self.request("/subdomains", {"q": domain})
def query_hostname(self, hostname):
- info = self.request("/hostname", {"q": hostname})
- return info
+ return self.request("/hostname", {"q": hostname})
def query_email_domain(self, email_domain):
- info = self.request("/email_domain", {"q": email_domain})
- return info
+ return self.request("/email_domain", {"q": email_domain})
def query_email_address(self, email_address):
- info = self.request("/email_address", {"q": email_address})
- return info
+ return self.request("/email_address", {"q": email_address})
def generate_subdomains_events(self, data, pevent):
+ events_generated = False
if isinstance(data, dict):
results = data.get("results", [])
if isinstance(results, list):
@@@ -176,21 -147,14 +174,21 @@@
eventData = event.data
if self.errorState:
- return None
+ return
+ if self.checkForStop():
+ return None
+
+ events_generated = False
+
self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")
if self.opts["api_key"] == "":
- self.sf.error(f"You enabled {self.__class__.__name__} but did not set an API key!")
+ self.sf.error(
+ f"You enabled {self.__class__.__name__} but did not set an API key!"
+ )
self.errorState = True
- return None
+ return
if "{}:{}".format(eventName, eventData) in self.results:
self.sf.debug(f"Skipping {eventName}:{eventData}, already checked.")
@@@ -213,11 -174,9 +211,11 @@@
elif eventName == "EMAILADDR":
data = self.query_email_address(eventData)
- self.generate_email_events(data, event)
+ if self.generate_email_events(data, event):
+ events_generated = True
else:
- return None
+ return
- self.emit("RAW_RIR_DATA", json.dumps(data), event)
+ if events_generated and not self.checkForStop():
+ self.emit("RAW_RIR_DATA", json.dumps(data), event)