Merge branch 'main' of github.com:MISP/misp-modules into chrisr3d_patch

misp_modules/modules/expansion/cpe.py

@@ -13,6 +13,7 @@ moduleinfo = {
 }
 moduleconfig = ["custom_API_URL", "limit"]
 cveapi_url = 'https://cvepremium.circl.lu/api/query'
+DEFAULT_LIMIT = 10
 
 
 class VulnerabilitiesParser():
@@ -31,11 +32,11 @@ class VulnerabilitiesParser():
             },
             'vulnerable_configuration': {
                 'type': 'cpe',
-                'object_relation': 'vulnerable_configuration'
+                'object_relation': 'vulnerable-configuration'
             },
             'vulnerable_configuration_cpe_2_2': {
                 'type': 'cpe',
-                'object_relation': 'vulnerable_configuration'
+                'object_relation': 'vulnerable-configuration'
             },
             'Modified': {
                 'type': 'datetime',
@@ -99,19 +100,18 @@ def handler(q=False):
     attribute = request['attribute']
     if attribute.get('type') != 'cpe':
         return {'error': 'Wrong input attribute type.'}
-    url = check_url(request['config']['custom_API_URL']) if request['config'].get('custom_API_URL') else cveapi_url
+    config = request['config']
+    url = check_url(config['custom_API_URL']) if config.get('custom_API_URL') else cveapi_url
+    limit = int(config['limit']) if config.get('limit') else DEFAULT_LIMIT
     params = {
         "retrieve": "cves",
         "dict_filter": {
             "vulnerable_configuration": attribute['value']
-        }
+        },
+        "limit": limit,
+        "sort": "cvss",
+        "sort_dir": "DESC"
     }
-    if request['config'].get('limit'):
-        params.update({
-            "limit": int(request['config']['limit']),
-            "sort": "cvss",
-            "sort_dir": "DESC"
-        })
     response = requests.post(url, json=params)
     if response.status_code == 200:
         vulnerabilities = response.json()['data']