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 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": [ 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..4f1e149d 100644 --- a/clusters/mitre-entreprise-attack-course-of-action.json +++ b/clusters/mitre-enterprise-attack-course-of-action.json @@ -1,8 +1,8 @@ { - "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, + "version": 2, "source": "https://github.com/mitre/cti", "uuid": "fb870a6a-1707-11e8-b548-17523e4d0670", "authors": [ 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..4444a393 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": [ 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": [ 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": [ 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": [ 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-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-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..80801302 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" } 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" } diff --git a/galaxies/mitre-enterprise-attack-relationship.json b/galaxies/mitre-enterprise-attack-relationship.json new file mode 100644 index 00000000..a017692f --- /dev/null +++ b/galaxies/mitre-enterprise-attack-relationship.json @@ -0,0 +1,8 @@ +{ + "name": "Enterprise Attack - Relationship", + "type": "mitre-enterprise-attack-relationship", + "description": "Mitre Relationship", + "uuid": "fc404638-1707-11e8-a5cf-b78b9b562766", + "version": 2, + "icon": "link" +} 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" } 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" -} 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" -} diff --git a/galaxies/mitre-entreprise-attack-relationship.json b/galaxies/mitre-entreprise-attack-relationship.json deleted file mode 100644 index 82584207..00000000 --- a/galaxies/mitre-entreprise-attack-relationship.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "Entreprise Attack - Relationship", - "type": "mitre-entreprise-attack-relationship", - "description": "Mitre Relationship", - "uuid": "fc404638-1707-11e8-a5cf-b78b9b562766", - "version": 1, - "icon": "link" -} 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) 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) 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) 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) 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) 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)