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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/3778/head
iglocska 2018-10-18 20:13:27 +02:00
parent e419c80e9e 91807f5052
commit 6b60f3fa5c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/files/scripts/stix2/stix2misp.py
View File

@ -108,6 +108,7 @@ class StixParser():
if object_type not in ('relationship', 'report'):
for _, _object in objects.items():
self.parsing_process(_object, object_type)
self.misp_event.info = "Imported with MISP import script for {}.".format(self.stix_version)
def set_distribution(self):
for attribute in self.misp_event.attributes:

2
app/files/scripts/stix2/stix2misp_mapping.py
View File

@ -299,7 +299,7 @@ domain_pattern_mapping = {'value': {'type': 'domain'}}
ip_pattern_mapping = {'value': {'type': 'ip-dst'}}
external_pattern_mapping = {'domain-name': domain_pattern_mapping,
'email-addr': {'value': {'type': 'email-dst'}}
'email-addr': {'value': {'type': 'email-dst'}},
'file': file_mapping,
'ipv4-addr': ip_pattern_mapping,
'ipv6-addr': ip_pattern_mapping,