Skip to content

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

Bunch of bug fixes causing failures, crashes and errors.

Steve75ce72eed778
diff --git a/modules/sfp_botscout.py b/modules/sfp_botscout.py
index 2e547ce4..8342a36e 100644
--- a/modules/sfp_botscout.py
+++ b/modules/sfp_botscout.py
@@ -26,6 +26,7 @@ class sfp_botscout(SpiderFootPlugin):
"apikey": "botscout.com API key. Without this you will be limited to 50 look-ups per day."
}
results = dict()
+ errorState = False
def setup(self, sfc, userOpts=dict()):
self.sf = sfc
@@ -50,10 +51,14 @@ class sfp_botscout(SpiderFootPlugin):
srcModuleName = event.module
eventData = event.data
+ if self.errorState:
+ return None
+
self.sf.debug("Received event, " + eventName + ", from " + srcModuleName)
if self.opts['apikey'] == "":
self.sf.error("You enabled sfp_botscout but did not set an API key!", False)
+ self.errorState = True
return None
# Don't look up stuff twice
diff --git a/modules/sfp_filemeta.py b/modules/sfp_filemeta.py
index cf83a499..77b5002f 100644
--- a/modules/sfp_filemeta.py
+++ b/modules/sfp_filemeta.py
@@ -84,6 +84,7 @@ class sfp_filemeta(SpiderFootPlugin):
if len(ret['content']) < 512:
self.sf.error("Strange content encountered, size of " +
str(len(ret['content'])), False)
+ return None
meta = None
data = None
diff --git a/modules/sfp_honeypot.py b/modules/sfp_honeypot.py
index 3faafaa1..5c95ecc5 100644
--- a/modules/sfp_honeypot.py
+++ b/modules/sfp_honeypot.py
@@ -44,6 +44,7 @@ class sfp_honeypot(SpiderFootPlugin):
}
results = dict()
+ errorState = False
# Status codes according to:
# http://www.projecthoneypot.org/httpbl_api.php
@@ -145,10 +146,14 @@ class sfp_honeypot(SpiderFootPlugin):
parentEvent = event
addrlist = list()
+ if self.errorState:
+ return None
+
self.sf.debug("Received event, " + eventName + ", from " + srcModuleName)
if self.opts['apikey'] == "":
self.sf.error("You enabled sfp_honeypot but did not set an API key!", False)
+ self.errorState = True
return None
if eventData in self.results:
diff --git a/modules/sfp_phone.py b/modules/sfp_phone.py
index 0eaa8617..5c17cf55 100644
--- a/modules/sfp_phone.py
+++ b/modules/sfp_phone.py
@@ -49,11 +49,12 @@ class sfp_phone(SpiderFootPlugin):
eventName = event.eventType
srcModuleName = event.module
eventData = event.data
+ hashData = self.sf.hashstring(eventData)
- if eventSource in self.results:
+ if hashData in self.results:
return None
else:
- self.results.append(self.sf.hashstring(eventData))
+ self.results.append(hashData)
self.sf.debug("Received event, " + eventName + ", from " + srcModuleName)
diff --git a/modules/sfp_shodan.py b/modules/sfp_shodan.py
index 04d64a1a..e1e115d1 100644
--- a/modules/sfp_shodan.py
+++ b/modules/sfp_shodan.py
@@ -33,6 +33,7 @@ class sfp_shodan(SpiderFootPlugin):
}
results = dict()
+ errorState = False
def setup(self, sfc, userOpts=dict()):
self.sf = sfc
@@ -75,10 +76,14 @@ class sfp_shodan(SpiderFootPlugin):
srcModuleName = event.module
eventData = event.data
+ if self.errorState:
+ return None
+
self.sf.debug("Received event, " + eventName + ", from " + srcModuleName)
if self.opts['apikey'] == "":
self.sf.error("You enabled sfp_shodan but did not set an API key!", False)
+ self.errorState = True
return None
# Don't look up stuff twice
diff --git a/modules/sfp_tldsearch.py b/modules/sfp_tldsearch.py
index 3a755640..a5d33fc0 100644
--- a/modules/sfp_tldsearch.py
+++ b/modules/sfp_tldsearch.py
@@ -14,6 +14,7 @@
import socket
import random
import threading
+import time
from sflib import SpiderFoot, SpiderFootPlugin, SpiderFootEvent
@@ -88,6 +89,8 @@ class sfp_tldsearch(SpiderFootPlugin):
if not found:
running = False
+ time.sleep(2)
+
for res in self.tldResults.keys():
if self.tldResults[res]:
self.sendEvent(sourceEvent, res)
diff --git a/modules/sfp_virustotal.py b/modules/sfp_virustotal.py
index ecacb7da..98a4a6fc 100644
--- a/modules/sfp_virustotal.py
+++ b/modules/sfp_virustotal.py
@@ -47,6 +47,7 @@ class sfp_virustotal(SpiderFootPlugin):
# or you run the risk of data persisting between scan runs.
results = dict()
+ errorState = False
def setup(self, sfc, userOpts=dict()):
self.sf = sfc
@@ -104,10 +105,14 @@ class sfp_virustotal(SpiderFootPlugin):
srcModuleName = event.module
eventData = event.data
+ if self.errorState:
+ return None
+
self.sf.debug("Received event, " + eventName + ", from " + srcModuleName)
if self.opts['apikey'] == "":
self.sf.error("You enabled sfp_virustotal but did not set an API key!", False)
+ self.errorState = True
return None
# Don't look up stuff twice
diff --git a/modules/sfp_xforce.py b/modules/sfp_xforce.py
index b542e3bd..5c76f1c9 100644
--- a/modules/sfp_xforce.py
+++ b/modules/sfp_xforce.py
@@ -40,6 +40,7 @@ class sfp_xforce(SpiderFootPlugin):
# or you run the risk of data persisting between scan runs.
results = dict()
+ errorState = False
def setup(self, sfc, userOpts=dict()):
self.sf = sfc
@@ -100,8 +101,16 @@ class sfp_xforce(SpiderFootPlugin):
infield_sep = " ; "
+ if self.errorState:
+ return None
+
self.sf.debug("Received event, " + eventName + ", from " + srcModuleName)
+ if self.opts['xforce_api_key'] == "" or self.opts['xforce_password'] == "":
+ self.sf.error("You enabled sfp_xforce but did not set an API key/password!", False)
+ self.errorState = True
+ return None
+
# Don't look up stuff twice
if eventData in self.results:
self.sf.debug("Skipping " + eventData + " as already mapped.")