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

fix: Allow again to tag/delete unsaved attributes

pull/120/head
Raphaël Vinot 2017-09-26 10:52:38 +01:00
parent d1fbabdaab
commit 6d2576be0a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pymisp/mispevent.py
View File

@ -514,15 +514,17 @@ class MISPEvent(AbstractMISP):
self.Tag.append({'name': tag}) self.Tag.append({'name': tag})
def add_attribute_tag(self, tag, attribute_identifier): def add_attribute_tag(self, tag, attribute_identifier):
attribute = None attributes = []
for a in self.attributes: for a in self.attributes:
if (a.id == attribute_identifier or a.uuid == attribute_identifier or if ((hasattr(a, 'id') and a.id == attribute_identifier) or
attribute_identifier == a.value or attribute_identifier in a.value.split('|')): (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) a.add_tag(tag)
attribute = a attributes.append(a)
if not attribute: if not attributes:
raise Exception('No attribute with identifier {} found.'.format(attribute_identifier)) raise Exception('No attribute with identifier {} found.'.format(attribute_identifier))
return attribute return attributes
def publish(self): def publish(self):
self.published = True self.published = True
@ -533,7 +535,8 @@ class MISPEvent(AbstractMISP):
def delete_attribute(self, attribute_id): def delete_attribute(self, attribute_id):
found = False found = False
for a in self.attributes: for a in self.attributes:
if a.id == attribute_id or a.uuid == attribute_id: if ((hasattr(a, 'id') and a.id == attribute_id) or
(hasattr(a, 'uuid') and a.uuid == attribute_id)):
a.delete() a.delete()
found = True found = True
break break