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

Support for expanded namespace added

pull/8/head
Alexandre Dulaunoy 2016-01-10 17:03:44 +01:00
parent ad11b8b225
commit b0a9e8a2af
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/machinetag.py
View File

@ -79,6 +79,10 @@ for taxonomy in taxonomies:
with open(filename) as fp: with open(filename) as fp:
t = json.load(fp) t = json.load(fp)
namespace = t['namespace'] namespace = t['namespace']
if t.get('expanded'):
expanded_namespace = t['expanded']
else:
expanded_namespace = namespace
if args.a: if args.a:
doc = asciidoc(content=t['namespace'], adoc=doc, t='namespace') doc = asciidoc(content=t['namespace'], adoc=doc, t='namespace')
doc = asciidoc(content=t['description'], adoc=doc, t='description') doc = asciidoc(content=t['description'], adoc=doc, t='description')
@ -96,7 +100,7 @@ for taxonomy in taxonomies:
else: else:
print (machineTag(namespace=namespace, predicate=predicate['value'])) print (machineTag(namespace=namespace, predicate=predicate['value']))
if args.e: if args.e:
print ("--> " + machineTag(namespace=namespace, predicate=predicate['expanded'])) print ("--> " + machineTag(namespace=expanded_namespace, predicate=predicate['expanded']))
if predicate.get('description'): if predicate.get('description'):
print ("--> " + predicate['description']) print ("--> " + predicate['description'])
else: else: