From 4638a1558dc89508bde159e07579c2f1aff7b8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Sat, 9 Mar 2019 06:31:03 +0100 Subject: [PATCH] chg: Update API, bump misp-galaxy --- pymispgalaxies/api.py | 3 +++ pymispgalaxies/data/misp-galaxy | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pymispgalaxies/api.py b/pymispgalaxies/api.py index f3b8709..c8b3e88 100644 --- a/pymispgalaxies/api.py +++ b/pymispgalaxies/api.py @@ -51,6 +51,7 @@ class Galaxy(): self.version = self.galaxy['version'] self.uuid = self.galaxy['uuid'] self.namespace = self.galaxy.pop('namespace', None) + self.kill_chain_order = self.galaxy.pop('kill_chain_order', None) def to_json(self): return json.dumps(self, cls=EncodeGalaxies) @@ -60,6 +61,8 @@ class Galaxy(): 'version': self.version, 'uuid': self.uuid, 'icon': self.icon} if self.namespace: to_return['namespace'] = self.namespace + if self.kill_chain_order: + to_return['kill_chain_order'] = self.kill_chain_order return to_return diff --git a/pymispgalaxies/data/misp-galaxy b/pymispgalaxies/data/misp-galaxy index 769e000..4f3e633 160000 --- a/pymispgalaxies/data/misp-galaxy +++ b/pymispgalaxies/data/misp-galaxy @@ -1 +1 @@ -Subproject commit 769e0002ef792e9c1f8ddd671af8789abc848b18 +Subproject commit 4f3e6335b51df02c7d0950b9dfe325ab78ffc62e