diff --git a/analyzers/DNSDB/dnsdb.py b/analyzers/DNSDB/dnsdb.py index 31b98e276..625bf7a71 100755 --- a/analyzers/DNSDB/dnsdb.py +++ b/analyzers/DNSDB/dnsdb.py @@ -46,14 +46,14 @@ def summary(self, raw): if ("records" in raw): r = len(raw["records"]) - if r == 0 or r == 1: - taxonomy["value"] = "\"{} record\"".format(r) - else: - taxonomy["value"] = "\"{} records\"".format(r) - taxonomies.append(taxonomy) + if r == 0 or r == 1: + taxonomy["value"] = "\"{} record\"".format(r) + else: + taxonomy["value"] = "\"{} records\"".format(r) - result = {'taxonomies': taxonomies} + taxonomies.append(taxonomy) + result = {'taxonomies': taxonomies} return result def run(self): diff --git a/analyzers/DomainTools/domaintools.py b/analyzers/DomainTools/domaintools.py index 03df83956..0fc457994 100755 --- a/analyzers/DomainTools/domaintools.py +++ b/analyzers/DomainTools/domaintools.py @@ -60,18 +60,22 @@ def summary(self, raw): if r["service"] == "reverse-ip": report["predicate"] = "Reverse_IP" taxonomy["value"] = "\"{}, {} domains\"".format(r["ip"]["address"], r["ip"]["domain_count"]) + taxonomies.append(taxonomy) if r["service"] == "name-server-domains": taxonomy["predicate"] = "Reverse_Name_Server" taxonomy["value"] = "\"{}, {} domains\"".format(r["name_server"], r["domain_count"]) + taxonomies.append(taxonomy) if r["service"] == "reverse-whois": taxonomy["predicate"] = "Reverse_Whois" taxonomy["value"] = "\"curr:{} / hist:{} domains\"".format(r["domain_count"]["current"], r["domain_count"]["historic"]) + taxonomies.append(taxonomy) if r["service"] == "whois/history": taxonomy["predicate"] = "Whois_History" taxonomy["value"] = "\"{}, {} domains \"".format(r["name_server"], r["domain_count"]) + taxonomies.append(taxonomy) if (r["service"] == "whois/parsed") or (r['service'] == "whois"): taxonomy["predicate"] = "Whois" diff --git a/analyzers/FireHOLBlocklists/firehol_blocklists.py b/analyzers/FireHOLBlocklists/firehol_blocklists.py index f722f3ddf..484175492 100755 --- a/analyzers/FireHOLBlocklists/firehol_blocklists.py +++ b/analyzers/FireHOLBlocklists/firehol_blocklists.py @@ -115,19 +115,21 @@ def summary(self, raw): taxonomy = {"level": "info", "namespace": "Filehol", "predicate": "Blocklists", "value": 0} taxonomies = [] - r = raw.get('count', 0) + if 'count' in raw: + r = raw.get('count', 0) - if r == 0 or r == 1: - taxonomy["value"] = "\"{} hit\"".format(r) - else: - taxonomy["value"] = "\"{} hits\"".format(r) + if r == 0 or r == 1: + taxonomy["value"] = "\"{} hit\"".format(r) + else: + taxonomy["value"] = "\"{} hits\"".format(r) - if r > 0: - taxonomy["level"] = "suspicious" - else: - taxonomy["level"] = "success" + if r > 0: + taxonomy["level"] = "suspicious" + else: + taxonomy["level"] = "success" + + taxonomies.append(taxonomy) - taxonomies.append(taxonomy) result = {"taxonomies": taxonomies} return result diff --git a/analyzers/GoogleSafebrowsing/safebrowsing_analyzer.py b/analyzers/GoogleSafebrowsing/safebrowsing_analyzer.py index b2e5ee335..7abb2e383 100755 --- a/analyzers/GoogleSafebrowsing/safebrowsing_analyzer.py +++ b/analyzers/GoogleSafebrowsing/safebrowsing_analyzer.py @@ -27,14 +27,14 @@ def summary(self, raw): if ("results" in raw): r = len(raw['results']) - if r == 0 or r == 1: - taxonomy["value"] = "\"{} match\"".format(r) - else: - taxonomy["value"] = "\"{} matches\"".format(r) - - if r > 0: - taxonomy["level"] = "malicious" - # level : info, safe, suspicious, malicious + if r == 0 or r == 1: + taxonomy["value"] = "\"{} match\"".format(r) + else: + taxonomy["value"] = "\"{} matches\"".format(r) + + if r > 0: + taxonomy["level"] = "malicious" + # level : info, safe, suspicious, malicious taxonomies.append(taxonomy) result = {"taxonomies": taxonomies}