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

Merge pull request #470 from adammchugh/patch-1 

Update assemblyline_submit.py - Add verify SSL option
pull/473/head
Alexandre Dulaunoy 2021-02-02 13:31:38 +01:00 committed by GitHub
parent 84c1fdd7dc 2832466f7f
commit 882e17ae09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misp_modules/modules/expansion/assemblyline_query.py
View File

@ -11,7 +11,7 @@ mispattributes = {'input': ['link'], 'format': 'misp_standard'}
moduleinfo = {'version': '1', 'author': 'Christian Studer', moduleinfo = {'version': '1', 'author': 'Christian Studer',
'description': 'Query AssemblyLine with a report URL to get the parsed data.', 'description': 'Query AssemblyLine with a report URL to get the parsed data.',
'module-type': ['expansion']} 'module-type': ['expansion']}
moduleconfig = ["apiurl", "user_id", "apikey", "password"] moduleconfig = ["apiurl", "user_id", "apikey", "password", "verifyssl"]
class AssemblyLineParser(): class AssemblyLineParser():
@ -125,7 +125,7 @@ def parse_config(apiurl, user_id, config):
error = {"error": "Please provide your AssemblyLine API key or Password."} error = {"error": "Please provide your AssemblyLine API key or Password."}
if config.get('apikey'): if config.get('apikey'):
try: try:
return Client(apiurl, apikey=(user_id, config['apikey'])) return Client(apiurl, apikey=(user_id, config['apikey']), verify=config['verifyssl'])
except ClientError as e: except ClientError as e:
error['error'] = f'Error while initiating a connection with AssemblyLine: {e.__str__()}' error['error'] = f'Error while initiating a connection with AssemblyLine: {e.__str__()}'
if config.get('password'): if config.get('password'):

6
misp_modules/modules/expansion/assemblyline_submit.py
View File

@ -7,7 +7,7 @@ from urllib.parse import urljoin
moduleinfo = {"version": 1, "author": "Christian Studer", "module-type": ["expansion"], moduleinfo = {"version": 1, "author": "Christian Studer", "module-type": ["expansion"],
"description": "Submit files or URLs to AssemblyLine"} "description": "Submit files or URLs to AssemblyLine"}
moduleconfig = ["apiurl", "user_id", "apikey", "password"] moduleconfig = ["apiurl", "user_id", "apikey", "password", "verifyssl"]
mispattributes = {"input": ["attachment", "malware-sample", "url"], mispattributes = {"input": ["attachment", "malware-sample", "url"],
"output": ["link"]} "output": ["link"]}
@ -16,12 +16,12 @@ def parse_config(apiurl, user_id, config):
error = {"error": "Please provide your AssemblyLine API key or Password."} error = {"error": "Please provide your AssemblyLine API key or Password."}
if config.get('apikey'): if config.get('apikey'):
try: try:
return Client(apiurl, apikey=(user_id, config['apikey'])) return Client(apiurl, apikey=(user_id, config['apikey']), verify=config['verifyssl'])
except ClientError as e: except ClientError as e:
error['error'] = f'Error while initiating a connection with AssemblyLine: {e.__str__()}' error['error'] = f'Error while initiating a connection with AssemblyLine: {e.__str__()}'
if config.get('password'): if config.get('password'):
try: try:
return Client(apiurl, auth=(user_id, config['password'])) return Client(apiurl, auth=(user_id, config['password']), verify=config['verifyssl'])
except ClientError as e: except ClientError as e:
error['error'] = f'Error while initiating a connection with AssemblyLine: {e.__str__()}' error['error'] = f'Error while initiating a connection with AssemblyLine: {e.__str__()}'
return error return error