Merge branch 'master' of github.com:MISP/misp-taxonomies

euci/machinetag.json

@@ -23,5 +23,6 @@
       "expanded": "RESTREINT UE/EU RESTRICTED",
       "description": "Information and material the unauthorised disclosure of which could be disadvantageous to the interests of the European Union or of one or more of the Member States."
     }
-  ]
+  ],
+  "values": null
 }

kill-chain/machinetag.json

@@ -32,5 +32,6 @@
       "value": "Actions on Objectives",
       "expanded": "Only now, after progressing through the first six phases, can intruders take actions to achieve their original objectives. Typically, this objective is data exfiltration which involves collecting, encrypting and extracting information from the victim environment; violations of data integrity or availability are potential objectives as well. Alternatively, the intruders may only desire access to the initial victim box for use as a hop point to compromise additional systems and move laterally inside the network."
     }
-  ]
+  ],
+  "values": null
 }

tools/machinetag.py

@@ -29,8 +29,12 @@
 import json
 import os.path
 import argparse
+import os
 
-taxonomies = ['admiralty-scale', 'adversary', 'tlp', 'circl', 'iep', 'kill-chain', 'veris', 'ecsirt', 'enisa', 'dni-ism', 'europol-events', 'europol-incident', 'nato', 'euci', 'osint', 'csirt_case_classification', 'malware_classification', 'de-vs', 'fr-classif','eu-critical-sectors','dhs-ciip-sectors','estimative-language', 'ms-caro-malware', 'information-security-indicators', 'open-threat', 'misp', 'domain-abuse']
+taxonomies = []
+for folder in os.listdir('../'):
+    if os.path.isfile(os.path.join('../', folder, 'machinetag.json')):
+        taxonomies.append(folder)
 argParser = argparse.ArgumentParser(description='Dump Machine Tags (Triple Tags) from MISP taxonomies', epilog='Available taxonomies are {0}'.format(taxonomies))
 argParser.add_argument('-e', action='store_true', help='Include expanded tags')
 argParser.add_argument('-a', action='store_true', help='Generate asciidoctor document from MISP taxonomies')