new: [fight] MITRE FiGHT Matrix fixes #986

.vscode/launch.json

@@ -5,46 +5,82 @@
             "name": "gen_gsma_motif",
             "type": "debugpy",
             "request": "launch",
-            "program": "${file}",
+            "program": "gen_gsma_motif.py",
             "console": "integratedTerminal",
             "args": "",
-            "cwd": "${fileDirname}"
+            "cwd": "${workspaceFolder}/tools"
         },
         {
             "name": "gen_mitre_d3fend",
             "type": "debugpy",
             "request": "launch",
-            "program": "${file}",
+            "program": "gen_mitre_d3fend.py",
             "console": "integratedTerminal",
             "args": "",
-            "cwd": "${fileDirname}"
+            "cwd": "${workspaceFolder}/tools"
         },
         {
-            "name": "gen_mitre",
+            "name": "gen_mitre_fight",
             "type": "debugpy",
             "request": "launch",
-            "program": "${file}",
+            "program": "gen_mitre_fight.py",
             "console": "integratedTerminal",
-            "args": "-p ../../MITRE-ATTACK",
-            "cwd": "${fileDirname}"
+            "args": "",
+            "cwd": "${workspaceFolder}/tools"
         },
         {
-            "name": "gen_interpol_dwvat",
+            "name": "gen_mitre_fight",
             "type": "debugpy",
             "request": "launch",
             "program": "${file}",
             "console": "integratedTerminal",
-            "args": "-p ../../DW-VA-Taxonomy",
+            "args": "",
             "cwd": "${fileDirname}"
         },
