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

Changed two fields in object references 

- source_uuid => object_uuid
- destination_uuid => referenced_uuid
pull/111/head
iglocska 2017-09-07 14:01:13 +02:00
parent b74e558f75
commit c15b82c45a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pymisp/data/misp-objects

@ -1 +1 @@
Subproject commit 0445ebd350900aaaebc47309800dbc156f697592 Subproject commit fc6d54f93b47d9c2ca951d68e568d1715e6eabf0

10
pymisp/mispevent.py
View File

@ -638,14 +638,14 @@ class MISPEvent(object):
class MISPObjectReference(AbstractMISP): class MISPObjectReference(AbstractMISP):
attributes = ['source_uuid', 'destination_uuid', 'relationship_type', 'comment', 'uuid', 'deleted'] attributes = ['source_uuid', 'referenced_uuid', 'relationship_type', 'comment', 'uuid', 'deleted']
def __init__(self): def __init__(self):
super(MISPObjectReference, self).__init__() super(MISPObjectReference, self).__init__()
def from_dict(self, source_uuid, destination_uuid, relationship_type, comment=None, **kwargs): def from_dict(self, source_uuid, referenced_uuid, relationship_type, comment=None, **kwargs):
self.source_uuid = source_uuid self.source_uuid = source_uuid
self.destination_uuid = destination_uuid self.referenced_uuid = referenced_uuid
self.relationship_type = relationship_type self.relationship_type = relationship_type
self.comment = comment self.comment = comment
for k, v in kwargs: for k, v in kwargs:
@ -772,7 +772,7 @@ class MISPObject(AbstractMISP):
raise InvalidMISPObject('{} is required'.format(r)) raise InvalidMISPObject('{} is required'.format(r))
return True return True
def add_reference(self, destination_uuid, relationship_type, comment=None, **kwargs): def add_reference(self, referenced_uuid, relationship_type, comment=None, **kwargs):
"""Add a link (uuid) to an other object""" """Add a link (uuid) to an other object"""
if kwargs.get('source_uuid'): if kwargs.get('source_uuid'):
# Load existing object # Load existing object
@ -781,7 +781,7 @@ class MISPObject(AbstractMISP):
# New reference # New reference
source_uuid = self.uuid source_uuid = self.uuid
reference = MISPObjectReference() reference = MISPObjectReference()
reference.from_dict(source_uuid=source_uuid, destination_uuid=destination_uuid, reference.from_dict(source_uuid=source_uuid, referenced_uuid=referenced_uuid,
relationship_type=relationship_type, comment=comment, **kwargs) relationship_type=relationship_type, comment=comment, **kwargs)
self.ObjectReference.append(reference) self.ObjectReference.append(reference)