From 24930772c52e0459eb34c33cdb5d432371e03145 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 13:57:45 +0100 Subject: [PATCH 01/23] Update and rename mitre-entreprise-attack-attack-pattern.json to mitre-enterprise-attack-attack-pattern.json --- ...ern.json => mitre-enterprise-attack-attack-pattern.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename clusters/{mitre-entreprise-attack-attack-pattern.json => mitre-enterprise-attack-attack-pattern.json} (99%) diff --git a/clusters/mitre-entreprise-attack-attack-pattern.json b/clusters/mitre-enterprise-attack-attack-pattern.json similarity index 99% rename from clusters/mitre-entreprise-attack-attack-pattern.json rename to clusters/mitre-enterprise-attack-attack-pattern.json index 852086db..fd2cae4f 100644 --- a/clusters/mitre-entreprise-attack-attack-pattern.json +++ b/clusters/mitre-enterprise-attack-attack-pattern.json @@ -1,8 +1,8 @@ { - "name": "Entreprise Attack - Attack Pattern", - "type": "mitre-entreprise-attack-attack-pattern", + "name": "Enterprise Attack - Attack Pattern", + "type": "mitre-enterprise-attack-attack-pattern", "description": "ATT&CK tactic", - "version": 1, + "version": 2, "source": "https://github.com/mitre/cti", "uuid": "fb2242d8-1707-11e8-ab20-6fa7448c3640", "authors": [ From b619c8fc32cfa375898f9445e1e637799bd83c3d Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 13:58:39 +0100 Subject: [PATCH 02/23] Update and rename mitre-entreprise-attack-course-of-action.json to mitre-enterprise-attack-course-of-action.json --- ...ion.json => mitre-enterprise-attack-course-of-action.json} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename clusters/{mitre-entreprise-attack-course-of-action.json => mitre-enterprise-attack-course-of-action.json} (99%) diff --git a/clusters/mitre-entreprise-attack-course-of-action.json b/clusters/mitre-enterprise-attack-course-of-action.json similarity index 99% rename from clusters/mitre-entreprise-attack-course-of-action.json rename to clusters/mitre-enterprise-attack-course-of-action.json index 122bf7d6..5b7a0b11 100644 --- a/clusters/mitre-entreprise-attack-course-of-action.json +++ b/clusters/mitre-enterprise-attack-course-of-action.json @@ -1,6 +1,6 @@ { - "name": "Entreprise Attack - Course of Action", - "type": "mitre-entreprise-attack-course-of-action", + "name": "Enterprise Attack - Course of Action", + "type": "mitre-enterprise-attack-course-of-action", "description": "ATT&CK Mitigation", "version": 1, "source": "https://github.com/mitre/cti", From 36204644f15c8f0d0c88d592428ab2510e2382e9 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 13:59:42 +0100 Subject: [PATCH 03/23] Update mitre-enterprise-attack-course-of-action.json --- clusters/mitre-enterprise-attack-course-of-action.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusters/mitre-enterprise-attack-course-of-action.json b/clusters/mitre-enterprise-attack-course-of-action.json index 5b7a0b11..4f1e149d 100644 --- a/clusters/mitre-enterprise-attack-course-of-action.json +++ b/clusters/mitre-enterprise-attack-course-of-action.json @@ -2,7 +2,7 @@ "name": "Enterprise Attack - Course of Action", "type": "mitre-enterprise-attack-course-of-action", "description": "ATT&CK Mitigation", - "version": 1, + "version": 2, "source": "https://github.com/mitre/cti", "uuid": "fb870a6a-1707-11e8-b548-17523e4d0670", "authors": [ From b9aef43c73b183436d54f8f2c188ba59ccdef7b1 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:00:20 +0100 Subject: [PATCH 04/23] Update and rename mitre-entreprise-attack-intrusion-set.json to mitre-enterprise-attack-intrusion-set.json --- ...-set.json => mitre-enterprise-attack-intrusion-set.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename clusters/{mitre-entreprise-attack-intrusion-set.json => mitre-enterprise-attack-intrusion-set.json} (99%) diff --git a/clusters/mitre-entreprise-attack-intrusion-set.json b/clusters/mitre-enterprise-attack-intrusion-set.json similarity index 99% rename from clusters/mitre-entreprise-attack-intrusion-set.json rename to clusters/mitre-enterprise-attack-intrusion-set.json index 2e5f809c..16413ec2 100644 --- a/clusters/mitre-entreprise-attack-intrusion-set.json +++ b/clusters/mitre-enterprise-attack-intrusion-set.json @@ -1,8 +1,8 @@ { - "name": "Entreprise Attack -intrusion Set", - "type": "mitre-entreprise-attack-intrusion-set", + "name": "Enterprise Attack -intrusion Set", + "type": "mitre-enterprise-attack-intrusion-set", "description": "Name of ATT&CK Group", - "version": 1, + "version": 2, "source": "https://github.com/mitre/cti", "uuid": "01f18402-1708-11e8-ac1c-1ffb3c4a7775", "authors": [ From 9d612ba3d92c60f7aee749b4192df9493b59dcdb Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:01:27 +0100 Subject: [PATCH 05/23] Update and rename mitre-entreprise-attack-malware.json to mitre-enterprise-attack-malware.json --- ...ck-malware.json => mitre-enterprise-attack-malware.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename clusters/{mitre-entreprise-attack-malware.json => mitre-enterprise-attack-malware.json} (99%) diff --git a/clusters/mitre-entreprise-attack-malware.json b/clusters/mitre-enterprise-attack-malware.json similarity index 99% rename from clusters/mitre-entreprise-attack-malware.json rename to clusters/mitre-enterprise-attack-malware.json index fa4d0dd1..f82a6036 100644 --- a/clusters/mitre-entreprise-attack-malware.json +++ b/clusters/mitre-enterprise-attack-malware.json @@ -1,8 +1,8 @@ { - "name": "Entreprise Attack - Malware", - "type": "mitre-entreprise-attack-malware", + "name": "Enterprise Attack - Malware", + "type": "mitre-enterprise-attack-malware", "description": "Name of ATT&CK software", - "version": 1, + "version": 2, "source": "https://github.com/mitre/cti", "uuid": "fbd79f02-1707-11e8-b1c7-87406102276a", "authors": [ From a1daa975aa0b98bfc89377b04a67a5d1537102b4 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:02:30 +0100 Subject: [PATCH 06/23] Update and rename mitre-entreprise-attack-relationship.json to mitre-enterprise-attack-relationship.json --- ...nship.json => mitre-enterprise-attack-relationship.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename clusters/{mitre-entreprise-attack-relationship.json => mitre-enterprise-attack-relationship.json} (99%) diff --git a/clusters/mitre-entreprise-attack-relationship.json b/clusters/mitre-enterprise-attack-relationship.json similarity index 99% rename from clusters/mitre-entreprise-attack-relationship.json rename to clusters/mitre-enterprise-attack-relationship.json index 4a59f368..fb28815a 100644 --- a/clusters/mitre-entreprise-attack-relationship.json +++ b/clusters/mitre-enterprise-attack-relationship.json @@ -1,8 +1,8 @@ { - "name": "Entreprise Attack - Relationship", - "type": "mitre-entreprise-attack-relationship", + "name": "Enterprise Attack - Relationship", + "type": "mitre-enterprise-attack-relationship", "description": "MITRE Relationship", - "version": 1, + "version": 2, "source": "https://github.com/mitre/cti", "uuid": "fc605f90-1707-11e8-9d6a-9f165ac2ab5c", "authors": [ From 9add19ae7f5f26b6679542f26847654f66907eba Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:03:31 +0100 Subject: [PATCH 07/23] Update and rename mitre-entreprise-attack-tool.json to mitre-enterprise-attack-tool.json --- ...e-attack-tool.json => mitre-enterprise-attack-tool.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename clusters/{mitre-entreprise-attack-tool.json => mitre-enterprise-attack-tool.json} (99%) diff --git a/clusters/mitre-entreprise-attack-tool.json b/clusters/mitre-enterprise-attack-tool.json similarity index 99% rename from clusters/mitre-entreprise-attack-tool.json rename to clusters/mitre-enterprise-attack-tool.json index c282327f..e8664fb7 100644 --- a/clusters/mitre-entreprise-attack-tool.json +++ b/clusters/mitre-enterprise-attack-tool.json @@ -1,8 +1,8 @@ { - "name": "Entreprise Attack - Tool", - "type": "mitre-entreprise-attack-tool", + "name": "Enterprise Attack - Tool", + "type": "mitre-enterprise-attack-tool", "description": "Name of ATT&CK software", - "version": 1, + "version": 2, "source": "https://github.com/mitre/cti", "uuid": "fc1ea6e0-1707-11e8-ac05-2b70d00c354e", "authors": [ From a20413b1773594665efe9f0e2b725a02a8a798f6 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:04:33 +0100 Subject: [PATCH 08/23] Update and rename mitre-entreprise-attack-attack-pattern.json to mitre-enterprise-attack-attack-pattern.json --- galaxies/mitre-enterprise-attack-attack-pattern.json | 8 ++++++++ galaxies/mitre-entreprise-attack-attack-pattern.json | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 galaxies/mitre-enterprise-attack-attack-pattern.json delete mode 100644 galaxies/mitre-entreprise-attack-attack-pattern.json diff --git a/galaxies/mitre-enterprise-attack-attack-pattern.json b/galaxies/mitre-enterprise-attack-attack-pattern.json new file mode 100644 index 00000000..8ea9dd82 --- /dev/null +++ b/galaxies/mitre-enterprise-attack-attack-pattern.json @@ -0,0 +1,8 @@ +{ + "name": "Enterprise Attack - Attack Pattern", + "type": "mitre-enterprise-attack-attack-pattern", + "description": "ATT&CK Tactic", + "uuid": "fa7016a8-1707-11e8-82d0-1b73d76eb204", + "version": 2, + "icon": "map" +} diff --git a/galaxies/mitre-entreprise-attack-attack-pattern.json b/galaxies/mitre-entreprise-attack-attack-pattern.json deleted file mode 100644 index eca48d40..00000000 --- a/galaxies/mitre-entreprise-attack-attack-pattern.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "Entreprise Attack - Attack Pattern", - "type": "mitre-entreprise-attack-attack-pattern", - "description": "ATT&CK Tactic", - "uuid": "fa7016a8-1707-11e8-82d0-1b73d76eb204", - "version": 1, - "icon": "map" -} From b82efac9d56dc6b57c5ebcb0c69d57b59a1fc93e Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:05:07 +0100 Subject: [PATCH 09/23] Update and rename mitre-entreprise-attack-course-of-action.json to mitre-enterprise-attack-course-of-action.json --- galaxies/mitre-enterprise-attack-course-of-action.json | 8 ++++++++ galaxies/mitre-entreprise-attack-course-of-action.json | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 galaxies/mitre-enterprise-attack-course-of-action.json delete mode 100644 galaxies/mitre-entreprise-attack-course-of-action.json diff --git a/galaxies/mitre-enterprise-attack-course-of-action.json b/galaxies/mitre-enterprise-attack-course-of-action.json new file mode 100644 index 00000000..bc77e426 --- /dev/null +++ b/galaxies/mitre-enterprise-attack-course-of-action.json @@ -0,0 +1,8 @@ +{ + "name": "Enterprise Attack - Course of Action", + "type": "mitre-enterprise-attack-course-of-action", + "description": "ATT&CK Mitigation", + "uuid": "fb5a36c0-1707-11e8-81f5-d732b22a4982", + "version": 2, + "icon": "chain" +} diff --git a/galaxies/mitre-entreprise-attack-course-of-action.json b/galaxies/mitre-entreprise-attack-course-of-action.json deleted file mode 100644 index 4ca4a73e..00000000 --- a/galaxies/mitre-entreprise-attack-course-of-action.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "Entreprise Attack - Course of Action", - "type": "mitre-entreprise-attack-course-of-action", - "description": "ATT&CK Mitigation", - "uuid": "fb5a36c0-1707-11e8-81f5-d732b22a4982", - "version": 1, - "icon": "chain" -} From d51124b7eecd34dfb4bf5a69eb58ebd6970a05a5 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:05:40 +0100 Subject: [PATCH 10/23] Update and rename mitre-entreprise-attack-intrusion-set.json to mitre-enterprise-attack-intrusion-set.json --- ...-set.json => mitre-enterprise-attack-intrusion-set.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename galaxies/{mitre-entreprise-attack-intrusion-set.json => mitre-enterprise-attack-intrusion-set.json} (51%) diff --git a/galaxies/mitre-entreprise-attack-intrusion-set.json b/galaxies/mitre-enterprise-attack-intrusion-set.json similarity index 51% rename from galaxies/mitre-entreprise-attack-intrusion-set.json rename to galaxies/mitre-enterprise-attack-intrusion-set.json index 69f640fc..1f529cca 100644 --- a/galaxies/mitre-entreprise-attack-intrusion-set.json +++ b/galaxies/mitre-enterprise-attack-intrusion-set.json @@ -1,8 +1,8 @@ { - "name": "Entreprise Attack -Intrusion Set", - "type": "mitre-entreprise-attack-intrusion-set", + "name": "Enterprise Attack -Intrusion Set", + "type": "mitre-enterprise-attack-intrusion-set", "description": "Name of ATT&CK Group", "uuid": "1f3b8c56-1708-11e8-b211-17a60c0f73ee", - "version": 1, + "version": 2, "icon": "user-secret" } From 1df43affe204affa72f502c9fa61abe7f830732c Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:06:10 +0100 Subject: [PATCH 11/23] Update and rename mitre-entreprise-attack-malware.json to mitre-enterprise-attack-malware.json --- ...ck-malware.json => mitre-enterprise-attack-malware.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename galaxies/{mitre-entreprise-attack-malware.json => mitre-enterprise-attack-malware.json} (54%) diff --git a/galaxies/mitre-entreprise-attack-malware.json b/galaxies/mitre-enterprise-attack-malware.json similarity index 54% rename from galaxies/mitre-entreprise-attack-malware.json rename to galaxies/mitre-enterprise-attack-malware.json index 61e3464a..344a2b78 100644 --- a/galaxies/mitre-entreprise-attack-malware.json +++ b/galaxies/mitre-enterprise-attack-malware.json @@ -1,8 +1,8 @@ { - "name": "Entreprise Attack - Malware", - "type": "mitre-entreprise-attack-malware", + "name": "Enterprise Attack - Malware", + "type": "mitre-enterprise-attack-malware", "description": "Name of ATT&CK software", "uuid": "fbb19af0-1707-11e8-9fd6-dbd88a04d33a", - "version": 1, + "version": 2, "icon": "optin-monster" } From a3460716cba1bc18156471e4db0af677a61454ea Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:06:35 +0100 Subject: [PATCH 12/23] Update mitre-entreprise-attack-relationship.json --- galaxies/mitre-entreprise-attack-relationship.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/galaxies/mitre-entreprise-attack-relationship.json b/galaxies/mitre-entreprise-attack-relationship.json index 82584207..a017692f 100644 --- a/galaxies/mitre-entreprise-attack-relationship.json +++ b/galaxies/mitre-entreprise-attack-relationship.json @@ -1,8 +1,8 @@ { - "name": "Entreprise Attack - Relationship", - "type": "mitre-entreprise-attack-relationship", + "name": "Enterprise Attack - Relationship", + "type": "mitre-enterprise-attack-relationship", "description": "Mitre Relationship", "uuid": "fc404638-1707-11e8-a5cf-b78b9b562766", - "version": 1, + "version": 2, "icon": "link" } From 65f198fe81c14a82256dee6fc925492454644f41 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:07:04 +0100 Subject: [PATCH 13/23] Rename mitre-entreprise-attack-relationship.json to mitre-enterprise-attack-relationship.json --- ...elationship.json => mitre-enterprise-attack-relationship.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename galaxies/{mitre-entreprise-attack-relationship.json => mitre-enterprise-attack-relationship.json} (100%) diff --git a/galaxies/mitre-entreprise-attack-relationship.json b/galaxies/mitre-enterprise-attack-relationship.json similarity index 100% rename from galaxies/mitre-entreprise-attack-relationship.json rename to galaxies/mitre-enterprise-attack-relationship.json From 6a2be53649e620762a68b9cf978467f55a035045 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:07:34 +0100 Subject: [PATCH 14/23] Update and rename mitre-entreprise-attack-tool.json to mitre-enterprise-attack-tool.json --- ...e-attack-tool.json => mitre-enterprise-attack-tool.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename galaxies/{mitre-entreprise-attack-tool.json => mitre-enterprise-attack-tool.json} (54%) diff --git a/galaxies/mitre-entreprise-attack-tool.json b/galaxies/mitre-enterprise-attack-tool.json similarity index 54% rename from galaxies/mitre-entreprise-attack-tool.json rename to galaxies/mitre-enterprise-attack-tool.json index 34bbc451..e21e781b 100644 --- a/galaxies/mitre-entreprise-attack-tool.json +++ b/galaxies/mitre-enterprise-attack-tool.json @@ -1,8 +1,8 @@ { - "name": "Entreprise Attack - Tool", - "type": "mitre-entreprise-attack-tool", + "name": "Enterprise Attack - Tool", + "type": "mitre-enterprise-attack-tool", "description": "Name of ATT&CK software", "uuid": "fbfa0470-1707-11e8-be22-eb46b373fdd3", - "version": 1, + "version": 2, "icon": "gavel" } From d636ab8b3cbfd9e4edfbccab7fda2fb75b4ce986 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:10:37 +0100 Subject: [PATCH 15/23] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bff4da9c..0d0056c8 100644 --- a/README.md +++ b/README.md @@ -35,11 +35,11 @@ to localized information (which is not shared) or additional information (that c - [clusters/mitre-malware.json](clusters/mitre-malware.json) - Malware - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v1.0 - [clusters/mitre-tool.json](clusters/mitre-tool.json) - Tool - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v1.0 -- [clusters/mitre-entreprise-attack-attack-pattern.json](clusters/mitre-entreprise-attack-attack-pattern.json) - Attack Pattern - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Entreprise Attack -- [clusters/mitre-entreprise-attack-course-of-action.json](clusters/mitre-entreprise-attack-course-of-action.json) - Course of Action - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Entreprise Attack -- [clusters/mitre-entreprise-attack-intrusion-set.json](clusters/mitre-entreprise-attack-intrusion-set.json) - Intrusion Set - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Entreprise Attack - Malware - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Entreprise Attack -- [clusters/mitre-entreprise-attack-relationship.json](clusters/mitre-entreprise-attack-relationship.json) - Relationship . MITRE Relationship - V2.0 Entreprise Attack -- [clusters/mitre-entreprise-attack-tool.json](clusters/mitre-entreprise-attack-tool.json) - Tool - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Entreprise Attack +- [clusters/mitre-enterprise-attack-attack-pattern.json](clusters/mitre-enterprise-attack-attack-pattern.json) - Attack Pattern - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Enterprise Attack +- [clusters/mitre-enterprise-attack-course-of-action.json](clusters/mitre-enterprise-attack-course-of-action.json) - Course of Action - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Enterprise Attack +- [clusters/mitre-enterprise-attack-intrusion-set.json](clusters/mitre-enterprise-attack-intrusion-set.json) - Intrusion Set - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Enterprise Attack - Malware - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Enterprise Attack +- [clusters/mitre-enterprise-attack-relationship.json](clusters/mitre-enterprise-attack-relationship.json) - Relationship . MITRE Relationship - V2.0 Enterprise Attack +- [clusters/mitre-enterprise-attack-tool.json](clusters/mitre-enterprise-attack-tool.json) - Tool - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Enterprise Attack - [clusters/mitre-mobile-attack-attack-pattern.json](clusters/mitre-mobile-attack-attack-pattern.json) - Attack Pattern - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Mobile Attack - [clusters/mitre-mobile-attack-course-of-action.json](clusters/mitre-mobile-attack-course-of-action.json) - Course of Action - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Mobile Attack - [clusters/mitre-mobile-attack-intrusion-set.json](clusters/mitre-mobile-attack-intrusion-set.json) - Intrusion Set - MITRE Adversarial Tactics, Techniques & Common Knowledge (ATT&CK) - v2.0 Mobile Attack From a0eaf5bb32ae274a8c37e175372e8a8e7b8a0cfb Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:11:34 +0100 Subject: [PATCH 16/23] Update mitre-enterprise-attack-intrusion-set.json --- galaxies/mitre-enterprise-attack-intrusion-set.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxies/mitre-enterprise-attack-intrusion-set.json b/galaxies/mitre-enterprise-attack-intrusion-set.json index 1f529cca..80801302 100644 --- a/galaxies/mitre-enterprise-attack-intrusion-set.json +++ b/galaxies/mitre-enterprise-attack-intrusion-set.json @@ -1,5 +1,5 @@ { - "name": "Enterprise Attack -Intrusion Set", + "name": "Enterprise Attack - Intrusion Set", "type": "mitre-enterprise-attack-intrusion-set", "description": "Name of ATT&CK Group", "uuid": "1f3b8c56-1708-11e8-b211-17a60c0f73ee", From a600aae0101ce5feb0677a7278690fcb20610ced Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:15:06 +0100 Subject: [PATCH 17/23] Update create_mitre-enterprise-attack-attack-pattern_galaxy.py --- ...itre-enterprise-attack-attack-pattern_galaxy.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-attack-pattern_galaxy.py b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-attack-pattern_galaxy.py index 0d736ddd..fd669ebc 100644 --- a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-attack-pattern_galaxy.py +++ b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-attack-pattern_galaxy.py @@ -6,7 +6,7 @@ import re import os import argparse -parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s attack-patterns\nMust be in the mitre/cti/entreprise-attack/attack-pattern folder') +parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s attack-patterns\nMust be in the mitre/cti/enterprise-attack/attack-pattern folder') parser.add_argument("-v", "--version", type=int, required=True, help="Version of the galaxy. Please increment the previous one") args = parser.parse_args() @@ -36,16 +36,16 @@ for element in os.listdir('.'): value['uuid'] = re.search('--(.*)$', temp['id']).group(0)[2:] galaxy = {} -galaxy['name'] = "Entreprise Attack - Attack Pattern" -galaxy['type'] = "mitre-entreprise-attack-attack-pattern" +galaxy['name'] = "Enterprise Attack - Attack Pattern" +galaxy['type'] = "mitre-enterprise-attack-attack-pattern" galaxy['description'] = "ATT&CK Tactic" galaxy['uuid' ] = "fa7016a8-1707-11e8-82d0-1b73d76eb204" galaxy['version'] = args.version galaxy['icon'] = "map" cluster = {} -cluster['name'] = "Entreprise Attack - Attack Pattern" -cluster['type'] = "mitre-entreprise-attack-attack-pattern" +cluster['name'] = "Enterprise Attack - Attack Pattern" +cluster['type'] = "mitre-enterprise-attack-attack-pattern" cluster['description'] = "ATT&CK tactic" cluster['version'] = args.version cluster['source'] = "https://github.com/mitre/cti" @@ -53,8 +53,8 @@ cluster['uuid' ] = "fb2242d8-1707-11e8-ab20-6fa7448c3640" cluster['authors'] = ["MITRE"] cluster['values'] = values -with open('generate/galaxies/mitre-entreprise-attack-attack-pattern.json', 'w') as galaxy_file: +with open('generate/galaxies/mitre-enterprise-attack-attack-pattern.json', 'w') as galaxy_file: json.dump(galaxy, galaxy_file, indent=4) -with open('generate/clusters/mitre-entreprise-attack-attack-pattern.json', 'w') as cluster_file: +with open('generate/clusters/mitre-enterprise-attack-attack-pattern.json', 'w') as cluster_file: json.dump(cluster, cluster_file, indent=4) From 165c33410d7d649e5bd5fb38be8bd11df2e73d17 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:16:06 +0100 Subject: [PATCH 18/23] Update create_mitre-enterprise-attack-course-of-action_galaxy.py --- ...re-enterprise-attack-course-of-action_galaxy.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-course-of-action_galaxy.py b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-course-of-action_galaxy.py index b0e1e107..a80d4a8b 100644 --- a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-course-of-action_galaxy.py +++ b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-course-of-action_galaxy.py @@ -6,7 +6,7 @@ import re import os import argparse -parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s courses-of-action.\nMust be in the mitre/cti/entreprise-attack/course-of-action folder') +parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s courses-of-action.\nMust be in the mitre/cti/enterprise-attack/course-of-action folder') parser.add_argument("-v", "--version", type=int, required=True, help="Version of the galaxy. Please increment the previous one") args = parser.parse_args() @@ -27,16 +27,16 @@ for element in os.listdir('.'): values.append(value) galaxy = {} -galaxy['name'] = "Entreprise Attack - Course of Action" -galaxy['type'] = "mitre-entreprise-attack-course-of-action" +galaxy['name'] = "Enterprise Attack - Course of Action" +galaxy['type'] = "mitre-enterprise-attack-course-of-action" galaxy['description'] = "ATT&CK Mitigation" galaxy['uuid' ] = "fb5a36c0-1707-11e8-81f5-d732b22a4982" galaxy['version'] = args.version galaxy['icon'] = "chain" cluster = {} -cluster['name'] = "Entreprise Attack - Course of Action" -cluster['type'] = "mitre-entreprise-attack-course-of-action" +cluster['name'] = "Enterprise Attack - Course of Action" +cluster['type'] = "mitre-enterprise-attack-course-of-action" cluster['description'] = "ATT&CK Mitigation" cluster['version'] = args.version cluster['source'] = "https://github.com/mitre/cti" @@ -44,8 +44,8 @@ cluster['uuid' ] = "fb870a6a-1707-11e8-b548-17523e4d0670" cluster['authors'] = ["MITRE"] cluster['values'] = values -with open('generate/galaxies/mitre-entreprise-attack-course-of-action.json', 'w') as galaxy_file: +with open('generate/galaxies/mitre-enterprise-attack-course-of-action.json', 'w') as galaxy_file: json.dump(galaxy, galaxy_file, indent=4) -with open('generate/clusters/mitre-entreprise-attack-course-of-action.json', 'w') as cluster_file: +with open('generate/clusters/mitre-enterprise-attack-course-of-action.json', 'w') as cluster_file: json.dump(cluster, cluster_file, indent=4) From 00257d04fab0b914d53c05414398689044b96fff Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:17:50 +0100 Subject: [PATCH 19/23] Update create_mitre-enterprise-attack-intrusion-set_galaxy.py --- ...mitre-enterprise-attack-intrusion-set_galaxy.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-intrusion-set_galaxy.py b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-intrusion-set_galaxy.py index 805fe4a4..cee54e54 100644 --- a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-intrusion-set_galaxy.py +++ b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-intrusion-set_galaxy.py @@ -6,7 +6,7 @@ import re import os import argparse -parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s intrusion-sets\nMust be in the mitre/cti/entreprise-attack/intrusion-set folder') +parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s intrusion-sets\nMust be in the mitre/cti/enterprise-attack/intrusion-set folder') parser.add_argument("-v", "--version", type=int, required=True, help="Version of the galaxy. Please increment the previous one") args = parser.parse_args() @@ -33,16 +33,16 @@ for element in os.listdir('.'): values.append(value) galaxy = {} -galaxy['name'] = "Entreprise Attack -Intrusion Set" -galaxy['type'] = "mitre-entreprise-attack-intrusion-set" +galaxy['name'] = "Enterprise Attack -Intrusion Set" +galaxy['type'] = "mitre-enterprise-attack-intrusion-set" galaxy['description'] = "Name of ATT&CK Group" galaxy['uuid' ] = "1f3b8c56-1708-11e8-b211-17a60c0f73ee" galaxy['version'] = args.version galaxy['icon'] = "user-secret" cluster = {} -cluster['name'] = "Entreprise Attack -intrusion Set" -cluster['type'] = "mitre-entreprise-attack-intrusion-set" +cluster['name'] = "Enterprise Attack -intrusion Set" +cluster['type'] = "mitre-enterprise-attack-intrusion-set" cluster['description'] = "Name of ATT&CK Group" cluster['version'] = args.version cluster['source'] = "https://github.com/mitre/cti" @@ -50,8 +50,8 @@ cluster['uuid' ] = "01f18402-1708-11e8-ac1c-1ffb3c4a7775" cluster['authors'] = ["MITRE"] cluster['values'] = values -with open('generate/galaxies/mitre-entreprise-attack-intrusion-set.json', 'w') as galaxy_file: +with open('generate/galaxies/mitre-enterprise-attack-intrusion-set.json', 'w') as galaxy_file: json.dump(galaxy, galaxy_file, indent=4) -with open('generate/clusters/mitre-entreprise-attack-intrusion-set.json', 'w') as cluster_file: +with open('generate/clusters/mitre-enterprise-attack-intrusion-set.json', 'w') as cluster_file: json.dump(cluster, cluster_file, indent=4) From 24c4ecf87c6fa36e61258aecf3b7aaa81717c99d Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:19:08 +0100 Subject: [PATCH 20/23] Update create_mitre-enterprise-attack-malware_galaxy.py --- ...reate_mitre-enterprise-attack-malware_galaxy.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-malware_galaxy.py b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-malware_galaxy.py index 3f005382..eb4bd8f1 100644 --- a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-malware_galaxy.py +++ b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-malware_galaxy.py @@ -6,7 +6,7 @@ import re import os import argparse -parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s malwares\nMust be in the mitre/cti/entreprise-attack/malware folder') +parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s malwares\nMust be in the mitre/cti/enterprise-attack/malware folder') parser.add_argument("-v", "--version", type=int, required=True, help="Version of the galaxy. Please increment the previous one") args = parser.parse_args() @@ -34,16 +34,16 @@ for element in os.listdir('.'): values.append(value) galaxy = {} -galaxy['name'] = "Entreprise Attack - Malware" -galaxy['type'] = "mitre-entreprise-attack-malware" +galaxy['name'] = "Enterprise Attack - Malware" +galaxy['type'] = "mitre-enterprise-attack-malware" galaxy['description'] = "Name of ATT&CK software" galaxy['uuid' ] = "fbb19af0-1707-11e8-9fd6-dbd88a04d33a" galaxy['version'] = args.version galaxy['icon'] = "optin-monster" cluster = {} -cluster['name'] = "Entreprise Attack - Malware" -cluster['type'] = "mitre-entreprise-attack-malware" +cluster['name'] = "Enterprise Attack - Malware" +cluster['type'] = "mitre-enterprise-attack-malware" cluster['description'] = "Name of ATT&CK software" cluster['version'] = args.version cluster['source'] = "https://github.com/mitre/cti" @@ -51,8 +51,8 @@ cluster['uuid' ] = "fbd79f02-1707-11e8-b1c7-87406102276a" cluster['authors'] = ["MITRE"] cluster['values'] = values -with open('generate/galaxies/mitre-entreprise-attack-malware.json', 'w') as galaxy_file: +with open('generate/galaxies/mitre-enterprise-attack-malware.json', 'w') as galaxy_file: json.dump(galaxy, galaxy_file, indent=4) -with open('generate/clusters/mitre-entreprise-attack-malware.json', 'w') as cluster_file: +with open('generate/clusters/mitre-enterprise-attack-malware.json', 'w') as cluster_file: json.dump(cluster, cluster_file, indent=4) From 9f98a475fdb50a31a5cc996f929217578d77eb0c Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:20:11 +0100 Subject: [PATCH 21/23] Update create_mitre-enterprise-attack-relationship_galaxy.py --- ..._mitre-enterprise-attack-relationship_galaxy.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-relationship_galaxy.py b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-relationship_galaxy.py index 7870f2d4..0bb0db82 100644 --- a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-relationship_galaxy.py +++ b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-relationship_galaxy.py @@ -6,7 +6,7 @@ import re import os import argparse -parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s relationship\nMust be in the mitre/cti/entreprise-attack/relationship folder') +parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s relationship\nMust be in the mitre/cti/enterprise-attack/relationship folder') parser.add_argument("-v", "--version", type=int, required=True, help="Version of the galaxy. Please increment the previous one") args = parser.parse_args() @@ -76,16 +76,16 @@ for element in os.listdir(path): values.append(value) galaxy = {} -galaxy['name'] = "Entreprise Attack - Relationship" -galaxy['type'] = "mitre-entreprise-attack-relationship" +galaxy['name'] = "Enterprise Attack - Relationship" +galaxy['type'] = "mitre-enterprise-attack-relationship" galaxy['description'] = "Mitre Relationship" galaxy['uuid' ] = "fc404638-1707-11e8-a5cf-b78b9b562766" galaxy['version'] = args.version galaxy['icon'] = "link" cluster = {} -cluster['name'] = "Entreprise Attack - Relationship" -cluster['type'] = "mitre-entreprise-attack-relationship" +cluster['name'] = "Enterprise Attack - Relationship" +cluster['type'] = "mitre-enterprise-attack-relationship" cluster['description'] = "MITRE Relationship" cluster['version'] = args.version cluster['source'] = "https://github.com/mitre/cti" @@ -93,8 +93,8 @@ cluster['uuid' ] = "fc605f90-1707-11e8-9d6a-9f165ac2ab5c" cluster['authors'] = ["MITRE"] cluster['values'] = values -with open('generate/galaxies/mitre-entreprise-attack-relationship.json', 'w') as galaxy_file: +with open('generate/galaxies/mitre-enterprise-attack-relationship.json', 'w') as galaxy_file: json.dump(galaxy, galaxy_file, indent=4) -with open('generate/clusters/mitre-entreprise-attack-relationship.json', 'w') as cluster_file: +with open('generate/clusters/mitre-enterprise-attack-relationship.json', 'w') as cluster_file: json.dump(cluster, cluster_file, indent=4) From 190efe7497273b2448c52ab77b730a1aaadcc8ad Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:20:59 +0100 Subject: [PATCH 22/23] Update create_mitre-enterprise-attack-tool_galaxy.py --- .../create_mitre-enterprise-attack-tool_galaxy.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-tool_galaxy.py b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-tool_galaxy.py index 65ea6bb6..286d6e64 100644 --- a/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-tool_galaxy.py +++ b/tools/mitre-cti/v2.0/create_mitre-enterprise-attack-tool_galaxy.py @@ -6,7 +6,7 @@ import re import os import argparse -parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s tools\nMust be in the mitre/cti/entreprise-attack/tool folder') +parser = argparse.ArgumentParser(description='Create a couple galaxy/cluster with cti\'s tools\nMust be in the mitre/cti/enterprise-attack/tool folder') parser.add_argument("-v", "--version", type=int, required=True, help="Version of the galaxy. Please increment the previous one") args = parser.parse_args() @@ -34,16 +34,16 @@ for element in os.listdir('.'): values.append(value) galaxy = {} -galaxy['name'] = "Entreprise Attack - Tool" -galaxy['type'] = "mitre-entreprise-attack-tool" +galaxy['name'] = "Enterprise Attack - Tool" +galaxy['type'] = "mitre-enterprise-attack-tool" galaxy['description'] = "Name of ATT&CK software" galaxy['uuid' ] = "fbfa0470-1707-11e8-be22-eb46b373fdd3" galaxy['version'] = args.version galaxy['icon'] = "gavel" cluster = {} -cluster['name'] = "Entreprise Attack - Tool" -cluster['type'] = "mitre-entreprise-attack-tool" +cluster['name'] = "Enterprise Attack - Tool" +cluster['type'] = "mitre-enterprise-attack-tool" cluster['description'] = "Name of ATT&CK software" cluster['version'] = args.version cluster['source'] = "https://github.com/mitre/cti" @@ -51,8 +51,8 @@ cluster['uuid' ] = "fc1ea6e0-1707-11e8-ac05-2b70d00c354e" cluster['authors'] = ["MITRE"] cluster['values'] = values -with open('generate/galaxies/mitre-entreprise-attack-tool.json', 'w') as galaxy_file: +with open('generate/galaxies/mitre-enterprise-attack-tool.json', 'w') as galaxy_file: json.dump(galaxy, galaxy_file, indent=4) -with open('generate/clusters/mitre-entreprise-attack-tool.json', 'w') as cluster_file: +with open('generate/clusters/mitre-enterprise-attack-tool.json', 'w') as cluster_file: json.dump(cluster, cluster_file, indent=4) From cdf5344719c3b7ef3e934deb34fb9b2bdc76e9ef Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Thu, 22 Mar 2018 14:32:59 +0100 Subject: [PATCH 23/23] Update mitre-enterprise-attack-intrusion-set.json --- clusters/mitre-enterprise-attack-intrusion-set.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusters/mitre-enterprise-attack-intrusion-set.json b/clusters/mitre-enterprise-attack-intrusion-set.json index 16413ec2..4444a393 100644 --- a/clusters/mitre-enterprise-attack-intrusion-set.json +++ b/clusters/mitre-enterprise-attack-intrusion-set.json @@ -1,5 +1,5 @@ { - "name": "Enterprise Attack -intrusion Set", + "name": "Enterprise Attack - Intrusion Set", "type": "mitre-enterprise-attack-intrusion-set", "description": "Name of ATT&CK Group", "version": 2,