SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.
Python attacksurfacecticybersecurityfootprintinghackinginformation-gatheringinformation-securityinfosecintelligence-gatheringosintosint-frameworkosint-reconnaissanceosint-toolpentestingpythonreconsecurity-toolsthreat-intelligencethreatintel
Modules generating INTERNET_NAME should also generate DOMAIN_NAME in most cases.
smicallef1b944c20008e
diff --git a/modules/sfp_binaryedge.py b/modules/sfp_binaryedge.pyindex 4a34a71e..66ce8919 100644--- a/modules/sfp_binaryedge.py+++ b/modules/sfp_binaryedge.py@@ -81,7 +81,7 @@ class sfp_binaryedge(SpiderFootPlugin):def producedEvents(self):return ["INTERNET_NAME", "VULNERABILITY", "TCP_PORT_OPEN","TCP_PORT_OPEN_BANNER", "EMAILADDR_COMPROMISED",- "UDP_PORT_OPEN", "UDP_PORT_OPEN_INFO",+ "UDP_PORT_OPEN", "UDP_PORT_OPEN_INFO", "DOMAIN_NAME","CO_HOSTED_SITE", "MALICIOUS_IPADDR"]def query(self, qry, querytype, page=1):@@ -220,6 +220,10 @@ class sfp_binaryedge(SpiderFootPlugin):continueevt = SpiderFootEvent("INTERNET_NAME", host, self.__name__, event)self.notifyListeners(evt)+ if self.sf.isDomain(host, self.opts['_internettlds']):+ evt = SpiderFootEvent("DOMAIN_NAME", host, self.__name__, event)+ self.notifyListeners(evt)+self.reportedhosts[host] = Truecontinuediff --git a/modules/sfp_builtwith.py b/modules/sfp_builtwith.pyindex 709beba4..917fc897 100644--- a/modules/sfp_builtwith.py+++ b/modules/sfp_builtwith.py@@ -54,7 +54,7 @@ class sfp_builtwith(SpiderFootPlugin):# What events this module producesdef producedEvents(self):return [ "INTERNET_NAME", "EMAILADDR", "RAW_RIR_DATA",- "WEBSERVER_TECHNOLOGY", "PHONE_NUMBER" ]+ "WEBSERVER_TECHNOLOGY", "PHONE_NUMBER", "DOMAIN_NAME" ]def query(self, t):ret = None@@ -135,10 +135,12 @@ class sfp_builtwith(SpiderFootPlugin):if "Paths" in data.get("Result", []):for p in data["Result"]['Paths']:if p.get("SubDomain", ""):- ev = SpiderFootEvent("INTERNET_NAME",- p["SubDomain"] + "." + eventData,- self.__name__, event)+ h = p["SubDomain"] + "." + eventData+ ev = SpiderFootEvent("INTERNET_NAME", h, self.__name__, event)self.notifyListeners(ev)+ if self.sf.isDomain(h, self.opts['_internettlds']):+ ev = SpiderFootEvent("DOMAIN_NAME", h, self.__name__, event)+ self.notifyListeners(ev)else:ev = Nonediff --git a/modules/sfp_emailformat.py b/modules/sfp_emailformat.pyindex 76dc8caf..4b601bd4 100644--- a/modules/sfp_emailformat.py+++ b/modules/sfp_emailformat.py@@ -60,8 +60,7 @@ class sfp_emailformat(SpiderFootPlugin):self.sf.debug("Received event, " + eventName + ", from " + srcModuleName)# Get e-mail addresses on this domain- if eventName == "DOMAIN_NAME":- res = self.sf.fetchUrl("https://www.email-format.com/d/" + eventData + "/", timeout=self.opts['_fetchtimeout'], useragent=self.opts['_useragent'])+ res = self.sf.fetchUrl("https://www.email-format.com/d/" + eventData + "/", timeout=self.opts['_fetchtimeout'], useragent=self.opts['_useragent'])if res['content'] is None:return Nonediff --git a/modules/sfp_fringeproject.py b/modules/sfp_fringeproject.pyindex 6c1ca49f..02ae9501 100644--- a/modules/sfp_fringeproject.py+++ b/modules/sfp_fringeproject.py@@ -39,7 +39,7 @@ class sfp_fringeproject(SpiderFootPlugin):return ['DOMAIN_NAME', 'INTERNET_NAME']def producedEvents(self):- return ['INTERNET_NAME', 'LINKED_URL_INTERNAL',+ return ['INTERNET_NAME', 'LINKED_URL_INTERNAL', 'DOMAIN_NAME','TCP_PORT_OPEN', 'SOFTWARE_USED', 'RAW_RIR_DATA']def query(self, qry):@@ -99,7 +99,7 @@ class sfp_fringeproject(SpiderFootPlugin):e = SpiderFootEvent('RAW_RIR_DATA', str(data), self.__name__, event)self.notifyListeners(e)- domains = list()+ hosts = list()for result in data:data_type = result.get('type')@@ -117,15 +117,15 @@ class sfp_fringeproject(SpiderFootPlugin):if not self.getTarget().matches(value, includeChildren=True, includeParents=True):continue- domains.append(value)+ hosts.append(value)if data_type == 'url':- domain = self.sf.urlFQDN(value.lower())+ host = self.sf.urlFQDN(value.lower())- if not self.getTarget().matches(domain, includeChildren=True, includeParents=True):+ if not self.getTarget().matches(host, includeChildren=True, includeParents=True):continue- domains.append(domain)+ hosts.append(host)evt = SpiderFootEvent('LINKED_URL_INTERNAL', value, self.__name__, event)self.notifyListeners(evt)@@ -141,8 +141,11 @@ class sfp_fringeproject(SpiderFootPlugin):evt = SpiderFootEvent('TCP_PORT_OPEN', value + ':' + str(port[0]), self.__name__, event)self.notifyListeners(evt)- for domain in set(domains):- evt = SpiderFootEvent('INTERNET_NAME', domain, self.__name__, event)+ for host in set(hosts):+ evt = SpiderFootEvent('INTERNET_NAME', host, self.__name__, event)self.notifyListeners(evt)+ if self.sf.isDomain(host, self.opts['_internettlds']):+ evt = SpiderFootEvent('DOMAIN_NAME', host, self.__name__, event)+ self.notifyListeners(evt)# End of sfp_fringeproject classdiff --git a/modules/sfp_fsecure_riddler.py b/modules/sfp_fsecure_riddler.pyindex ee8ac2a8..1e6cf6b6 100644--- a/modules/sfp_fsecure_riddler.py+++ b/modules/sfp_fsecure_riddler.py@@ -24,7 +24,7 @@ class sfp_fsecure_riddler(SpiderFootPlugin):}optdescs = {- 'verify': 'Verify domain names resolve',+ 'verify': 'Verify host names resolve','username': 'F-Secure Riddler.io username','password': 'F-Secure Riddler.io password'}@@ -41,10 +41,11 @@ class sfp_fsecure_riddler(SpiderFootPlugin):self.opts[opt] = userOpts[opt]def watchedEvents(self):- return ['DOMAIN_NAME', 'INTERNET_NAME', 'INTERNET_NAME_UNRESOLVED', 'IP_ADDRESS']+ return ['DOMAIN_NAME', 'INTERNET_NAME',+ 'INTERNET_NAME_UNRESOLVED', 'IP_ADDRESS']def producedEvents(self):- return ['INTERNET_NAME', 'IP_ADDRESS',+ return ['INTERNET_NAME', 'IP_ADDRESS', 'DOMAIN_NAME','PHYSICAL_COORDINATES', 'RAW_RIR_DATA']# https://riddler.io/help/api@@ -169,7 +170,7 @@ class sfp_fsecure_riddler(SpiderFootPlugin):e = SpiderFootEvent('RAW_RIR_DATA', str(data), self.__name__, event)self.notifyListeners(e)- domains = list()+ hosts = list()addrs = list()coords = list()@@ -182,7 +183,7 @@ class sfp_fsecure_riddler(SpiderFootPlugin):if not self.getTarget().matches(host, includeChildren=True, includeParents=True):continue- domains.append(host)+ hosts.append(host)addr = result.get('addr')@@ -194,18 +195,21 @@ class sfp_fsecure_riddler(SpiderFootPlugin):if coord and len(coord) == 2:coords.append(str(coord[0]) + ', ' + str(coord[1]))- for domain in set(domains):- if self.getTarget().matches(domain, includeChildren=True, includeParents=True):+ for host in set(hosts):+ if self.getTarget().matches(host, includeChildren=True, includeParents=True):evt_type = 'INTERNET_NAME'else:evt_type = 'AFFILIATE_DOMAIN'- if self.opts['verify'] and not self.sf.resolveHost(domain):- self.sf.debug("Host " + domain + " could not be resolved")+ if self.opts['verify'] and not self.sf.resolveHost(host):+ self.sf.debug("Host " + host + " could not be resolved")evt_type += '_UNRESOLVED'- evt = SpiderFootEvent(evt_type, domain, self.__name__, event)+ evt = SpiderFootEvent(evt_type, host, self.__name__, event)self.notifyListeners(evt)+ if not evt_type.startswith('AFFILIATE') and self.sf.isDomain(host, self.opts['_internettlds']):+ evt = SpiderFootEvent('DOMAIN_NAME', host, self.__name__, event)+ self.notifyListeners(evt)for addr in set(addrs):if self.sf.validIP(addr):diff --git a/modules/sfp_hackertarget.py b/modules/sfp_hackertarget.pyindex f5ad5fd5..c3c7cdde 100644--- a/modules/sfp_hackertarget.py+++ b/modules/sfp_hackertarget.py@@ -67,7 +67,7 @@ class sfp_hackertarget(SpiderFootPlugin):def producedEvents(self):return ["CO_HOSTED_SITE", "UDP_PORT_OPEN", "TCP_PORT_OPEN", "IP_ADDRESS",'WEBSERVER_HTTPHEADERS', 'RAW_DNS_RECORDS',- 'INTERNET_NAME', 'INTERNET_NAME_UNRESOLVED',+ 'INTERNET_NAME', 'INTERNET_NAME_UNRESOLVED', 'DOMAIN_NAME','AFFILIATE_DOMAIN', 'AFFILIATE_DOMAIN_UNRESOLVED']# Port scan for commonly open UDP ports@@ -229,28 +229,30 @@ class sfp_hackertarget(SpiderFootPlugin):if len(grps) == 0:continue- domains = list()+ hosts = list()for strdata in grps:self.sf.debug("Matched: " + strdata)if strdata.endswith("."):- domains.append(strdata[:-1])+ hosts.append(strdata[:-1])else:- domains.append(strdata + "." + name)+ hosts.append(strdata + "." + name)- for domain in set(domains):- if self.getTarget().matches(domain, includeChildren=True, includeParents=True):+ for host in set(hosts):+ if self.getTarget().matches(host, includeChildren=True, includeParents=True):evt_type = 'INTERNET_NAME'else:evt_type = 'AFFILIATE_DOMAIN'- if self.opts['verify'] and not self.sf.resolveHost(domain):- self.sf.debug("Host " + domain + " could not be resolved")+ if self.opts['verify'] and not self.sf.resolveHost(host):+ self.sf.debug("Host " + host + " could not be resolved")evt_type += '_UNRESOLVED'- evt = SpiderFootEvent(evt_type, domain, self.__name__, event)+ evt = SpiderFootEvent(evt_type, host, self.__name__, event)self.notifyListeners(evt)-+ if not evt_type.startswith('AFFILIATE') and self.sf.isDomain(host, self.opts['_internettlds']):+ evt = SpiderFootEvent('DOMAIN_NAME', host, self.__name__, event)+ self.notifyListeners(evt)return Noneqrylist = list()diff --git a/modules/sfp_mnemonic.py b/modules/sfp_mnemonic.pyindex bfb61cb5..362716b9 100644--- a/modules/sfp_mnemonic.py+++ b/modules/sfp_mnemonic.py@@ -46,7 +46,6 @@ class sfp_mnemonic(SpiderFootPlugin):self.__dataSource__ = "Mnemonic PassiveDNS"self.results = self.tempStorage()self.cohostcount = 0-for opt in userOpts.keys():self.opts[opt] = userOpts[opt]@@ -56,7 +55,8 @@ class sfp_mnemonic(SpiderFootPlugin):# What events this module producesdef producedEvents(self):- return ['IP_ADDRESS', 'IPV6_ADDRESS', 'CO_HOSTED_SITE', 'INTERNET_NAME']+ return ['IP_ADDRESS', 'IPV6_ADDRESS', 'CO_HOSTED_SITE',+ 'INTERNET_NAME', 'DOMAIN_NAME']# Query the PassiveDNS Mnemonic REST APIdef query(self, qry, limit=1000, offset=0):@@ -175,6 +175,9 @@ class sfp_mnemonic(SpiderFootPlugin):if self.getTarget().matches(co, includeParents=True):evt = SpiderFootEvent("INTERNET_NAME", co, self.__name__, event)self.notifyListeners(evt)+ if self.sf.isDomain(co, self.opts['_internettlds']):+ evt = SpiderFootEvent("DOMAIN_NAME", co, self.__name__, event)+ self.notifyListeners(evt)continueif self.cohostcount < self.opts['maxcohost']:diff --git a/modules/sfp_riskiq.py b/modules/sfp_riskiq.pyindex f651bfdc..a0d63f1a 100644--- a/modules/sfp_riskiq.py+++ b/modules/sfp_riskiq.py@@ -61,7 +61,7 @@ class sfp_riskiq(SpiderFootPlugin):# What events this module producesdef producedEvents(self):return ["IP_ADDRESS", "INTERNET_NAME", "AFFILIATE_DOMAIN",- "CO_HOSTED_SITE", "NETBLOCK_OWNER"]+ "CO_HOSTED_SITE", "NETBLOCK_OWNER", 'DOMAIN_NAME']def query(self, qry, qtype, opts=dict()):ret = None@@ -154,6 +154,10 @@ class sfp_riskiq(SpiderFootPlugin):e = SpiderFootEvent("INTERNET_NAME", res['subjectCommonName'],self.__name__, event)self.notifyListeners(e)+ if self.sf.isDomain(res['subjectCommonName'], self.opts['_internettlds']):+ e = SpiderFootEvent("DOMAIN_NAME", res['subjectCommonName'],+ self.__name__, event)+ self.notifyListeners(e)except BaseException as e:self.sf.error("Invalid response returned from RiskIQ: " + str(e), False)@@ -202,6 +206,9 @@ class sfp_riskiq(SpiderFootPlugin):if self.getTarget().matches(co, includeParents=True):e = SpiderFootEvent("INTERNET_NAME", co, self.__name__, event)self.notifyListeners(e)+ if self.sf.isDomain(co, self.opts['_internettlds']):+ e = SpiderFootEvent("DOMAIN_NAME", co, self.__name__, event)+ self.notifyListeners(e)continueif self.cohostcount < self.opts['maxcohost']:diff --git a/modules/sfp_securitytrails.py b/modules/sfp_securitytrails.pyindex b822b806..3538ebbb 100644--- a/modules/sfp_securitytrails.py+++ b/modules/sfp_securitytrails.py@@ -201,5 +201,4 @@ class sfp_securitytrails(SpiderFootPlugin):self.__name__, event)self.notifyListeners(e)-# End of sfp_securitytrails classdiff --git a/modules/sfp_spyonweb.py b/modules/sfp_spyonweb.pyindex 5e329235..00136160 100644--- a/modules/sfp_spyonweb.py+++ b/modules/sfp_spyonweb.py@@ -60,7 +60,8 @@ class sfp_spyonweb(SpiderFootPlugin):# What events this module producesdef producedEvents(self):- return ['CO_HOSTED_SITE', 'INTERNET_NAME', 'AFFILIATE_DOMAIN', 'WEB_ANALYTICS_ID']+ return ['CO_HOSTED_SITE', 'INTERNET_NAME', 'AFFILIATE_DOMAIN',+ 'WEB_ANALYTICS_ID', 'DOMAIN_NAME']# Query the REST API# https://api.spyonweb.com/v1/docs@@ -263,6 +264,9 @@ class sfp_spyonweb(SpiderFootPlugin):if self.getTarget().matches(co, includeParents=True):evt = SpiderFootEvent("INTERNET_NAME", co, self.__name__, event)self.notifyListeners(evt)+ if self.sf.isDomain(co, self.opts['_internettlds']):+ evt = SpiderFootEvent("DOMAIN_NAME", co, self.__name__, event)+ self.notifyListeners(evt)continueif self.cohostcount < self.opts['maxcohost']:diff --git a/modules/sfp_sslcert.py b/modules/sfp_sslcert.pyindex 1316a7cf..cf411dc0 100644--- a/modules/sfp_sslcert.py+++ b/modules/sfp_sslcert.py@@ -62,7 +62,8 @@ class sfp_sslcert(SpiderFootPlugin):'AFFILIATE_DOMAIN', 'AFFILIATE_DOMAIN_UNRESOLVED',"SSL_CERTIFICATE_ISSUED", "SSL_CERTIFICATE_ISSUER","SSL_CERTIFICATE_MISMATCH", "SSL_CERTIFICATE_EXPIRED",- "SSL_CERTIFICATE_EXPIRING", "SSL_CERTIFICATE_RAW"]+ "SSL_CERTIFICATE_EXPIRING", "SSL_CERTIFICATE_RAW",+ "DOMAIN_NAME"]# Handle events sent to this moduledef handleEvent(self, event):@@ -143,6 +144,9 @@ class sfp_sslcert(SpiderFootPlugin):if "*." not in san:evt = SpiderFootEvent(evt_type, san, self.__name__, event)self.notifyListeners(evt)+ if not evt_type.startswith('AFFILIATE') and self.sf.isDomain(san, self.opts['_internettlds']):+ evt = SpiderFootEvent('DOMAIN_NAME', san, self.__name__, event)+ self.notifyListeners(evt)if cert.get('expired'):evt = SpiderFootEvent("SSL_CERTIFICATE_EXPIRED", cert.get('expirystr', 'Unknown'), self.__name__, event)diff --git a/modules/sfp_ssltools.py b/modules/sfp_ssltools.pyindex 69555539..0b6d4748 100644--- a/modules/sfp_ssltools.py+++ b/modules/sfp_ssltools.py@@ -51,7 +51,8 @@ class sfp_ssltools(SpiderFootPlugin):'AFFILIATE_DOMAIN', 'AFFILIATE_DOMAIN_UNRESOLVED','SSL_CERTIFICATE_ISSUED', 'SSL_CERTIFICATE_ISSUER','SSL_CERTIFICATE_MISMATCH', 'SSL_CERTIFICATE_EXPIRED',- 'SSL_CERTIFICATE_EXPIRING', 'SSL_CERTIFICATE_RAW']+ 'SSL_CERTIFICATE_EXPIRING', 'SSL_CERTIFICATE_RAW',+ 'DOMAIN_NAME']# Query SSL Tools for DNSdef queryDns(self, domain):@@ -194,6 +195,9 @@ class sfp_ssltools(SpiderFootPlugin):if "*." not in san:evt = SpiderFootEvent(evt_type, san, self.__name__, event)self.notifyListeners(evt)+ if not evt_type.startswith('AFFILIATE') and self.sf.isDomain(san, self.opts['_internettlds']):+ evt = SpiderFootEvent('DOMAIN_NAME', san, self.__name__, event)+ self.notifyListeners(evt)if cert.get('expired'):evt = SpiderFootEvent("SSL_CERTIFICATE_EXPIRED", cert.get('expirystr', 'Unknown'), self.__name__, event)diff --git a/modules/sfp_sublist3r.py b/modules/sfp_sublist3r.pydeleted file mode 100644index 52e10b92..00000000--- a/modules/sfp_sublist3r.py+++ /dev/null@@ -1,102 +0,0 @@-# -*- coding: utf-8 -*--# --------------------------------------------------------------------------------# Name: sfp_sublist3r-# Purpose: Query Sublist3r using their API-#-# Author: Steve Micallef-#-# Created: 16/05/2018-# Copyright: (c) Steve Micallef 2018-# Licence: GPL-# ---------------------------------------------------------------------------------import json-from sflib import SpiderFoot, SpiderFootPlugin, SpiderFootEvent--class sfp_sublist3r(SpiderFootPlugin):- """Sublist3r:Investigate,Passive,Footprint:Search Engines::Obtain information from Sublist3r's database of hostnames."""--- # Default options- opts = {- "verify": True- }-- # Option descriptions- optdescs = {- "verify": "Verify hosts still resolve?"- }-- # Be sure to completely clear any class variables in setup()- # or you run the risk of data persisting between scan runs.-- results = dict()- errorState = False-- def setup(self, sfc, userOpts=dict()):- self.sf = sfc- self.results = dict()-- # Clear / reset any other class member variables here- # or you risk them persisting between threads.-- for opt in userOpts.keys():- self.opts[opt] = userOpts[opt]-- # What events is this module interested in for input- def watchedEvents(self):- return ["DOMAIN_NAME"]-- # What events this module produces- def producedEvents(self):- return ["INTERNET_NAME", "INTERNET_NAME_UNRESOLVED"]-- def query(self, qry):- url = "https://api.sublist3r.com/search.php?domain=" + qry-- # Be more forgiving with the timeout as some queries for subnets can be slow- res = self.sf.fetchUrl(url , timeout=30, useragent="SpiderFoot")-- if res['code'] in [ "400", "429", "500", "403" ]:- self.sf.error("Sublist3r access seems to have been rejected or you have exceeded usage limits.", False)- return None-- if res['content'] is None:- self.sf.info("No Sublist3r info found for " + qry)- return None-- try:- return json.loads(res['content'])- except BaseException as e:- self.sf.error("Invalid JSON returned by Sublist3r.", False)- return None-- # Handle events sent to this module- def handleEvent(self, event):- eventName = event.eventType- srcModuleName = event.module- eventData = event.data- ret = None-- self.sf.debug("Received event, " + eventName + ", from " + srcModuleName)-- # Don't look up stuff twice- if eventData in self.results:- self.sf.debug("Skipping " + eventData + " as already mapped.")- return None- else:- self.results[eventData] = True-- ret = self.query(eventData)- if ret:- for res in ret:- if self.opts['verify']:- if not self.sf.resolveHost(res):- e = SpiderFootEvent("INTERNET_NAME_UNRESOLVED", res, self.__name__, event)- self.notifyListeners(e)- continue-- e = SpiderFootEvent("INTERNET_NAME", res, self.__name__, event)- self.notifyListeners(e)--# End of sfp_sublist3r classdiff --git a/modules/sfp_urlscan.py b/modules/sfp_urlscan.pyindex 8fac1b3c..9fbb0c8d 100644--- a/modules/sfp_urlscan.py+++ b/modules/sfp_urlscan.py@@ -41,8 +41,9 @@ class sfp_urlscan(SpiderFootPlugin):# What events this module producesdef producedEvents(self):- return ['GEOINFO', 'LINKED_URL_INTERNAL', 'RAW_RIR_DATA',- 'INTERNET_NAME', 'INTERNET_NAME_UNRESOLVED', 'BGP_AS_MEMBER', 'WEBSERVER_BANNER']+ return ['GEOINFO', 'LINKED_URL_INTERNAL', 'RAW_RIR_DATA',+ 'DOMAIN_NAME', 'INTERNET_NAME', 'INTERNET_NAME_UNRESOLVED',+ 'BGP_AS_MEMBER', 'WEBSERVER_BANNER']# https://urlscan.io/about-api/def query(self, qry):@@ -166,6 +167,10 @@ class sfp_urlscan(SpiderFootPlugin):evt = SpiderFootEvent('INTERNET_NAME', domain, self.__name__, event)self.notifyListeners(evt)+ if self.sf.isDomain(domain, self.opts['_internettlds']):+ evt = SpiderFootEvent('DOMAIN_NAME', domain, self.__name__, event)+ self.notifyListeners(evt)+for asn in set(asns):evt = SpiderFootEvent('BGP_AS_MEMBER', asn, self.__name__, event)self.notifyListeners(evt)diff --git a/modules/sfp_virustotal.py b/modules/sfp_virustotal.pyindex 37ba1c45..7658f683 100644--- a/modules/sfp_virustotal.py+++ b/modules/sfp_virustotal.py@@ -74,7 +74,7 @@ class sfp_virustotal(SpiderFootPlugin):"MALICIOUS_COHOST", "MALICIOUS_AFFILIATE_INTERNET_NAME","MALICIOUS_AFFILIATE_IPADDR", "MALICIOUS_NETBLOCK","MALICIOUS_SUBNET", "INTERNET_NAME", "AFFILIATE_INTERNET_NAME",- "INTERNET_NAME_UNRESOLVED"]+ "INTERNET_NAME_UNRESOLVED", 'DOMAIN_NAME']def query(self, qry):ret = None@@ -211,6 +211,10 @@ class sfp_virustotal(SpiderFootPlugin):else:e = SpiderFootEvent("INTERNET_NAME", s, self.__name__, event)self.notifyListeners(e)++ if self.sf.isDomain(s, self.opts['_internettlds']):+ e = SpiderFootEvent("DOMAIN_NAME", s, self.__name__, event)+ self.notifyListeners(e)else:if s not in self.results:e = SpiderFootEvent("AFFILIATE_INTERNET_NAME", s, self.__name__, event)@@ -227,4 +231,8 @@ class sfp_virustotal(SpiderFootPlugin):e = SpiderFootEvent("INTERNET_NAME", n, self.__name__, event)self.notifyListeners(e)+ if self.sf.isDomain(n, self.opts['_internettlds']):+ e = SpiderFootEvent("DOMAIN_NAME", n, self.__name__, event)+ self.notifyListeners(e)+# End of sfp_virustotal classdiff --git a/sflib.py b/sflib.pyindex d6285394..f691b374 100644--- a/sflib.py+++ b/sflib.py@@ -760,6 +760,15 @@ class SpiderFoot:ps = PublicSuffixList(tldList)return ps.get_public_suffix(hostname)+ # Given a possible hostname, check if it's a domain name+ # By checking whether it rests atop a TLD.+ # e.g. www.example.com = False because tld of hostname is com,+ # and www.example has a . in it.+ def isDomain(self, hostname, tldList):+ ps = PublicSuffixList(tldList)+ suffix = ps.get_public_suffix(hostname)+ return hostname == suffix+# Simple way to verify IPv4 addresses.def validIP(self, address):return netaddr.valid_ipv4(address)diff --git a/sfscan.py b/sfscan.pyindex 4910e68a..1a52b77d 100644--- a/sfscan.py+++ b/sfscan.py@@ -270,6 +270,13 @@ class SpiderFootScanner(threading.Thread):firstEvent = SpiderFootEvent(self.ts.targetType, self.ts.targetValue,"SpiderFoot UI", rootEvent)psMod.notifyListeners(firstEvent)++ # Special case.. check if an INTERNET_NAME is also a domain+ if self.ts.targetType == 'INTERNET_NAME':+ if self.ts.sf.isDomain(self.ts.targetValue, self.ts.config['_internettlds']):+ firstEvent = SpiderFootEvent('DOMAIN_NAME', self.ts.targetValue,+ "SpiderFoot UI", rootEvent)+ psMod.notifyListeners(firstEvent)# If in interactive mode, loop through this shared global variable# waiting for inputs, and process them until my status is set to