mirror of https://github.com/MISP/PyMISP
parent
bb9976a062
commit
2be90774c1
|
@ -371,6 +371,21 @@ class MISPEvent(AbstractMISP):
|
||||||
def known_types(self):
|
def known_types(self):
|
||||||
return self._types
|
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
|
@property
|
||||||
def attributes(self):
|
def attributes(self):
|
||||||
return self.Attribute
|
return self.Attribute
|
||||||
|
@ -516,6 +531,12 @@ class MISPEvent(AbstractMISP):
|
||||||
if kwargs.get('Object'):
|
if kwargs.get('Object'):
|
||||||
for obj in kwargs.pop('Object'):
|
for obj in kwargs.pop('Object'):
|
||||||
self.add_object(obj)
|
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)
|
super(MISPEvent, self).from_dict(**kwargs)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue