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

add attributes within objects as well, for tagging via value/id/uuid

pull/189/head
Tobias Mainka 2018-02-16 18:35:45 +01:00
parent 9f453e98fa
commit 443acd9a47
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pymisp/mispevent.py
View File

@ -569,13 +569,14 @@ class MISPEvent(AbstractMISP):
:attribute_identifier: can be an ID, UUID, or the value. :attribute_identifier: can be an ID, UUID, or the value.
''' '''
attributes = [] attributes = []
for a in self.attributes: for a in self.attributes + [attribute for o in self.objects for attribute in o.attributes]:
if ((hasattr(a, 'id') and a.id == attribute_identifier) or if ((hasattr(a, 'id') and a.id == attribute_identifier) or
(hasattr(a, 'uuid') and a.uuid == attribute_identifier) or (hasattr(a, 'uuid') and a.uuid == attribute_identifier) or
(hasattr(a, 'value') and attribute_identifier == a.value or (hasattr(a, 'value') and attribute_identifier == a.value or
attribute_identifier in a.value.split('|'))): attribute_identifier in a.value.split('|'))):
a.add_tag(tag) a.add_tag(tag)
attributes.append(a) attributes.append(a)
if not attributes: if not attributes:
raise Exception('No attribute with identifier {} found.'.format(attribute_identifier)) raise Exception('No attribute with identifier {} found.'.format(attribute_identifier))
self.edited = True self.edited = True