From 393b33d02de08f49f85d08e01dbf02ee03eaccb5 Mon Sep 17 00:00:00 2001
From: chrisr3d <chris.studer.68@gmail.com>
Date: Wed, 30 Oct 2019 16:31:57 +0100
Subject: [PATCH] fix: Fixed config field parsing for various modules

- Same as previous commit
---
 misp_modules/modules/expansion/securitytrails.py | 7 ++++---
 misp_modules/modules/expansion/shodan.py         | 4 ++--
 misp_modules/modules/expansion/urlscan.py        | 7 +++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/misp_modules/modules/expansion/securitytrails.py b/misp_modules/modules/expansion/securitytrails.py
index 21ff089..cc6b8c7 100644
--- a/misp_modules/modules/expansion/securitytrails.py
+++ b/misp_modules/modules/expansion/securitytrails.py
@@ -37,14 +37,15 @@ def handler(q=False):
 
         request = json.loads(q)
 
-        if not request.get('config') and not (request['config'].get('apikey')):
-            misperrors['error'] = 'DNS authentication is missing'
+        if not request.get('config') or not (request['config'].get('apikey')):
+            misperrors['error'] = 'SecurityTrails authentication is missing'
             return misperrors
 
         api = DnsTrails(request['config'].get('apikey'))
 
         if not api:
-            misperrors['error'] = 'Onyphe Error instance api'
+            misperrors['error'] = 'SecurityTrails Error instance api'
+            return misperrors
         if request.get('ip-src'):
             ip = request['ip-src']
             return handle_ip(api, ip, misperrors)
diff --git a/misp_modules/modules/expansion/shodan.py b/misp_modules/modules/expansion/shodan.py
index fbdf5cd..5a4b792 100755
--- a/misp_modules/modules/expansion/shodan.py
+++ b/misp_modules/modules/expansion/shodan.py
@@ -27,8 +27,8 @@ def handler(q=False):
         misperrors['error'] = "Unsupported attributes type"
         return misperrors
 
-    if not request.get('config') and not (request['config'].get('apikey')):
-        misperrors['error'] = 'shodan authentication is missing'
+    if not request.get('config') or not request['config'].get('apikey'):
+        misperrors['error'] = 'Shodan authentication is missing'
         return misperrors
     api = shodan.Shodan(request['config'].get('apikey'))
 
diff --git a/misp_modules/modules/expansion/urlscan.py b/misp_modules/modules/expansion/urlscan.py
index f8dccbb..302022e 100644
--- a/misp_modules/modules/expansion/urlscan.py
+++ b/misp_modules/modules/expansion/urlscan.py
@@ -31,10 +31,9 @@ def handler(q=False):
     if q is False:
         return False
     request = json.loads(q)
-    if (request.get('config')):
-        if (request['config'].get('apikey') is None):
-            misperrors['error'] = 'urlscan apikey is missing'
-            return misperrors
+    if not request.get('config') or not request['config'].get('apikey'):
+        misperrors['error'] = 'Urlscan apikey is missing'
+        return misperrors
     client = urlscanAPI(request['config']['apikey'])
 
     r = {'results': []}