chg: Taking into consideration if a user agent is specified in the module configuration

pull/341/head
chrisr3d 2019-10-15 11:25:30 +02:00
parent 6d19549184
commit 8aca19ba68
No known key found for this signature in database
GPG Key ID: 6BBED1B63A6D639F
1 changed files with 3 additions and 2 deletions

View File

@ -4,7 +4,7 @@ import json
misperrors = {'error': 'Error'}
mispattributes = {'input': ['mac-address'], 'output': ['text']}
moduleinfo = {'version': '0.1', 'author': 'Aurélien Schwab', 'description': 'Module to access Macvendors API.', 'module-type': ['hover']}
moduleconfig = ['user-agent'] # TODO take this into account in the code
moduleconfig = ['user-agent']
macvendors_api_url = 'https://api.macvendors.com/'
default_user_agent = 'MISP-Module'
@ -21,7 +21,8 @@ def handler(q=False):
else:
misperrors['error'] = "Unsupported attributes type"
return misperrors
r = requests.get(macvendors_api_url + mac, headers={'user-agent': default_user_agent}) # Real request
user_agent = request['config']['user-agent'] if request.get('config') and request['config'].get('user-agent') else default_user_agent
r = requests.get(macvendors_api_url + mac, headers={'user-agent': user_agent}) # Real request
if r.status_code == 200: # OK (record found)
response = r.text
if response: