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

fix: Using to_dict on attributes & objects instead of to_json to make json_decode happy in the core part

pull/304/head
chrisr3d 2019-03-14 14:31:38 +01:00
parent 9c8ee1f3d7
commit 62bc45e03a
No known key found for this signature in database
GPG Key ID: 6BBED1B63A6D639F
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/urlhaus.py
View File

@ -58,7 +58,7 @@ def _query_host_api(attribute):
attributes = [] attributes = []
if 'urls' in response and response['urls']: if 'urls' in response and response['urls']:
for url in response['urls']: for url in response['urls']:
attributes.append(_create_url_attribute(url['url']).to_json()) attributes.append(_create_url_attribute(url['url']).to_dict())
return {'results': {'Attribute': attributes}} return {'results': {'Attribute': attributes}}
@ -78,9 +78,9 @@ def _query_payload_api(attribute):
file_object.add_attribute('filename', **{'type': 'filename', 'value': filename}) file_object.add_attribute('filename', **{'type': 'filename', 'value': filename})
for url in urls: for url in urls:
attribute = _create_url_attribute(url) attribute = _create_url_attribute(url)
results['Attribute'].append(attribute.to_json()) results['Attribute'].append(attribute.to_dict())
file_object.add_reference(attribute.uuid, 'retrieved-from') file_object.add_reference(attribute.uuid, 'retrieved-from')
results['Object'].append(file_object.to_json()) results['Object'].append(file_object.to_dict())
return {'results': results} return {'results': results}
@ -108,7 +108,7 @@ def _query_url_api(attribute):
object_score += 2 object_score += 2
args.append(vt_attributes) args.append(vt_attributes)
try: try:
results['Object'].extend([misp_object.to_json() for misp_object in objects_mapping[object_score](*args)]) results['Object'].extend([misp_object.to_dict() for misp_object in objects_mapping[object_score](*args)])
except KeyError: except KeyError:
continue continue
return {'results': results} return {'results': results}