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

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

pull/2754/head
iglocska 2017-12-20 09:36:16 +01:00
parent 53ff0b926b b2014d9320
commit bc6fae715f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/files/scripts/stix2/misp2stix2.py
View File

@ -46,6 +46,12 @@ def setIdentity(event, SDOs):
SDOs.append(identity)
return identity_id
def selectSDO(object_refs, attributes, attribute, identity):
if attribute.to_ids:
handleIndicatorAttribute(object_refs, attributes, attribute, identity)
else:
addObservedData(object_refs, attributes, attribute, identity)
def readAttributes(event, identity, object_refs, external_refs):
attributes = []
descFilename = os.path.join(pymisp.__path__[0], 'data/describeTypes.json')
@ -63,12 +69,12 @@ def readAttributes(event, identity, object_refs, external_refs):
else:
mapping = types['category_type_mappings']
if attr_type in mapping['Person']:
addIdentity(object_refs, attributes, attribute, identity, 'individual')
elif attr_type in mispTypesMapping:
if attribute.to_ids:
handleIndicatorAttribute(object_refs, attributes, attribute, identity)
if attribute.category == 'Person':
addIdentity(object_refs, attributes, attribute, identity, 'individual')
else:
addObservedData(object_refs, attributes, attribute, identity)
addCustomObject(object_refs, attributes, attribute, identity)
elif attr_type in mispTypesMapping:
selectSDO(object_refs, attributes, attribute, identity)
else:
addCustomObject(object_refs, attributes, attribute, identity)
galaxy = False