-
Notifications
You must be signed in to change notification settings - Fork 730
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ChangeLog at: https://github.com/mitre/caldera/releases/tag/5.0.0
- Loading branch information
Showing
11 changed files
with
353 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,37 @@ | ||
| TIMESTAMP = 1687320760 | ||
| SHA256 (mitre-caldera-4.2.0_GH0.tar.gz) = 2c93501ca05fe89cd18a038376c278e50d371881dfe84824a0f98dc3d9023fd9 | ||
| SIZE (mitre-caldera-4.2.0_GH0.tar.gz) = 3777586 | ||
| SHA256 (mitre-access-0e67776_GH0.tar.gz) = dc80b9c5cb92f75fa6d18f618f64a4d3c5ddd1b08b020d86feb70fbaa0f4c43d | ||
| SIZE (mitre-access-0e67776_GH0.tar.gz) = 8494 | ||
| SHA256 (mitre-atomic-9e2c958_GH0.tar.gz) = 0fbd0c3bb2c3c621afcb8f271b76df0f6ac2bacd72a7f8d9771c94b9a3f5d085 | ||
| SIZE (mitre-atomic-9e2c958_GH0.tar.gz) = 15142 | ||
| SHA256 (mitre-builder-f2ce67c_GH0.tar.gz) = da9d987a2a656bb9eb5d1c0d36115c8fb8fe740503fa1a43a1bfcce1018f461b | ||
| SIZE (mitre-builder-f2ce67c_GH0.tar.gz) = 7944 | ||
| SHA256 (mitre-compass-fb88e02_GH0.tar.gz) = 6187446551f4041ac0a0c33689b4a62a39a02b285d988bd6f17647d89d98ce16 | ||
| SIZE (mitre-compass-fb88e02_GH0.tar.gz) = 5907 | ||
| SHA256 (mitre-debrief-e4d4f9e_GH0.tar.gz) = 721b262744118b91b812ec0e098fa0c75f845a7814d8fa58fa52a2ace04432ee | ||
| SIZE (mitre-debrief-e4d4f9e_GH0.tar.gz) = 998929 | ||
| SHA256 (mitre-emu-02a0f3e_GH0.tar.gz) = 9dd6b46fe93ba12467612e4bf4a45df5513dad1709a72addc3898c430b8ec1ad | ||
| SIZE (mitre-emu-02a0f3e_GH0.tar.gz) = 17467 | ||
| SHA256 (mitre-fieldmanual-c286e77_GH0.tar.gz) = 6f086d0d4f519d0dcf49fbded87ee8095622c3028461d745d2e7eea422d68d57 | ||
| SIZE (mitre-fieldmanual-c286e77_GH0.tar.gz) = 7828491 | ||
| SHA256 (mitre-gameboard-3d98c32_GH0.tar.gz) = 8415bbbc64fe78836afea2e364fe655cc364a5d70dcf3fbcb748617fc9b9ad0a | ||
| SIZE (mitre-gameboard-3d98c32_GH0.tar.gz) = 14753 | ||
| SHA256 (mitre-human-4368dea_GH0.tar.gz) = 4710f3d6c7b3f728274187c36cda53232b3609d8177ccad6b1968ae99d83724a | ||
| SIZE (mitre-human-4368dea_GH0.tar.gz) = 22846 | ||
| SHA256 (mitre-manx-e7205ea_GH0.tar.gz) = 5b39a00ff8bbe7b20d4cfcab6161edbbafd94fa9bd62af4741975f7759f7a470 | ||
| SIZE (mitre-manx-e7205ea_GH0.tar.gz) = 7352820 | ||
| SHA256 (mitre-response-889213a_GH0.tar.gz) = 4067efd0c4bddeed799255838a80316d96ba0c4cac84625d7d0257e44c00c4ee | ||
| SIZE (mitre-response-889213a_GH0.tar.gz) = 24463 | ||
| SHA256 (mitre-sandcat-7c326bd_GH0.tar.gz) = 60049cf759e8b31b29e84832a112c87be8101e303d088e0f2b9da4647f79855f | ||
| SIZE (mitre-sandcat-7c326bd_GH0.tar.gz) = 7816391 | ||
| SHA256 (mitre-ssl-ac5bfcb_GH0.tar.gz) = 01067db5fe9a32d07d13bbea4ffb6f3bd2907a57f2d50a7c7e9c5f2bdc823a12 | ||
| SIZE (mitre-ssl-ac5bfcb_GH0.tar.gz) = 6395 | ||
| SHA256 (mitre-stockpile-960f9ad_GH0.tar.gz) = 516d28ae26d66049e2273f60bbae0254b071152b613f259a7ff596ad2d92461f | ||
| SIZE (mitre-stockpile-960f9ad_GH0.tar.gz) = 4781396 | ||
| SHA256 (mitre-training-b058b67_GH0.tar.gz) = 44c5ee5f682918f1f8ace4ff4ea3b8e16d24795ff8b8fb5896d68c585d33b8c0 | ||
| SIZE (mitre-training-b058b67_GH0.tar.gz) = 491615 | ||
| TIMESTAMP = 1708127632 | ||
| SHA256 (caldera-cache-5.0.0.tar.gz) = c0f160ec5431b0096a9ce8e2adde062de97be96e66e9e8756b4646e4d8c2a9a9 | ||
| SIZE (caldera-cache-5.0.0.tar.gz) = 41756498 | ||
| SHA256 (mitre-caldera-5.0.0_GH0.tar.gz) = a4e122f6862ea3cb7e856889a4a2b68ce297f74189fd845b0a51c02e1fa8c716 | ||
| SIZE (mitre-caldera-5.0.0_GH0.tar.gz) = 3820616 | ||
| SHA256 (mitre-access-775181b_GH0.tar.gz) = 2ae6e4cbd9e6c143cc76b65c0be3dd332228ab59161422291050eb6f4c4b1d17 | ||
| SIZE (mitre-access-775181b_GH0.tar.gz) = 11646 | ||
| SHA256 (mitre-atomic-4f489bb_GH0.tar.gz) = 340c7931fbee16ce1bf788044018fcf75fe403bf641665bb4aec53d3b1479b2d | ||
| SIZE (mitre-atomic-4f489bb_GH0.tar.gz) = 15041 | ||
| SHA256 (mitre-builder-de24b68_GH0.tar.gz) = bca2a28b23d72cf987878aa519d0f108b2153156391821bfb137c79ac5c5bcc2 | ||
| SIZE (mitre-builder-de24b68_GH0.tar.gz) = 8349 | ||
| SHA256 (mitre-compass-85e2ebf_GH0.tar.gz) = 4760171cf05a7fccfd4300815f358d9d42affb2c741e6e555515f07eb50c9f34 | ||
| SIZE (mitre-compass-85e2ebf_GH0.tar.gz) = 7055 | ||
| SHA256 (mitre-debrief-eba44d5_GH0.tar.gz) = 62cbfd77cbf3573675bc79426171f136628f26a1ee3f931c02f36d53bda8012e | ||
| SIZE (mitre-debrief-eba44d5_GH0.tar.gz) = 1006448 | ||
| SHA256 (mitre-emu-7215768_GH0.tar.gz) = 13dedefc0c3e9a443221886d2030effdc5b741a62a5a4ebd830ca613d183025f | ||
| SIZE (mitre-emu-7215768_GH0.tar.gz) = 19410 | ||
| SHA256 (mitre-fieldmanual-cb53f2b_GH0.tar.gz) = 8dbac757e4d70bb415c38684997969ceda3a886ddf6aa3028ee8720d7a44e01a | ||
| SIZE (mitre-fieldmanual-cb53f2b_GH0.tar.gz) = 9659796 | ||
| SHA256 (mitre-gameboard-dacb6ce_GH0.tar.gz) = 55e521c4dfc6acc9b8ed37b7622d1c20248cd1fe43a9410e339b8c24729d22ac | ||
| SIZE (mitre-gameboard-dacb6ce_GH0.tar.gz) = 20333 | ||
| SHA256 (mitre-human-0e344ea_GH0.tar.gz) = 83ae25ee09a9a7c463cc94e673cb572bef78fdd91b7b019fd845f73e18d5e610 | ||
| SIZE (mitre-human-0e344ea_GH0.tar.gz) = 25937 | ||
| SHA256 (mitre-magma-99f0056_GH0.tar.gz) = a1ab40360288d4818abfb3e73cf7361686f6e7072de9dd8a7633da3f55a18558 | ||
| SIZE (mitre-magma-99f0056_GH0.tar.gz) = 10138171 | ||
| SHA256 (mitre-manx-a7e83a6_GH0.tar.gz) = ec144af8d794c11e68c7bacb6da4b84e81c3278fd90045e8f5660408652799c7 | ||
| SIZE (mitre-manx-a7e83a6_GH0.tar.gz) = 7359477 | ||
| SHA256 (mitre-response-8ea6ab5_GH0.tar.gz) = f2275a11ebb631b84da2921e370bf5e5957c304265621c78d27f212269fdc9b5 | ||
| SIZE (mitre-response-8ea6ab5_GH0.tar.gz) = 25334 | ||
| SHA256 (mitre-sandcat-b408f3f_GH0.tar.gz) = 15bee4622b0ce40ad66b99804ee87e7eb4074ec564fc719b72c397e74a63f0f5 | ||
| SIZE (mitre-sandcat-b408f3f_GH0.tar.gz) = 8294185 | ||
| SHA256 (mitre-ssl-1ae8431_GH0.tar.gz) = 608596a05a3c833ac10c230cf4bf0863f0e31540414a66b382ff159f97d7629f | ||
| SIZE (mitre-ssl-1ae8431_GH0.tar.gz) = 6806 | ||
| SHA256 (mitre-stockpile-fe0c5b7_GH0.tar.gz) = dea568de5067cc20cc54ca57d270d01ef092b329dad61c2e53369fd1524512a3 | ||
| SIZE (mitre-stockpile-fe0c5b7_GH0.tar.gz) = 4780570 | ||
| SHA256 (mitre-training-37f998f_GH0.tar.gz) = 41fe37233c02d77435e747e6d34017eeba6c592805382176afaf6f2d1f8f6a46 | ||
| SIZE (mitre-training-37f998f_GH0.tar.gz) = 496302 |
59 changes: 59 additions & 0 deletions
59
security/caldera/files/patch-plugins_human_gui_views_human.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| --- plugins/human/gui/views/human.vue 2024-02-16 18:15:08.873254000 -0500 | ||
| +++ plugins/human/gui/views/human.vue 2024-02-16 18:16:20.156979000 -0500 | ||
| @@ -232,7 +232,7 @@ | ||
| return; | ||
| } | ||
|
|
||
| - const validPlatforms = ["linux", "windows-psh", "darwin"]; | ||
| + const validPlatforms = ["linux", "windows-psh", "darwin", "freebsd"]; | ||
| if (!validPlatforms.includes(this.selectedPlatform)) { | ||
| toast({ | ||
| message: "Please select a valid platform", | ||
| @@ -346,6 +346,31 @@ | ||
| this.humans[this.selectedHuman].task_cluster_interval | ||
| } --extra ${extra}`; | ||
| break; | ||
| + case "freebsd": | ||
| + this.commandBlock = `curl -sk -o '${ | ||
| + this.humans[this.selectedHuman].name | ||
| + }.tar.gz' -X POST -H 'file:${ | ||
| + this.humans[this.selectedHuman].name | ||
| + }.tar.gz' ${this.serverIp}/file/download 2>&1 && mkdir '${ | ||
| + this.humans[this.selectedHuman].name | ||
| + }' && tar -C '${this.humans[this.selectedHuman].name}' -zxvf '${ | ||
| + this.humans[this.selectedHuman].name | ||
| + }.tar.gz' && virtualenv -p python3 '${ | ||
| + this.humans[this.selectedHuman].name | ||
| + }' && '${this.humans[this.selectedHuman].name}/bin/pip' install -r '${ | ||
| + this.humans[this.selectedHuman].name | ||
| + }/requirements.txt' && '${ | ||
| + this.humans[this.selectedHuman].name | ||
| + }/bin/python3.9' '${ | ||
| + this.humans[this.selectedHuman].name | ||
| + }/human.py' --clustersize ${ | ||
| + this.humans[this.selectedHuman].tasks_per_cluster | ||
| + } --taskinterval ${ | ||
| + this.humans[this.selectedHuman].task_interval | ||
| + } --taskgroupinterval ${ | ||
| + this.humans[this.selectedHuman].task_cluster_interval | ||
| + } --extra ${extra}`; | ||
| + break; | ||
| case "windows-psh": | ||
| this.commandBlock = `$server='${ | ||
| this.serverIp | ||
| @@ -382,6 +407,7 @@ | ||
| extra.forEach((command) => { | ||
| switch (platform) { | ||
| case "darwin": | ||
| + case "freebsd": | ||
| case "linux": | ||
| command = command.replace(/\\/g, "\\\\"); | ||
| command = command.replace(/"/g, '\\"'); | ||
| @@ -444,6 +470,7 @@ | ||
| select(v-model="selectedPlatform", id="base-platform") | ||
| option(value="", disabled) Select target OS | ||
| option(value="darwin") MacOS | ||
| + option(value="freebsd") FreeBSD | ||
| option(value="linux") Linux | ||
| option(value="windows-psh") Windows (PowerShell) | ||
| hr |
113 changes: 74 additions & 39 deletions
113
security/caldera/files/patch-plugins_human_templates_human.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,75 @@ | ||
| --- plugins/human/templates/human.html.orig 2022-09-06 17:33:12 UTC | ||
| +++ plugins/human/templates/human.html | ||
| @@ -60,6 +60,7 @@ | ||
| <select id="base-platform"> | ||
| <option disabled="disabled" selected="">Select target OS</option> | ||
| <option value="darwin">MacOS</option> | ||
| + <option value="freebsd">FreeBSD</option> | ||
| <option value="linux">Linux</option> | ||
| <option value="windows-psh">Windows (PowerShell)</option> | ||
| </select> | ||
| @@ -257,6 +258,11 @@ | ||
| ' && virtualenv -p python3 \''+humanName+'\' && \''+humanName+'/bin/pip\' install -r \''+humanName+'/requirements.txt\' && \''+humanName+'/bin/python\' \''+humanName+'/human.py\' --clustersize '+taskCount+' ' + | ||
| '--taskinterval '+taskInterval+' --taskgroupinterval '+taskClusterInterval+' --extra '+extra; | ||
| break; | ||
| --- plugins/human/templates/human.html 2024-02-16 15:54:12.707381000 -0500 | ||
| +++ plugins/human/templates/human.html 2024-02-16 16:00:05.903013000 -0500 | ||
| @@ -106,6 +106,7 @@ | ||
| <select x-model="selectedPlatform" id="base-platform"> | ||
| <option value="" disabled>Select target OS</option> | ||
| <option value="darwin">MacOS</option> | ||
| + <option value="freebsd">FreeBSD</option> | ||
| <option value="linux">Linux</option> | ||
| <option value="windows-psh">Windows (PowerShell)</option> | ||
| </select> | ||
| @@ -349,7 +350,8 @@ | ||
| if ( | ||
| this.selectedPlatform != "linux" && | ||
| this.selectedPlatform != "windows-psh" && | ||
| - this.selectedPlatform != "darwin" | ||
| + this.selectedPlatform != "darwin" && | ||
| + this.selectedPlatform != "freebsd" | ||
| ) { | ||
| toast("Please select a platform", false); | ||
| return; | ||
| @@ -435,8 +437,42 @@ | ||
| this.humans[this.selectedHuman].task_cluster_interval + | ||
| " --extra " + | ||
| extra; | ||
| - | ||
| break; | ||
| + case "freebsd": | ||
| + this.commandBlock = | ||
| + "curl -sk -o '" + | ||
| + this.humans[this.selectedHuman].name + | ||
| + ".tar.gz' -X POST -H 'file:" + | ||
| + this.humans[this.selectedHuman].name + | ||
| + ".tar.gz' " + | ||
| + this.serverIp + | ||
| + "/file/download 2>&1 && mkdir '" + | ||
| + this.humans[this.selectedHuman].name + | ||
| + "' && tar -C '" + | ||
| + this.humans[this.selectedHuman].name + | ||
| + "' -zxvf '" + | ||
| + this.humans[this.selectedHuman].name + | ||
| + ".tar.gz' " + | ||
| + " && virtualenv -p python3.9 '" + | ||
| + this.humans[this.selectedHuman].name + | ||
| + "' && '" + | ||
| + this.humans[this.selectedHuman].name + | ||
| + "/bin/pip' install -r '" + | ||
| + this.humans[this.selectedHuman].name + | ||
| + "/requirements.txt' && '" + | ||
| + this.humans[this.selectedHuman].name + | ||
| + "/bin/python' '" + | ||
| + this.humans[this.selectedHuman].name + | ||
| + "/human.py' --clustersize " + | ||
| + this.humans[this.selectedHuman].tasks_per_cluster + | ||
| + " " + | ||
| + "--taskinterval " + | ||
| + this.humans[this.selectedHuman].task_interval + | ||
| + " --taskgroupinterval " + | ||
| + this.humans[this.selectedHuman].task_cluster_interval + | ||
| + " --extra " + | ||
| + extra; | ||
| + break; | ||
| case "linux": | ||
| this.commandBlock = | ||
| "curl -sk -o '" + | ||
| @@ -514,6 +550,10 @@ | ||
| extra.forEach((command) => { | ||
| switch (platform) { | ||
| case "darwin": | ||
| + command = command.replace(/\\/g, "\\\\"); | ||
| + command = command.replace(/"/g, '\\"'); | ||
| + break; | ||
| + case "freebsd": | ||
| + baseHuman = 'curl -sk -o \''+humanName+'.tar.gz\' -X POST -H \'file:'+humanName+'.tar.gz\' '+http+'/file/download 2>&1 && mkdir \''+humanName+'\' && tar -C \''+humanName+'\' -zxvf \''+humanName+'.tar.gz\' ' + | ||
| + ' && virtualenv -p python3.9 \''+humanName+'\' && \''+humanName+'/bin/pip\' install -r \''+humanName+'/requirements.txt\' && \''+humanName+'/bin/python\' \''+humanName+'/human.py\' --clustersize '+taskCount+' ' + | ||
| + '--taskinterval '+taskInterval+' --taskgroupinterval '+taskClusterInterval+' --extra '+extra; | ||
| + break; | ||
| case "linux": | ||
| baseHuman = 'curl -sk -o \''+humanName+'.tar.gz\' -X POST -H \'file:'+humanName+'.tar.gz\' '+http+'/file/download 2>&1 && mkdir \''+humanName+'\' && tar -C \''+humanName+'\' -zxvf \''+humanName+'.tar.gz\' ' + | ||
| ' && virtualenv -p python3 \''+humanName+'\' && \''+humanName+'/bin/pip\' install -r \''+humanName+'/requirements.txt\' && \''+humanName+'/bin/python\' \''+humanName+'/human.py\' --clustersize '+taskCount+' ' + | ||
| @@ -293,6 +299,10 @@ | ||
| $.each(extra, function(i, command) { | ||
| switch (platform) { | ||
| case "darwin": | ||
| + command = command.replace(/\\/g, '\\\\'); | ||
| + command = command.replace(/"/g, '\\\"'); | ||
| + break; | ||
| + case "freebsd": | ||
| command = command.replace(/\\/g, '\\\\'); | ||
| command = command.replace(/"/g, '\\\"'); | ||
| break; | ||
| @@ -317,4 +327,4 @@ | ||
| return provided_value || default_value; | ||
| } | ||
|
|
||
| -</script> | ||
| \ No newline at end of file | ||
| +</script> | ||
| command = command.replace(/\\/g, "\\\\"); | ||
| command = command.replace(/"/g, '\\"'); | ||
| break; |
Oops, something went wrong.