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

Load RelatedEvent as MISPEvent. 

Fix #76
pull/41/head
Raphaël Vinot 2017-01-06 16:24:39 -05:00
parent 585ca9cd08
commit b2752bd8d5
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pymisp/mispevent.py
View File

@ -95,6 +95,9 @@ class MISPAttribute(object):
signed, _ = c.sign(to_sign, mode=mode.DETACH) signed, _ = c.sign(to_sign, mode=mode.DETACH)
self.sig = base64.b64encode(signed).decode() self.sig = base64.b64encode(signed).decode()
def delete(self):
self.deleted = True
def verify(self, gpg_uid): def verify(self, gpg_uid):
if not has_pyme: if not has_pyme:
raise Exception('pyme is required, please install: pip install --pre pyme3. You will also need libgpg-error-dev and libgpgme11-dev.') raise Exception('pyme is required, please install: pip install --pre pyme3. You will also need libgpg-error-dev and libgpgme11-dev.')
@ -460,7 +463,11 @@ class MISPEvent(object):
if kwargs.get('ShadowAttribute'): if kwargs.get('ShadowAttribute'):
self.ShadowAttribute = kwargs['ShadowAttribute'] self.ShadowAttribute = kwargs['ShadowAttribute']
if kwargs.get('RelatedEvent'): if kwargs.get('RelatedEvent'):
self.RelatedEvent = kwargs['RelatedEvent'] self.RelatedEvent = []
for rel_event in kwargs['RelatedEvent']:
sub_event = MISPEvent()
sub_event.load(rel_event)
self.RelatedEvent.append(sub_event)
if kwargs.get('Galaxy'): if kwargs.get('Galaxy'):
self.Galaxy = kwargs['Galaxy'] self.Galaxy = kwargs['Galaxy']
if kwargs.get('Tag'): if kwargs.get('Tag'):
@ -509,7 +516,9 @@ class MISPEvent(object):
if self.attribute_count is not None: if self.attribute_count is not None:
to_return['Event']['attribute_count'] = self.attribute_count to_return['Event']['attribute_count'] = self.attribute_count
if self.RelatedEvent: if self.RelatedEvent:
to_return['Event']['RelatedEvent'] = self.RelatedEvent to_return['Event']['RelatedEvent'] = []
for rel_event in self.RelatedEvent:
to_return['Event']['RelatedEvent'].append(rel_event._json_full())
if self.Org: if self.Org:
to_return['Event']['Org'] = self.Org to_return['Event']['Org'] = self.Org
if self.ShadowAttribute: if self.ShadowAttribute:
@ -538,7 +547,7 @@ class MISPEvent(object):
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 a.id == attribute_id or a.uuid == attribute_id:
a.deleted = True a.delete()
found = True found = True
break break
if not found: if not found: