Skip to content

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

dnsdb: remove emit and apply fixes (#1055)

Steve Micallefa63fadb3da63
diff --git a/modules/sfp_dnsdb.py b/modules/sfp_dnsdb.py
index 63f67e89..11380c7d 100644
--- a/modules/sfp_dnsdb.py
+++ b/modules/sfp_dnsdb.py
@@ -11,6 +11,7 @@
# -------------------------------------------------------------------------------
import json
+import re
from spiderfoot import SpiderFootEvent, SpiderFootPlugin
import time
@@ -92,26 +93,24 @@ class sfp_dnsdb(SpiderFootPlugin):
def query(self, endpoint, queryType, query):
if endpoint not in ("rrset", "rdata"):
- self.sf.error(
- f"Endpoint MUST be rrset or rdata, you sent {endpoint}", False
- )
+ self.sf.error(f"Endpoint MUST be rrset or rdata, you sent {endpoint}")
return None
if queryType not in ("name", "ip"):
- self.sf.error(f"Query type MUST be name or ip, you sent {queryType}", False)
+ self.sf.error(f"Query type MUST be name or ip, you sent {queryType}")
return None
headers = {"Accept": "application/x-ndjson", "X-API-Key": self.opts["api_key"]}
res = self.sf.fetchUrl(
f"https://api.dnsdb.info/dnsdb/v2/lookup/{endpoint}/{queryType}/{query}",
- timeout=self.opts["_fetchtimeout"],
+ timeout=30,
useragent="SpiderFoot",
headers=headers,
)
if res["code"] == "429":
- self.sf.error("You are being rate-limited by DNSDB", False)
+ self.sf.error("You are being rate-limited by DNSDB")
self.errorState = True
return None
@@ -132,17 +131,11 @@ class sfp_dnsdb(SpiderFootPlugin):
for content in splittedContent:
records.append(json.loads(content))
except json.JSONDecodeError as e:
- self.sf.error(f"Error processing JSON response from DNSDB: {e}", False)
+ self.sf.error(f"Error processing JSON response from DNSDB: {e}")
return None
return records[1:-1]
- def emit(self, etype, data, pevent, notify=True):
- evt = SpiderFootEvent(etype, data, self.__name__, pevent)
- if notify:
- self.notifyListeners(evt)
- return evt
-
def isTooOld(self, lastSeen):
ageLimitTs = int(time.time()) - (86400 * self.opts["age_limit_days"])
if self.opts["age_limit_days"] > 0 and lastSeen < ageLimitTs:
@@ -161,7 +154,7 @@ class sfp_dnsdb(SpiderFootPlugin):
self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")
if self.opts["api_key"] == "":
- self.sf.error("You enabled sfp_dnsdb but did not set an API key!", False)
+ self.sf.error("You enabled sfp_dnsdb but did not set an API key!")
self.errorState = True
return None
@@ -178,7 +171,8 @@ class sfp_dnsdb(SpiderFootPlugin):
if rrsetRecords is None:
return None
- self.emit("RAW_RIR_DATA", str(rrsetRecords), event)
+ evt = SpiderFootEvent("RAW_RIR_DATA", str(rrsetRecords), self.__name__, event)
+ self.notifyListeners(evt)
for record in rrsetRecords:
record = record.get("obj")
@@ -217,10 +211,7 @@ class sfp_dnsdb(SpiderFootPlugin):
)
continue
- if not self.getTarget().matches(data):
- coHosts.add(data)
-
- evt = self.emit("IP_ADDRESS", data, event, False)
+ evt = SpiderFootEvent("IP_ADDRESS", data, self.__name__, event)
if record.get("rrtype") == "AAAA":
@@ -241,16 +232,15 @@ class sfp_dnsdb(SpiderFootPlugin):
)
continue
- if not self.getTarget().matches(data):
- coHosts.add(data)
-
- evt = self.emit("IPV6_ADDRESS", data, event, False)
+ evt = SpiderFootEvent("IPV6_ADDRESS", data, self.__name__, event)
elif record.get("rrtype") == "MX":
- evt = self.emit("PROVIDER_MAIL", data, event, False)
+ data = re.sub(r'.*\s+(.*)', r'\1', data)
+ evt = SpiderFootEvent("PROVIDER_MAIL", data, self.__name__, event)
elif record.get("rrtype") == "NS":
- evt = self.emit("PROVIDER_DNS", data, event, False)
+ evt = SpiderFootEvent("PROVIDER_DNS", data, self.__name__, event)
elif record.get("rrtype") == "TXT":
- evt = self.emit("DNS_TEXT", data, event, False)
+ data = data.replace('"', '')
+ evt = SpiderFootEvent("DNS_TEXT", data, self.__name__, event)
elif record.get("rrtype") == "CNAME":
if not self.getTarget().matches(data):
coHosts.add(data)
@@ -262,7 +252,9 @@ class sfp_dnsdb(SpiderFootPlugin):
if rdataRecords is None:
return None
- self.emit("RAW_RIR_DATA", str(rdataRecords), event)
+ evt = SpiderFootEvent("RAW_RIR_DATA", str(rdataRecords), self.__name__, event)
+ self.notifyListeners(evt)
+
for record in rdataRecords:
record = record.get("obj")
if self.isTooOld(record.get("time_last", 0)):
@@ -276,7 +268,7 @@ class sfp_dnsdb(SpiderFootPlugin):
continue
responseData.add(data)
if record.get("rrtype") == "NS":
- evt = self.emit("PROVIDER_DNS", data, event, False)
+ evt = SpiderFootEvent("PROVIDER_DNS", data, self.__name__, event)
elif record.get("rrtype") == "CNAME":
if not self.getTarget().matches(data):
coHosts.add(data)
@@ -286,7 +278,9 @@ class sfp_dnsdb(SpiderFootPlugin):
if rdataRecords is None:
return None
- self.emit("RAW_RIR_DATA", str(rdataRecords), event)
+ evt = SpiderFootEvent("RAW_RIR_DATA", str(rdataRecords), self.__name__, event)
+ self.notifyListeners(evt)
+
for record in rdataRecords:
record = record.get("obj")
if self.checkForStop():
@@ -304,14 +298,16 @@ class sfp_dnsdb(SpiderFootPlugin):
continue
responseData.add(data)
+ if not self.getTarget().matches(data):
+ coHosts.add(data)
+ continue
+
if self.opts["verify"] and not self.sf.resolveHost(data):
self.sf.debug(f"Host {data} could not be resolved")
- self.emit("INTERNET_NAME_UNRESOLVED", data, event)
+ evt = SpiderFootEvent("INTERNET_NAME_UNRESOLVED", data, self.__name__, event)
else:
- self.emit("INTERNET_NAME", data, event)
-
- if not self.getTarget().matches(data):
- coHosts.add(data)
+ evt = SpiderFootEvent("INTERNET_NAME", data, self.__name__, event)
+ self.notifyListeners(evt)
for co in coHosts:
if eventName == "IP_ADDRESS" and (
@@ -328,8 +324,8 @@ class sfp_dnsdb(SpiderFootPlugin):
continue
if self.cohostcount < self.opts["maxcohost"]:
- self.emit("CO_HOSTED_SITE", co, event)
+ evt = SpiderFootEvent("CO_HOSTED_SITE", co, self.__name__, event)
+ self.notifyListeners(evt)
self.cohostcount += 1
-
# End of sfp_dnsdb class