+        {
+            "name": "gen_mitre",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "gen_mitre.py",
+            "console": "integratedTerminal",
+            "args": "-p ../../MITRE-ATTACK",
+            "cwd": "${workspaceFolder}/tools"
+        },
         {
             "name": "gen_mitre_atlas",
             "type": "debugpy",
             "request": "launch",
-            "program": "${file}",
+            "program": "gen_mitre_atlas.py",
             "console": "integratedTerminal",
             "args": "-p ../../atlas-navigator-data",
-            "cwd": "${fileDirname}"
+            "cwd": "${workspaceFolder}/tools"
+        },
+        {
+            "name": "gen_ms_tmss",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "gen_ms_tmss.py",
+            "console": "integratedTerminal",
+            "args": "-p ../../Threat-matrix-for-storage-services",
+            "cwd": "${workspaceFolder}/tools"
+        },
+        {
+            "name": "gen_ms_atrm",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "gen_ms_atrm.py",
+            "console": "integratedTerminal",
+            "args": "-p ../../Azure-Threat-Research-Matrix",
+            "cwd": "${workspaceFolder}/tools"
+        },
+        {
+            "name": "gen_interpol_dwvat",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "gen_interpol_dwvat.py",
+            "console": "integratedTerminal",
+            "args": "-p ../../DW-VA-Taxonomy",
+            "cwd": "${workspaceFolder}/tools"
         },
         {
             "name": "Python Debugger: Current File",

README.md

@@ -31,7 +31,7 @@ Category: *actor* - source: *https://apt.360.net/aptlist* - total: *42* elements
 
 [Ammunitions](https://www.misp-galaxy.org/ammunitions) - Common ammunitions galaxy
 
-Category: *firearm* - source: *https://ammo.com/* - total: *410* elements
+Category: *firearm* - source: *https://ammo.com/* - total: *409* elements
 
 [[HTML](https://www.misp-galaxy.org/ammunitions)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/ammunitions.json)]
 
@@ -239,7 +239,7 @@ Category: *dwva* - source: *https://interpol-innovation-centre.github.io/DW-VA-T
 
 [Malpedia](https://www.misp-galaxy.org/malpedia) - Malware galaxy cluster based on Malpedia.
 
-Category: *tool* - source: *Malpedia* - total: *3039* elements
+Category: *tool* - source: *Malpedia* - total: *3038* elements
 
 [[HTML](https://www.misp-galaxy.org/malpedia)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/malpedia.json)]
 
@@ -387,6 +387,14 @@ Category: *tool* - source: *https://github.com/mitre/cti* - total: *87* elements
 
 [[HTML](https://www.misp-galaxy.org/mitre-tool)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/mitre-tool.json)]
 
+## NACE
+
+[NACE](https://www.misp-galaxy.org/nace) - version 2.1 - The Statistical Classification of Economic Activities in the European Community, commonly referred to as NACE (for the French term "nomenclature statistique des activités économiques dans la Communauté européenne"), is the industry standard classification system used in the European Union.
+
+Category: *sector* - source: *https://ec.europa.eu/eurostat/web/metadata/classifications* - total: *1047* elements
+
+[[HTML](https://www.misp-galaxy.org/nace)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/nace.json)]
+
 ## NAICS
 
 [NAICS](https://www.misp-galaxy.org/naics) - The North American Industry Classification System or NAICS is a classification of business establishments by type of economic activity (the process of production).
@@ -395,6 +403,54 @@ Category: *sector* - source: *North American Industry Classification System - NA
 
 [[HTML](https://www.misp-galaxy.org/naics)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/naics.json)]
 
+## NICE Competency areas
+
+[NICE Competency areas](https://www.misp-galaxy.org/nice-framework-competency_areas) - Competency areas based on the NIST NICE framework
+
+Category: *workforce* - source: *https://csrc.nist.gov/pubs/sp/800/181/r1/final* - total: *11* elements
+
+[[HTML](https://www.misp-galaxy.org/nice-framework-competency_areas)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/nice-framework-competency_areas.json)]
+
+## NICE Knowledges
+
+[NICE Knowledges](https://www.misp-galaxy.org/nice-framework-knowledges) - Knowledge based on the NIST NICE framework
+
+Category: *workforce* - source: *https://csrc.nist.gov/pubs/sp/800/181/r1/final* - total: *640* elements
+
+[[HTML](https://www.misp-galaxy.org/nice-framework-knowledges)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/nice-framework-knowledges.json)]
+
+## OPM codes in cybersecurity
+
+[OPM codes in cybersecurity](https://www.misp-galaxy.org/nice-framework-opm_codes) - Office of Personnel Management codes in cybersecurity
+
+Category: *workforce* - source: *https://dw.opm.gov/datastandards/referenceData/2273/current* - total: *52* elements
+
+[[HTML](https://www.misp-galaxy.org/nice-framework-opm_codes)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/nice-framework-opm_codes.json)]
+
+## NICE Skills
+
+[NICE Skills](https://www.misp-galaxy.org/nice-framework-skills) - Skills based on the NIST NICE framework
+
+Category: *workforce* - source: *https://csrc.nist.gov/pubs/sp/800/181/r1/final* - total: *556* elements
+
+[[HTML](https://www.misp-galaxy.org/nice-framework-skills)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/nice-framework-skills.json)]
+
+## NICE Tasks
+
+[NICE Tasks](https://www.misp-galaxy.org/nice-framework-tasks) - Tasks based on the NIST NICE framework
+
+Category: *workforce* - source: *https://csrc.nist.gov/pubs/sp/800/181/r1/final* - total: *1084* elements
+
+[[HTML](https://www.misp-galaxy.org/nice-framework-tasks)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/nice-framework-tasks.json)]
+
+## NICE Work Roles
+
+[NICE Work Roles](https://www.misp-galaxy.org/nice-framework-work_roles) - Work roles based on the NIST NICE framework
+
+Category: *workforce* - source: *https://csrc.nist.gov/pubs/sp/800/181/r1/final* - total: *52* elements
+
+[[HTML](https://www.misp-galaxy.org/nice-framework-work_roles)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/nice-framework-work_roles.json)]
+
 ## o365-exchange-techniques
 
 [o365-exchange-techniques](https://www.misp-galaxy.org/o365-exchange-techniques) - o365-exchange-techniques - Office365/Exchange related techniques by @johnLaTwC and @inversecos
@@ -423,23 +479,23 @@ Category: *measure* - source: *MISP Project* - total: *20* elements
 
 [Producer](https://www.misp-galaxy.org/producer) - List of threat intelligence producer from security vendors to CERTs including any producer of intelligence at large.
 
-Category: *actor* - source: *MISP Project* - total: *22* elements
+Category: *actor* - source: *MISP Project* - total: *33* elements
 
 [[HTML](https://www.misp-galaxy.org/producer)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/producer.json)]
 
 ## Ransomware
 
 [Ransomware](https://www.misp-galaxy.org/ransomware) - Ransomware galaxy based on https://docs.google.com/spreadsheets/d/1TWS238xacAto-fLKh1n5uTsdijWdCEsGIM0Y0Hvmc5g/pubhtml and http://pastebin.com/raw/GHgpWjar
 
-Category: *tool* - source: *Various* - total: *1777* elements
+Category: *tool* - source: *Various* - total: *1799* elements
 
 [[HTML](https://www.misp-galaxy.org/ransomware)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/ransomware.json)]
 
 ## RAT
 
 [RAT](https://www.misp-galaxy.org/rat) - remote administration tool or remote access tool (RAT), also called sometimes remote access trojan, is a piece of software or programming that allows a remote "operator" to control a system as if they have physical access to that system.
 
-Category: *tool* - source: *MISP Project* - total: *266* elements
+Category: *tool* - source: *MISP Project* - total: *265* elements
 
 [[HTML](https://www.misp-galaxy.org/rat)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/rat.json)]
 
@@ -471,7 +527,7 @@ Category: *sector* - source: *CERT-EU* - total: *118* elements
 
 [Sigma-Rules](https://www.misp-galaxy.org/sigma-rules) - MISP galaxy cluster based on Sigma Rules.
 
-Category: *rules* - source: *https://github.com/jstnk9/MISP/tree/main/misp-galaxy/sigma* - total: *2892* elements
+Category: *rules* - source: *https://github.com/jstnk9/MISP/tree/main/misp-galaxy/sigma* - total: *2924* elements
 
 [[HTML](https://www.misp-galaxy.org/sigma-rules)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/sigma-rules.json)]
 
@@ -535,7 +591,7 @@ Category: *tea-matrix* - source: ** - total: *7* elements
 
 [Threat Actor](https://www.misp-galaxy.org/threat-actor) - Known or estimated adversary groups targeting organizations and employees. Adversary groups are regularly confused with their initial operation or campaign. threat-actor-classification meta can be used to clarify the understanding of the threat-actor if also considered as operation, campaign or activity group.
 
-Category: *actor* - source: *MISP Project* - total: *686* elements
+Category: *actor* - source: *MISP Project* - total: *716* elements
 
 [[HTML](https://www.misp-galaxy.org/threat-actor)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/threat-actor.json)]
 
@@ -559,15 +615,15 @@ Category: *Threat Groups* - source: *https://app-api.tidalcyber.com/api/v1/group
 
 [Tidal References](https://www.misp-galaxy.org/tidal-references) - Tidal References Cluster
 
-Category: *References* - source: *https://app-api.tidalcyber.com/api/v1/references/* - total: *4104* elements
+Category: *References* - source: *https://app-api.tidalcyber.com/api/v1/references/* - total: *4261* elements
 
 [[HTML](https://www.misp-galaxy.org/tidal-references)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/tidal-references.json)]
 
 ## Tidal Software
 
 [Tidal Software](https://www.misp-galaxy.org/tidal-software) - Tidal Software Cluster
 
-Category: *Software* - source: *https://app-api.tidalcyber.com/api/v1/software/* - total: *961* elements
+Category: *Software* - source: *https://app-api.tidalcyber.com/api/v1/software/* - total: *1003* elements
 
 [[HTML](https://www.misp-galaxy.org/tidal-software)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/tidal-software.json)]
 
@@ -615,7 +671,7 @@ Category: *military equipment* - source: *Popular Mechanics* - total: *36* eleme
 
 [UKHSA Culture Collections](https://www.misp-galaxy.org/ukhsa-culture-collections) - UK Health Security Agency Culture Collections represent deposits of cultures that consist of expertly preserved, authenticated cell lines and microbial strains of known provenance.
 
-Category: *virus* - source: *https://www.culturecollections.org.uk* - total: *6667* elements
+Category: *virus* - source: *https://www.culturecollections.org.uk* - total: *6638* elements
 
 [[HTML](https://www.misp-galaxy.org/ukhsa-culture-collections)] - [[JSON](https://github.com/MISP/misp-galaxy/blob/main/clusters/ukhsa-culture-collections.json)]
 

clusters/ammunitions.json

@@ -3569,16 +3569,6 @@
       "uuid": "9aa0a1b7-c9ff-422c-9ef1-431459e1e1b9",
       "value": "PMC Bronze 44 Magnum Ammo - 500 Rounds of 180 Grain JHP Ammunition"
     },
-    {
-      "meta": {
-        "caliber": "X",
-        "description": "Tac 7.62x51mm Ammo",
-        "manufacturer": "PMC",
-        "name": "PMC X"
-      },
-      "uuid": "0dd1db3c-8d5d-4296-b780-ae5ac7a92fed",
-      "value": "PMC X - Tac 7.62x51mm Ammo"
-    },
     {
       "meta": {
         "caliber": "Bronze 308 Win Ammo",
@@ -4110,5 +4100,5 @@
       "value": "NobelSport High Brass Field 12 Gauge Ammo - 250 Rounds of 1"
     }
   ],
-  "version": 1
+  "version": 2
 }