MISP
/
misp-modules
mirror of https://github.com/MISP/misp-modules
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #144 from attritionorg/patch-1 

minor touch-ups on error messages for user friendliness
pull/145/head
Andras Iklody 2017-11-17 08:29:40 +01:00 committed by GitHub
parent b216c1a1af 32958324ca
commit 8129fcd2f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
misp_modules/modules/expansion/vulndb.py
View File

@ -43,12 +43,12 @@ def handler(q=False):
# Only continue if we have a vulnerability attribute # Only continue if we have a vulnerability attribute
if not request.get('vulnerability'): if not request.get('vulnerability'):
misperrors['error'] = 'Vulnerability id missing for VulnDB' misperrors['error'] = 'Vulnerability ID missing for VulnDB.'
return misperrors return misperrors
vulnerability = request.get('vulnerability') vulnerability = request.get('vulnerability')
if request["config"].get("apikey") is None or request["config"].get("apisecret") is None: if request["config"].get("apikey") is None or request["config"].get("apisecret") is None:
misperrors["error"] = "Missing API key or secret value for VulnDB" misperrors["error"] = "Missing API key or secret value for VulnDB."
return misperrors return misperrors
apikey = request["config"].get("apikey") apikey = request["config"].get("apikey")
apisecret = request["config"].get("apisecret") apisecret = request["config"].get("apisecret")
@ -90,7 +90,7 @@ def handler(q=False):
if content_json: if content_json:
if 'error' in content_json: if 'error' in content_json:
misperrors["error"] = "No CVE information found" misperrors["error"] = "No CVE information found."
return misperrors return misperrors
else: else:
output = {'results': list()} output = {'results': list()}
@ -266,7 +266,7 @@ def handler(q=False):
output['results'] += [{'types': 'cpe', 'values': values_cpe }] output['results'] += [{'types': 'cpe', 'values': values_cpe }]
return output return output
else: else:
misperrors["error"] = "No information retrieved from VulnDB" misperrors["error"] = "No information retrieved from VulnDB."
return misperrors return misperrors
except: except:
misperrors["error"] = "Error while fetching information from VulnDB, wrong API keys?" misperrors["error"] = "Error while fetching information from VulnDB, wrong API keys?"