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

chg: Update API, bump misp-galaxy

pull/5/head
Raphaël Vinot 2019-03-09 06:31:03 +01:00
parent 9eb55845e5
commit 4638a1558d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pymispgalaxies/api.py
View File

@ -51,6 +51,7 @@ class Galaxy():
self.version = self.galaxy['version'] self.version = self.galaxy['version']
self.uuid = self.galaxy['uuid'] self.uuid = self.galaxy['uuid']
self.namespace = self.galaxy.pop('namespace', None) self.namespace = self.galaxy.pop('namespace', None)
self.kill_chain_order = self.galaxy.pop('kill_chain_order', None)
def to_json(self): def to_json(self):
return json.dumps(self, cls=EncodeGalaxies) return json.dumps(self, cls=EncodeGalaxies)
@ -60,6 +61,8 @@ class Galaxy():
'version': self.version, 'uuid': self.uuid, 'icon': self.icon} 'version': self.version, 'uuid': self.uuid, 'icon': self.icon}
if self.namespace: if self.namespace:
to_return['namespace'] = self.namespace to_return['namespace'] = self.namespace
if self.kill_chain_order:
to_return['kill_chain_order'] = self.kill_chain_order
return to_return return to_return

2
pymispgalaxies/data/misp-galaxy

@ -1 +1 @@
Subproject commit 769e0002ef792e9c1f8ddd671af8789abc848b18 Subproject commit 4f3e6335b51df02c7d0950b9dfe325ab78ffc62e