From 2be90774c123a8ab4b573b2d6ef174896e655948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Fri, 15 Jun 2018 11:41:31 +0200 Subject: [PATCH] new: Load Org and Orgc as MISPOrganisation Related to #239 --- pymisp/mispevent.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pymisp/mispevent.py b/pymisp/mispevent.py index cd23c83..50d5271 100644 --- a/pymisp/mispevent.py +++ b/pymisp/mispevent.py @@ -371,6 +371,21 @@ class MISPEvent(AbstractMISP): def known_types(self): return self._types + @property + def org(self): + return self.Org + + @property + def orgc(self): + return self.Orgc + + @orgc.setter + def orgc(self, orgc): + if isinstance(orgc, MISPOrganisation): + self.Orgc = orgc + else: + raise PyMISPError('Orgc must be of type MISPOrganisation.') + @property def attributes(self): return self.Attribute @@ -516,6 +531,12 @@ class MISPEvent(AbstractMISP): if kwargs.get('Object'): for obj in kwargs.pop('Object'): self.add_object(obj) + if kwargs.get('Org'): + self.Org = MISPOrganisation() + self.Org.from_dict(**kwargs.pop('Org')) + if kwargs.get('Orgc'): + self.Orgc = MISPOrganisation() + self.Orgc.from_dict(**kwargs.pop('Orgc')) super(MISPEvent, self).from_dict(**kwargs)