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

Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server

pull/82/head
George Haraksin 2020-05-14 16:33:43 -07:00
parent 0303688af3 4d9f63522b
commit 4db2a43e6d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misp_taxii_hooks/hooks.py
View File

@ -131,6 +131,8 @@ def post_stix(manager, content_block, collection_ids, service_id):
log.info("%s is unique, we'll keep it", attrib) log.info("%s is unique, we'll keep it", attrib)
else: else:
log.error("Something went wrong with search, and it doesn't have an 'attribute' or a 'response' key: {}".format(search.keys())) log.error("Something went wrong with search, and it doesn't have an 'attribute' or a 'response' key: {}".format(search.keys()))
else:
log.info("Skipping deduplication")
# Push the event to MISP # Push the event to MISP
# TODO: There's probably a proper method to do this rather than json_full # TODO: There's probably a proper method to do this rather than json_full
@ -139,10 +141,10 @@ def post_stix(manager, content_block, collection_ids, service_id):
log.info("Uploading event to MISP with attributes %s", [x.value for x in package.attributes]) log.info("Uploading event to MISP with attributes %s", [x.value for x in package.attributes])
event = MISP.add_event(package) event = MISP.add_event(package)
if ( if (
CONFIG["misp"]["publish"] or CONFIG["misp"]["publish"] == True or
CONFIG["misp"]["publish"] == "True" CONFIG["misp"]["publish"] == "True"
): ):
log.info("Publishing event to MISP with ID {}".format(event['id'])) log.info("Publishing event to MISP with ID {}".format(event.get('uuid')))
MISP.publish(event) MISP.publish(event)
else: else:
log.info("No attributes, not bothering.") log.info("No attributes, not bothering.")