From d2661c7a2017f669baf98cfaee5f4b9a7a18bf66 Mon Sep 17 00:00:00 2001
From: chrisr3d <chris.studer.68@gmail.com>
Date: Tue, 28 Jul 2020 15:06:25 +0200
Subject: [PATCH] fix: Fixed pep8 + some copy paste issues introduced with the
 latest commits

---
 misp_modules/modules/expansion/__init__.py           | 1 +
 misp_modules/modules/expansion/cve_advanced.py       | 1 +
 misp_modules/modules/expansion/cytomic_orion.py      | 1 +
 misp_modules/modules/expansion/ransomcoindb.py       | 2 +-
 misp_modules/modules/expansion/sophoslabs_intelix.py | 8 ++++----
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/misp_modules/modules/expansion/__init__.py b/misp_modules/modules/expansion/__init__.py
index af895e3..1b6d2bb 100644
--- a/misp_modules/modules/expansion/__init__.py
+++ b/misp_modules/modules/expansion/__init__.py
@@ -26,5 +26,6 @@ minimum_required_fields = ('type', 'uuid', 'value')
 checking_error = 'containing at least a "type" field and a "value" field'
 standard_error_message = 'This module requires an "attribute" field as input'
 
+
 def check_input_attribute(attribute, requirements=minimum_required_fields):
     return all(feature in attribute for feature in requirements)
diff --git a/misp_modules/modules/expansion/cve_advanced.py b/misp_modules/modules/expansion/cve_advanced.py
index bd2d277..cd36655 100644
--- a/misp_modules/modules/expansion/cve_advanced.py
+++ b/misp_modules/modules/expansion/cve_advanced.py
@@ -111,6 +111,7 @@ def handler(q=False):
     request = json.loads(q)
     if not request.get('attribute') or not check_input_attribute(request['attribute']):
         return {'error': f'{standard_error_message}, which should contain at least a type, a value and an uuid.'}
+    attribute = request['attribute']
     if attribute.get('type') != 'vulnerability':
         misperrors['error'] = 'Vulnerability id missing.'
         return misperrors
diff --git a/misp_modules/modules/expansion/cytomic_orion.py b/misp_modules/modules/expansion/cytomic_orion.py
index b730135..c13b254 100755
--- a/misp_modules/modules/expansion/cytomic_orion.py
+++ b/misp_modules/modules/expansion/cytomic_orion.py
@@ -149,6 +149,7 @@ def handler(q=False):
 
     if not request.get('attribute') or not check_input_attribute(request['attribute']):
         return {'error': f'{standard_error_message}, which should contain at least a type, a value and an uuid.'}
+    attribute = request['attribute']
     if not any(input_type == attribute['type'] for input_type in mispattributes['input']):
         return {'error': 'Unsupported attribute type.'}
 
diff --git a/misp_modules/modules/expansion/ransomcoindb.py b/misp_modules/modules/expansion/ransomcoindb.py
index d9a1712..0e05855 100644
--- a/misp_modules/modules/expansion/ransomcoindb.py
+++ b/misp_modules/modules/expansion/ransomcoindb.py
@@ -29,7 +29,7 @@ def handler(q=False):
     q = json.loads(q)
     if "config" not in q or "api-key" not in q["config"]:
         return {"error": "Ransomcoindb API key is missing"}
-    if not q.get('attribute') or not check_input_attribute(attribute, requirements=('type', 'value')):
+    if not q.get('attribute') or not check_input_attribute(q['attribute'], requirements=('type', 'value')):
         return {'error': f'{standard_error_message}, {checking_error}.'}
     if q['attribute']['type'] not in mispattributes['input']:
         return {'error': 'Unsupported attribute type.'}
diff --git a/misp_modules/modules/expansion/sophoslabs_intelix.py b/misp_modules/modules/expansion/sophoslabs_intelix.py
index 38d4293..254437b 100644
--- a/misp_modules/modules/expansion/sophoslabs_intelix.py
+++ b/misp_modules/modules/expansion/sophoslabs_intelix.py
@@ -1,8 +1,8 @@
-from. import check_input_attribute, checking_error, standard_error_message
-from pymisp import MISPEvent, MISPObject
 import json
 import requests
 import base64
+from. import check_input_attribute, checking_error, standard_error_message
+from pymisp import MISPEvent, MISPObject
 from urllib.parse import quote
 
 moduleinfo = {'version': '1.0',
@@ -107,9 +107,9 @@ def handler(q=False):
             It's free to sign up here https://aws.amazon.com/marketplace/pp/B07SLZPMCS."
         return misperrors
     to_check = (('type', 'value'), ('type', 'value1'))
-    if not request.get('attribute') or not any(check_input_attribute(request['attribute'], requirements=check) for check in to_check):
+    if not j.get('attribute') or not any(check_input_attribute(j['attribute'], requirements=check) for check in to_check):
         return {'error': f'{standard_error_message}, {checking_error}.'}
-    attribute = request['attribute']
+    attribute = j['attribute']
     if attribute['type'] not in misp_types_in:
         return {'error': 'Unsupported attribute type.'}
     client = SophosLabsApi(j['config']['client_id'], j['config']['client_secret'])