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

Merge pull request #189 from neok0/master 

add attributes within objects as well, for tagging via value/id/uuid
pull/194/head
Raphaël Vinot 2018-02-19 11:49:50 +01:00 committed by GitHub
parent 00788848ef 443acd9a47
commit 62fb26fafd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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.
'''
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
(hasattr(a, 'uuid') and a.uuid == attribute_identifier) or
(hasattr(a, 'value') and attribute_identifier == a.value or
attribute_identifier in a.value.split('|'))):
a.add_tag(tag)
attributes.append(a)
if not attributes:
raise Exception('No attribute with identifier {} found.'.format(attribute_identifier))
self.edited = True