Merge branch 'master' into feature/oscd

.drone.yml

@@ -57,6 +57,14 @@ steps:
     when:
       event: [tag]
 
+  - name: build report-templates zip package
+    image: thehiveproject/neurons-build-report-templates
+    when:
+      event: [tag]
+
+
+# Bintray will not be used anymore. We keep it until Feb 21
+
   - name: upload catalogs to bintray
     image: thehiveproject/drone-bintray
     settings:
@@ -91,7 +99,32 @@ steps:
     when:
       event: [tag]
 
-  - name: upload catalogs to package server
+  - name: upload report-templates to bintray
+    image: thehiveproject/drone-bintray
+    settings:
+      user: {from_secret: bintray_user}
+      key: {from_secret: bintray_key}
+      subject: thehive-project
+      package: report-templates
+      version: latest
+      override: 1
+      publish: 1
+    commands:
+    - |
+      export PLUGIN_USER
+      export PLUGIN_KEY
+      export PLUGIN_SUBJECT
+      export PLUGIN_PACKAGE
+      export PLUGIN_VERSION
+      export PLUGIN_OVERRIDE
+      export PLUGIN_PUBLISH
+      upload \
+      --file analyzers/report-templates.zip \
+      --repo binary
+    when:
+      event: [tag]
+
+  - name: upload catalogs and report-templates package to package server
     image: appleboy/drone-scp
     settings:
       host: {from_secret: package_host}
@@ -103,6 +136,7 @@ steps:
         - analyzers/analyzers-stable.json
         - responders/responders.json
         - responders/responders-stable.json
+        - analyzers/report-templates.zip
       strip_components: 1
     when:
       event: [tag]
@@ -112,6 +146,8 @@ steps:
     when:
       branch: [develop]
 
+
+# Bintray will not be used anymore. We keep it until Feb 21
   - name: upload devel catalogs to bintray
     image: thehiveproject/drone-bintray
     settings:

analyzers/MISPWarningLists/requirements.txt

@@ -4,3 +4,4 @@ ipaddress
 tld
 sqlalchemy
 psycopg2-binary
+tqdm

analyzers/MISPWarningLists/warninglists_create_db.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # coding: utf-8
 
 import re

analyzers/URLhaus/URLhaus_analyzer.py

@@ -35,7 +35,8 @@ def summary(self, raw):
         namespace = "URLhaus"
 
         if raw['query_status'] == 'no_results' \
-        or raw['query_status'] == 'ok' and raw['md5_hash'] == None and raw['sha256_hash'] == None:
+        or (raw['query_status'] == 'ok' and not raw.get('md5_hash', None) \
+        and not raw.get('sha256_hash', None)):
             taxonomies.append(self.build_taxonomy(
                 'info',
                 namespace,