MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #225 from emmanvg/memory-datastore-fix 

Memory datastore fix
master
Chris Lenk 2018-11-14 15:53:03 -05:00 committed by GitHub
parent de73935d2a 51df054f33
commit 28d069a7f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
stix2/datastore/memory.py
View File

@ -44,14 +44,14 @@ def _add(store, stix_data=None, allow_custom=True, version=None):
# Map ID directly to the object, if it is a marking. Otherwise, # Map ID directly to the object, if it is a marking. Otherwise,
# map to a family, so we can track multiple versions. # map to a family, so we can track multiple versions.
if _is_marking(stix_obj): if _is_marking(stix_obj):
store._data[stix_obj.id] = stix_obj store._data[stix_obj["id"]] = stix_obj
else: else:
if stix_obj.id in store._data: if stix_obj["id"] in store._data:
obj_family = store._data[stix_obj.id] obj_family = store._data[stix_obj["id"]]
else: else:
obj_family = _ObjectFamily() obj_family = _ObjectFamily()
store._data[stix_obj.id] = obj_family store._data[stix_obj["id"]] = obj_family
obj_family.add(stix_obj) obj_family.add(stix_obj)
@ -64,8 +64,8 @@ def _is_marking(obj_or_id):
:return: True if a marking definition, False otherwise. :return: True if a marking definition, False otherwise.
""" """
if isinstance(obj_or_id, _STIXBase): if isinstance(obj_or_id, (_STIXBase, dict)):
id_ = obj_or_id.id id_ = obj_or_id["id"]
else: else:
id_ = obj_or_id id_ = obj_or_id
@ -84,14 +84,14 @@ class _ObjectFamily(object):
self.latest_version = None self.latest_version = None
def add(self, obj): def add(self, obj):
self.all_versions[obj.modified] = obj self.all_versions[obj["modified"]] = obj
if self.latest_version is None or \ if self.latest_version is None or \
obj.modified > self.latest_version.modified: obj["modified"] > self.latest_version["modified"]:
self.latest_version = obj self.latest_version = obj
def __str__(self): def __str__(self):
return "<<{}; latest={}>>".format(self.all_versions, return "<<{}; latest={}>>".format(self.all_versions,
self.latest_version.modified) self.latest_version["modified"])
def __repr__(self): def __repr__(self):
return str(self) return str(self)