Skip to content

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

Bug fixes.

smicallef69d7875d20b3
diff --git a/modules/sfp_names.py b/modules/sfp_names.py
index 5b2ab000..a72c7621 100644
--- a/modules/sfp_names.py
+++ b/modules/sfp_names.py
@@ -82,7 +82,7 @@ class sfp_names(SpiderFootPlugin):
name = str(name)
# Names don't have numbers
- if re.match("[0-9]", name):
+ if re.match("[0-9]*", name):
return None
# Notify other modules of what you've found
diff --git a/modules/sfp_riskiq.py b/modules/sfp_riskiq.py
index 756f7934..d7f6ea82 100644
--- a/modules/sfp_riskiq.py
+++ b/modules/sfp_riskiq.py
@@ -157,6 +157,8 @@ class sfp_riskiq(SpiderFootPlugin):
# Generate an event for the IP first, and then link the cert
# to that event.
for res in ret:
+ if res['subjectCommonName'] == eventData:
+ continue
if self.getTarget().matches(res['subjectCommonName'], includeChildren=True):
e = SpiderFootEvent("INTERNET_NAME", res['subjectCommonName'],
self.__name__, event)
@@ -216,6 +218,9 @@ class sfp_riskiq(SpiderFootPlugin):
cohosts.append(r['focusPoint'])
for co in cohosts:
+ if co == eventData:
+ continue
+
if eventName == "IP_ADDRESS" and (self.opts['verify'] and not self.sf.validateIP(co, eventData)):
self.sf.debug("Host no longer resolves to our IP.")
continue
diff --git a/modules/sfp_social.py b/modules/sfp_social.py
index 237d00f3..3eddf96c 100644
--- a/modules/sfp_social.py
+++ b/modules/sfp_social.py
@@ -82,8 +82,9 @@ class sfp_social(SpiderFootPlugin):
bits = re.match(regex, eventData, re.IGNORECASE)
if bits is not None:
self.sf.info("Matched " + regexpGrp + " in " + eventData)
- evt = SpiderFootEvent("SOCIAL_MEDIA", regexpGrp + ": " +
- eventData, self.__name__, event)
+ evt = SpiderFootEvent("SOCIAL_MEDIA", regexpGrp + ": " + \
+ "<SFURL>" + eventData + "</SFURL>",
+ self.__name__, event)
self.notifyListeners(evt)
# Except for Google+, the link includes potential usernames
diff --git a/modules/sfp_spider.py b/modules/sfp_spider.py
index 05e38f1f..527d4b4e 100644
--- a/modules/sfp_spider.py
+++ b/modules/sfp_spider.py
@@ -211,10 +211,12 @@ class sfp_spider(SpiderFootPlugin):
event.actualSource = url
self.notifyListeners(event)
- event = SpiderFootEvent("WEBSERVER_HTTPHEADERS", json.dumps(httpresult['headers'], ensure_ascii=False),
- self.__name__, parentEvent)
- event.actualSource = url
- self.notifyListeners(event)
+ hdr = httpresult['headers']
+ if hdr != None:
+ event = SpiderFootEvent("WEBSERVER_HTTPHEADERS", json.dumps(hdr, ensure_ascii=False),
+ self.__name__, parentEvent)
+ event.actualSource = url
+ self.notifyListeners(event)
event = SpiderFootEvent("HTTP_CODE", str(httpresult['code']),
self.__name__, parentEvent)
diff --git a/modules/sfp_virustotal.py b/modules/sfp_virustotal.py
index a9d1854d..f2b0a20c 100644
--- a/modules/sfp_virustotal.py
+++ b/modules/sfp_virustotal.py
@@ -99,6 +99,7 @@ class sfp_virustotal(SpiderFootPlugin):
ret = json.loads(res['content'])
except Exception as e:
self.sf.error("Error processing JSON response from VirusTotal.", False)
+ self.errorState = True
return None
return ret