Skip to content

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

Bug fixes.

Steve4201b0f0176d
diff --git a/modules/sfp_junkfiles.py b/modules/sfp_junkfiles.py
index 937e43d5..75ad69bc 100644
--- a/modules/sfp_junkfiles.py
+++ b/modules/sfp_junkfiles.py
@@ -19,11 +19,10 @@ class sfp_junkfiles(SpiderFootPlugin):
# Default options
opts = {
- 'fileexts': ['tmp', 'bak', 'old', 'backup', 'new'],
+ 'fileexts': ['tmp', 'bak', 'old'],
'urlextstry': ['asp', 'php', 'jsp',],
- 'files': ['x', 'xxx', 'crap', 'old', 'a', 'aaa', 'z', 'zzz',
- 'out', 'sql', "passwd", ".htaccess", ".htpasswd",
- "Thumbs.db", "asd", "asdf"],
+ 'files': ["old", "passwd", ".htaccess", ".htpasswd",
+ "Thumbs.db", "backup"],
'dirs': ['zip', 'tar.gz', 'tgz', 'tar'],
'skipfake': True
}
@@ -88,6 +87,8 @@ class sfp_junkfiles(SpiderFootPlugin):
useragent=self.opts['_useragent'])
if res['code'] != "404":
self.skiphosts.append(host)
+ self.hosts.append(host)
+ return None
self.hosts.append(host)
diff --git a/modules/sfp_whois.py b/modules/sfp_whois.py
index 38ebb006..d515e489 100644
--- a/modules/sfp_whois.py
+++ b/modules/sfp_whois.py
@@ -61,11 +61,11 @@ class sfp_whois(SpiderFootPlugin):
self.sf.debug("Received event, " + eventName + ", from " + srcModuleName)
try:
- x = pythonwhois.net.get_whois_raw(eventData)
+ rawwhois = pythonwhois.net.get_whois_raw(eventData)
try:
- data = unicode('\n'.join(x), 'utf-8', errors='replace')
+ data = unicode('\n'.join(rawwhois), 'utf-8', errors='replace')
except BaseException as e:
- data = '\n'.join(x)
+ data = '\n'.join(rawwhois)
except BaseException as e:
self.sf.error("Unable to perform WHOIS on " + eventData + ": " + str(e), False)
return None
@@ -79,12 +79,18 @@ class sfp_whois(SpiderFootPlugin):
self.notifyListeners(rawevt)
try:
- info = pythonwhois.parse.parse_raw_whois(data, True)
+ info = pythonwhois.parse.parse_raw_whois(rawwhois, True)
+ newinfo = {}
+ for k, v in info.items():
+ newinfo[k.lower()] = v
+ info = newinfo
+ print str(info)
except BaseException as e:
self.sf.debug("Error parsing whois data for " + eventData)
return None
if info.has_key('registrar'):
+ print "HERE"
if eventName.startswith("DOMAIN_NAME") and info['registrar'] is not None:
evt = SpiderFootEvent("DOMAIN_REGISTRAR", info['registrar'][0],
self.__name__, event)