Skip to content

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

revert

Immanuel Georgecb751c8eedd0
diff --git a/modules/sfp_malwarepatrol.py b/modules/sfp_malwarepatrol.py
index 7b10af23..03d7196e 100644
--- a/modules/sfp_malwarepatrol.py
+++ b/modules/sfp_malwarepatrol.py
@@ -50,35 +50,25 @@ class sfp_malwarepatrol(SpiderFootPlugin):
"MALICIOUS_COHOST"]
def queryAddr(self, qaddr):
- block_list = [
- "clamav_basic",
- "firekeeper",
- "mailwasher",
- "mozilla_adblock",
- "spamassassin",
- "smoothwall"
- ]
-
- for block_name in block_list:
- data = dict()
- url = "http://lists.malwarepatrol.net/cgi/getfile?receipt={}&product=32&list={}"
- url = url.format(self.opts['api_key'], block_name)
-
- data['content'] = self.sf.cacheGet("sfmalwarepatrol", 72)
+ data = dict()
+ url = "http://lists.malwarepatrol.net/cgi/getfile?receipt=" + \
+ self.opts['api_key'] + "&product=8&list=smoothwall"
+
+ data['content'] = self.sf.cacheGet("sfmalwarepatrol", 72)
+ if data['content'] is None:
+ data = self.sf.fetchUrl(url, useragent=self.opts['_useragent'])
if data['content'] is None:
- data = self.sf.fetchUrl(url, useragent=self.opts['_useragent'])
- if data['content'] is None:
- self.sf.error("Unable to fetch " + url, False)
- return None
- else:
- self.sf.cachePut("sfmalwarepatrol", data['content'])
-
- for line in data['content'].split('\n'):
- if len(line) < 2 or line.startswith('#'):
- continue
-
- if line.startswith(qaddr):
- return True
+ self.sf.error("Unable to fetch " + url, False)
+ return None
+ else:
+ self.sf.cachePut("sfmalwarepatrol", data['content'])
+
+ for line in data['content'].split('\n'):
+ if len(line) < 2 or line.startswith('#'):
+ continue
+
+ if line.startswith(qaddr):
+ return True
return False