From bd23721e0a64db6da0434121604bc924351a39a6 Mon Sep 17 00:00:00 2001 From: Iglocska Date: Sun, 30 Oct 2016 16:58:37 +0100 Subject: [PATCH 1/5] Moving things around --- {elements => clusters}/adversary-groups.json | 0 elements/threat-actor-tools.json => clusters/tools.json | 0 {cluster => galaxies}/threat-actor.json | 0 {elements => vocabularies/common}/certainty-level.json | 0 .../threat-actor/intended-effect.json | 0 .../threat-actor/motivation.json | 0 .../threat-actor/planning-and-operational-support.json | 0 .../threat-actor/sophistication.json | 0 .../threat-actor/type.json | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename {elements => clusters}/adversary-groups.json (100%) rename elements/threat-actor-tools.json => clusters/tools.json (100%) rename {cluster => galaxies}/threat-actor.json (100%) rename {elements => vocabularies/common}/certainty-level.json (100%) rename elements/threat-actor-intended-effect-vocabulary.json => vocabularies/threat-actor/intended-effect.json (100%) rename elements/threat-actor-motivation-vocabulary.json => vocabularies/threat-actor/motivation.json (100%) rename elements/planning-and-operational-support-vocabulary.json => vocabularies/threat-actor/planning-and-operational-support.json (100%) rename elements/threat-actor-sophistication-vocabulary.json => vocabularies/threat-actor/sophistication.json (100%) rename elements/threat-actor-type-vocabulary.json => vocabularies/threat-actor/type.json (100%) diff --git a/elements/adversary-groups.json b/clusters/adversary-groups.json similarity index 100% rename from elements/adversary-groups.json rename to clusters/adversary-groups.json diff --git a/elements/threat-actor-tools.json b/clusters/tools.json similarity index 100% rename from elements/threat-actor-tools.json rename to clusters/tools.json diff --git a/cluster/threat-actor.json b/galaxies/threat-actor.json similarity index 100% rename from cluster/threat-actor.json rename to galaxies/threat-actor.json diff --git a/elements/certainty-level.json b/vocabularies/common/certainty-level.json similarity index 100% rename from elements/certainty-level.json rename to vocabularies/common/certainty-level.json diff --git a/elements/threat-actor-intended-effect-vocabulary.json b/vocabularies/threat-actor/intended-effect.json similarity index 100% rename from elements/threat-actor-intended-effect-vocabulary.json rename to vocabularies/threat-actor/intended-effect.json diff --git a/elements/threat-actor-motivation-vocabulary.json b/vocabularies/threat-actor/motivation.json similarity index 100% rename from elements/threat-actor-motivation-vocabulary.json rename to vocabularies/threat-actor/motivation.json diff --git a/elements/planning-and-operational-support-vocabulary.json b/vocabularies/threat-actor/planning-and-operational-support.json similarity index 100% rename from elements/planning-and-operational-support-vocabulary.json rename to vocabularies/threat-actor/planning-and-operational-support.json diff --git a/elements/threat-actor-sophistication-vocabulary.json b/vocabularies/threat-actor/sophistication.json similarity index 100% rename from elements/threat-actor-sophistication-vocabulary.json rename to vocabularies/threat-actor/sophistication.json diff --git a/elements/threat-actor-type-vocabulary.json b/vocabularies/threat-actor/type.json similarity index 100% rename from elements/threat-actor-type-vocabulary.json rename to vocabularies/threat-actor/type.json From 90e19ecbac7e7c9d8e88be3ba9cce762aa7341c0 Mon Sep 17 00:00:00 2001 From: Iglocska Date: Mon, 31 Oct 2016 09:33:41 +0100 Subject: [PATCH 2/5] Some small changes --- clusters/{adversary-groups.json => threat-actors.json} | 2 +- galaxies/threat-actor.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) rename clusters/{adversary-groups.json => threat-actors.json} (99%) diff --git a/clusters/adversary-groups.json b/clusters/threat-actors.json similarity index 99% rename from clusters/adversary-groups.json rename to clusters/threat-actors.json index d82d587..156a5b7 100644 --- a/clusters/adversary-groups.json +++ b/clusters/threat-actors.json @@ -9,7 +9,7 @@ "Timo Steffens", "Various" ], - "type": "Adversary Groups", + "type": "Threat Actors", "groups": [ "Operation C-Major", "Comment Crew", diff --git a/galaxies/threat-actor.json b/galaxies/threat-actor.json index c944a04..be3b9c8 100644 --- a/galaxies/threat-actor.json +++ b/galaxies/threat-actor.json @@ -1,7 +1,6 @@ { "name" : "threat actor", - "description": "threat actor cluster", + "description": "Threat actors are characterisations of malicios actors (or adversaries) representing a cyber attach threat including presumed intent and historically observed behaviour.", "version": 1, "uuid": "698774c7-8022-42c4-917f-8d6e4f06ada3", - "elementOneOf": ["adversary-groups", "threat-actor-intended-effect-vocabulary", "planning-and-operational-support-vocabulary", "threat-actor-motivation-vocabulary", "threat-actor-type-vocabulary", "threat-actor-sophistication-vocabulary", "certainty-level", "threat-actor-tools"] } From b6e1c478a7deeb6d8e44428d31336581ff417251 Mon Sep 17 00:00:00 2001 From: Iglocska Date: Mon, 31 Oct 2016 09:39:17 +0100 Subject: [PATCH 3/5] Some small fixes --- clusters/threat-actors.json | 2 +- galaxies/threat-actor.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clusters/threat-actors.json b/clusters/threat-actors.json index 156a5b7..11256c6 100644 --- a/clusters/threat-actors.json +++ b/clusters/threat-actors.json @@ -9,7 +9,7 @@ "Timo Steffens", "Various" ], - "type": "Threat Actors", + "type": "threat-actors", "groups": [ "Operation C-Major", "Comment Crew", diff --git a/galaxies/threat-actor.json b/galaxies/threat-actor.json index be3b9c8..05cfe23 100644 --- a/galaxies/threat-actor.json +++ b/galaxies/threat-actor.json @@ -1,6 +1,6 @@ { - "name" : "threat actor", + "name" : "threat-actor", "description": "Threat actors are characterisations of malicios actors (or adversaries) representing a cyber attach threat including presumed intent and historically observed behaviour.", "version": 1, - "uuid": "698774c7-8022-42c4-917f-8d6e4f06ada3", + "uuid": "698774c7-8022-42c4-917f-8d6e4f06ada3" } From d08497a1acc2bfdcee7b4b50008bef78f9906efd Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Mon, 31 Oct 2016 10:51:11 +0100 Subject: [PATCH 4/5] Typo fixed --- galaxies/threat-actor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxies/threat-actor.json b/galaxies/threat-actor.json index 05cfe23..be0e4cb 100644 --- a/galaxies/threat-actor.json +++ b/galaxies/threat-actor.json @@ -1,6 +1,6 @@ { "name" : "threat-actor", - "description": "Threat actors are characterisations of malicios actors (or adversaries) representing a cyber attach threat including presumed intent and historically observed behaviour.", + "description": "Threat actors are characteristics f malicious actors (or adversaries) representing a cyber attack threat including presumed intent and historically observed behaviour.", "version": 1, "uuid": "698774c7-8022-42c4-917f-8d6e4f06ada3" } From 0a9274830ff06990c8c923418585f354e44c78bb Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Mon, 31 Oct 2016 10:59:54 +0100 Subject: [PATCH 5/5] Typo fixed --- galaxies/threat-actor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxies/threat-actor.json b/galaxies/threat-actor.json index be0e4cb..454d41d 100644 --- a/galaxies/threat-actor.json +++ b/galaxies/threat-actor.json @@ -1,6 +1,6 @@ { "name" : "threat-actor", - "description": "Threat actors are characteristics f malicious actors (or adversaries) representing a cyber attack threat including presumed intent and historically observed behaviour.", + "description": "Threat actors are characteristics of malicious actors (or adversaries) representing a cyber attack threat including presumed intent and historically observed behaviour.", "version": 1, "uuid": "698774c7-8022-42c4-917f-8d6e4f06ada3" }