git: 7c963b3e3e45 - main - security/caldera: Update to 4.2.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 21 Jun 2023 16:49:37 UTC
The branch main has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7c963b3e3e45808196aa24de0b1db4afef283a6a
commit 7c963b3e3e45808196aa24de0b1db4afef283a6a
Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2023-06-21 16:48:22 +0000
Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2023-06-21 16:48:22 +0000
security/caldera: Update to 4.2.0
ChangeLog at: https://github.com/mitre/caldera/releases/tag/4.2.0
---
security/caldera/Makefile | 23 +++++-----
security/caldera/distinfo | 40 ++++++++---------
.../files/patch-plugins_emu_app_emu__svc.py | 4 +-
security/caldera/pkg-plist | 52 +++++++++++-----------
4 files changed, 57 insertions(+), 62 deletions(-)
diff --git a/security/caldera/Makefile b/security/caldera/Makefile
index c75659d18940..c20bb99b5dfb 100644
--- a/security/caldera/Makefile
+++ b/security/caldera/Makefile
@@ -1,6 +1,5 @@
PORTNAME= caldera
-DISTVERSION= 4.1.0
-PORTREVISION= 2
+DISTVERSION= 4.2.0
CATEGORIES= security python
MAINTAINER= acm@FreeBSD.org
@@ -50,28 +49,28 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \
USE_GITHUB= yes
GH_ACCOUNT= mitre
GH_PROJECT= ${PORTNAME}
-GH_TUPLE= mitre:access:fff4c20:access/plugins/access \
+GH_TUPLE= mitre:access:0e67776:access/plugins/access \
mitre:atomic:9e2c958:atomic/plugins/atomic \
- mitre:builder:1aca019:builder/plugins/builder \
+ mitre:builder:f2ce67c:builder/plugins/builder \
mitre:compass:fb88e02:compass/plugins/compass \
- mitre:debrief:d815b60:debrief/plugins/debrief \
- mitre:emu:5dbff82:emu/plugins/emu \
- mitre:fieldmanual:510d0b9:fieldmanual/plugins/fieldmanual \
+ mitre:debrief:e4d4f9e:debrief/plugins/debrief \
+ mitre:emu:02a0f3e:emu/plugins/emu \
+ mitre:fieldmanual:c286e77:fieldmanual/plugins/fieldmanual \
mitre:gameboard:3d98c32:gameboard/plugins/gameboard \
mitre:human:4368dea:human/plugins/human \
mitre:manx:e7205ea:manx/plugins/manx \
- mitre:mock:4ea3337:mock/plugins/mock \
mitre:response:889213a:response/plugins/response \
- mitre:sandcat:de3405f:sandcat/plugins/sandcat \
+ mitre:sandcat:7c326bd:sandcat/plugins/sandcat \
mitre:ssl:ac5bfcb:ssl/plugins/ssl \
- mitre:stockpile:9662f27:stockpile/plugins/stockpile \
- mitre:training:e309b0f:training/plugins/training
+ mitre:stockpile:960f9ad:stockpile/plugins/stockpile \
+ mitre:training:b058b67:training/plugins/training
-USES= go:run python:3.8+
+USES= dos2unix go:run python:3.8+
NO_ARCH= yes
NO_BUILD= yes
+DOS2UNIX_REGEX= .*\.([yml])
CALDERA_USER= caldera
CALDERA_GROUP= caldera
USERS= ${CALDERA_USER}
diff --git a/security/caldera/distinfo b/security/caldera/distinfo
index d9ca85b369cf..7542fc288b4e 100644
--- a/security/caldera/distinfo
+++ b/security/caldera/distinfo
@@ -1,35 +1,33 @@
-TIMESTAMP = 1681965363
-SHA256 (mitre-caldera-4.1.0_GH0.tar.gz) = 342516c29926dbd7e96bc2ba1558779d5ee423eac97a4c48d0245d7480a790eb
-SIZE (mitre-caldera-4.1.0_GH0.tar.gz) = 3462547
-SHA256 (mitre-access-fff4c20_GH0.tar.gz) = 087dd5de918c5a2a5a73888abb3839e6d43335ac5f26ee739038813631a24358
-SIZE (mitre-access-fff4c20_GH0.tar.gz) = 8485
+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-1aca019_GH0.tar.gz) = 563c54beed985b11edb96c7ec3a8349f8328a6534750801fa71693ed1cf34346
-SIZE (mitre-builder-1aca019_GH0.tar.gz) = 7946
+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-d815b60_GH0.tar.gz) = 565e234e52157b6259752c474c40eaa96f15921595f299cbd7875f4bc51e73aa
-SIZE (mitre-debrief-d815b60_GH0.tar.gz) = 4419572
-SHA256 (mitre-emu-5dbff82_GH0.tar.gz) = 45b980caf2b9a59d1d9f4bba69334e1b74f036ae667bc510dfc1422ef58829d9
-SIZE (mitre-emu-5dbff82_GH0.tar.gz) = 16962
-SHA256 (mitre-fieldmanual-510d0b9_GH0.tar.gz) = d908a6f0eb4bf8295bc6c92e23aae5984bcd2006069af9ed880978b76c7c0984
-SIZE (mitre-fieldmanual-510d0b9_GH0.tar.gz) = 7811262
+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-mock-4ea3337_GH0.tar.gz) = 36447c30cdff3869796948bff8940b24e710f242e70255578095a10df4d0c5db
-SIZE (mitre-mock-4ea3337_GH0.tar.gz) = 5470
SHA256 (mitre-response-889213a_GH0.tar.gz) = 4067efd0c4bddeed799255838a80316d96ba0c4cac84625d7d0257e44c00c4ee
SIZE (mitre-response-889213a_GH0.tar.gz) = 24463
-SHA256 (mitre-sandcat-de3405f_GH0.tar.gz) = dbb111552220d6f108f852f3d442dcc90d3457c488fbec3f176a4638a611cd56
-SIZE (mitre-sandcat-de3405f_GH0.tar.gz) = 7564017
+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-9662f27_GH0.tar.gz) = ab74994666c6759261346bb0c7a653dde5982273d04afd18eb26e7d57c78210c
-SIZE (mitre-stockpile-9662f27_GH0.tar.gz) = 4777470
-SHA256 (mitre-training-e309b0f_GH0.tar.gz) = 505d4d4447c9d35e2062064abe1d689f7bc92c818ccb450848e6e57619c24375
-SIZE (mitre-training-e309b0f_GH0.tar.gz) = 492099
+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
diff --git a/security/caldera/files/patch-plugins_emu_app_emu__svc.py b/security/caldera/files/patch-plugins_emu_app_emu__svc.py
index 38eb16d85180..735212716c22 100644
--- a/security/caldera/files/patch-plugins_emu_app_emu__svc.py
+++ b/security/caldera/files/patch-plugins_emu_app_emu__svc.py
@@ -1,11 +1,11 @@
--- plugins/emu/app/emu_svc.py.orig 2022-06-12 20:12:01 UTC
+++ plugins/emu/app/emu_svc.py
-@@ -12,7 +12,7 @@ from app.utility.base_service import BaseService
+@@ -12,7 +12,7 @@
class EmuService(BaseService):
- _dynamicically_compiled_payloads = {'sandcat.go-linux', 'sandcat.go-darwin', 'sandcat.go-windows'}
+ _dynamicically_compiled_payloads = {'sandcat.go-linux', 'sandcat.go-darwin', 'sandcat.go-windows', 'sandcat.go-freebsd'}
+ _emu_config_path = "conf/default.yml"
def __init__(self):
- self.log = self.add_service('emu_svc', self)
diff --git a/security/caldera/pkg-plist b/security/caldera/pkg-plist
index f036d578c394..dc7a7258a607 100644
--- a/security/caldera/pkg-plist
+++ b/security/caldera/pkg-plist
@@ -1,6 +1,7 @@
@mode 640
@owner caldera
@group caldera
+%%WWWDIR%%/CITATION.cff
%%WWWDIR%%/CONTRIBUTING.md
%%WWWDIR%%/LICENSE
%%WWWDIR%%/README.md
@@ -42,6 +43,7 @@
%%WWWDIR%%/app/api/v2/schemas/config_schemas.py
%%WWWDIR%%/app/api/v2/schemas/deploy_command_schemas.py
%%WWWDIR%%/app/api/v2/schemas/error_schemas.py
+%%WWWDIR%%/app/api/v2/schemas/link_result_schema.py
%%WWWDIR%%/app/api/v2/security.py
%%WWWDIR%%/app/api/v2/validation.py
%%WWWDIR%%/app/contacts/contact_dns.py
@@ -84,6 +86,7 @@
%%WWWDIR%%/app/objects/secondclass/c_rule.py
%%WWWDIR%%/app/objects/secondclass/c_variation.py
%%WWWDIR%%/app/objects/secondclass/c_visibility.py
+%%WWWDIR%%/app/planners/atomic.py
%%WWWDIR%%/app/service/app_svc.py
%%WWWDIR%%/app/service/auth_svc.py
%%WWWDIR%%/app/service/contact_svc.py
@@ -128,6 +131,7 @@
%%WWWDIR%%/data/backup/.gitkeep
%%WWWDIR%%/data/objectives/.gitkeep
%%WWWDIR%%/data/payloads/.gitkeep
+%%WWWDIR%%/data/planners/aaa7c857-37a0-4c4a-85f7-4e9f7f30e31a.yml
%%WWWDIR%%/data/results/.gitkeep
%%WWWDIR%%/data/sources/.gitkeep
%%WWWDIR%%/docker-compose.yml
@@ -145,7 +149,7 @@
%%WWWDIR%%/plugins/access/data/abilities/build-capabilities/bed8f28e-c0ed-463e-9e31-d5607e5473df.yml
%%WWWDIR%%/plugins/access/data/abilities/technical-information-gathering/567eaaba-94cc-4a27-83f8-768e5638f4e1.yml
%%WWWDIR%%/plugins/access/data/payload/90ef8eaa-01b7-4e98-9070-105eca3bac39.yml
-%%WWWDIR%%/plugins/access/data/payloads/msf_extract.rc
+%%WWWDIR%%/plugins/access/data/payloads/msf_extract.rb
%%WWWDIR%%/plugins/access/data/payloads/scanner.sh
%%WWWDIR%%/plugins/access/hook.py
%%WWWDIR%%/plugins/access/static/.gitkeep
@@ -228,7 +232,7 @@
%%WWWDIR%%/plugins/debrief/docs/debrief1.png
%%WWWDIR%%/plugins/debrief/docs/debrief2.png
%%WWWDIR%%/plugins/debrief/docs/debrief3.png
-%%WWWDIR%%/plugins/debrief/docs/debrief_2020-09-14_16-03-43.pdf
+%%WWWDIR%%/plugins/debrief/docs/debrief_2023-02-24_17-08-14.pdf
%%WWWDIR%%/plugins/debrief/downloads/.gitkeep
%%WWWDIR%%/plugins/debrief/hook.py
%%WWWDIR%%/plugins/debrief/requirements.txt
@@ -278,10 +282,12 @@
%%WWWDIR%%/plugins/emu/app/emu_svc.py
%%WWWDIR%%/plugins/emu/app/group_filtered_planner.py
%%WWWDIR%%/plugins/emu/app/parsers/vssadmin_shadow.py
+%%WWWDIR%%/plugins/emu/conf/default.yml
%%WWWDIR%%/plugins/emu/data/.gitkeep
%%WWWDIR%%/plugins/emu/download_payloads.sh
%%WWWDIR%%/plugins/emu/hook.py
%%WWWDIR%%/plugins/emu/payloads/.gitkeep
+%%WWWDIR%%/plugins/emu/requirements.txt
%%WWWDIR%%/plugins/emu/templates/emu.html
%%WWWDIR%%/plugins/emu/tests/.gitkeep
%%WWWDIR%%/plugins/emu/tests/test_emu_svc.py
@@ -323,6 +329,7 @@
%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/Uninstalling-CALDERA.md
%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/_static/lm_guide.mp4
%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/conf.py
+%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/img/caldera-logo.png
%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/img/debrief_attack_path.png
%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/img/fact_relationships.png
%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/img/privileged_persistence_state_machine.png
@@ -420,23 +427,6 @@
%%WWWDIR%%/plugins/manx/static/js/xterm.js
%%WWWDIR%%/plugins/manx/templates/manx.html
%%WWWDIR%%/plugins/manx/update-shells.sh
-%%WWWDIR%%/plugins/mock/.flake8
-%%WWWDIR%%/plugins/mock/.github/ISSUE_TEMPLATE/bug_report.md
-%%WWWDIR%%/plugins/mock/.github/ISSUE_TEMPLATE/config.yml
-%%WWWDIR%%/plugins/mock/.github/ISSUE_TEMPLATE/feature_request.md
-%%WWWDIR%%/plugins/mock/.github/ISSUE_TEMPLATE/question.md
-%%WWWDIR%%/plugins/mock/.github/pull_request_template.md
-%%WWWDIR%%/plugins/mock/.gitignore
-%%WWWDIR%%/plugins/mock/README.md
-%%WWWDIR%%/plugins/mock/VERSION.txt
-%%WWWDIR%%/plugins/mock/app/mock_gui_api.py
-%%WWWDIR%%/plugins/mock/app/result_generator.py
-%%WWWDIR%%/plugins/mock/app/simulation_svc.py
-%%WWWDIR%%/plugins/mock/conf/agents.yml
-%%WWWDIR%%/plugins/mock/conf/scenarios/alice.yml
-%%WWWDIR%%/plugins/mock/conf/scenarios/hypervisor.yml
-%%WWWDIR%%/plugins/mock/hook.py
-%%WWWDIR%%/plugins/mock/templates/mock.html
%%WWWDIR%%/plugins/response/.github/ISSUE_TEMPLATE/bug_report.md
%%WWWDIR%%/plugins/response/.github/ISSUE_TEMPLATE/config.yml
%%WWWDIR%%/plugins/response/.github/ISSUE_TEMPLATE/feature_request.md
@@ -640,12 +630,7 @@
%%WWWDIR%%/plugins/stockpile/LICENSE
%%WWWDIR%%/plugins/stockpile/README.md
%%WWWDIR%%/plugins/stockpile/VERSION.txt
-%%WWWDIR%%/plugins/stockpile/app/atomic.py
-%%WWWDIR%%/plugins/stockpile/app/batch.py
-%%WWWDIR%%/plugins/stockpile/app/buckets.py
%%WWWDIR%%/plugins/stockpile/app/donut.py
-%%WWWDIR%%/plugins/stockpile/app/guided.py
-%%WWWDIR%%/plugins/stockpile/app/look_ahead.py
%%WWWDIR%%/plugins/stockpile/app/obfuscators/base64_basic.py
%%WWWDIR%%/plugins/stockpile/app/obfuscators/base64_jumble.py
%%WWWDIR%%/plugins/stockpile/app/obfuscators/base64_no_padding.py
@@ -676,13 +661,20 @@
%%WWWDIR%%/plugins/stockpile/app/parsers/share_mounted.py
%%WWWDIR%%/plugins/stockpile/app/parsers/ssh.py
%%WWWDIR%%/plugins/stockpile/app/parsers/wifipref.py
+%%WWWDIR%%/plugins/stockpile/app/planners/batch.py
+%%WWWDIR%%/plugins/stockpile/app/planners/buckets.py
+%%WWWDIR%%/plugins/stockpile/app/planners/guided.py
+%%WWWDIR%%/plugins/stockpile/app/planners/look_ahead.py
+%%WWWDIR%%/plugins/stockpile/app/planners/naive_bayes.py
%%WWWDIR%%/plugins/stockpile/app/requirements/base_requirement.py
%%WWWDIR%%/plugins/stockpile/app/requirements/basic.py
+%%WWWDIR%%/plugins/stockpile/app/requirements/existential.py
%%WWWDIR%%/plugins/stockpile/app/requirements/no_backwards_movement.py
%%WWWDIR%%/plugins/stockpile/app/requirements/not_exists.py
%%WWWDIR%%/plugins/stockpile/app/requirements/paw_provenance.py
%%WWWDIR%%/plugins/stockpile/app/requirements/reachable.py
%%WWWDIR%%/plugins/stockpile/app/requirements/req_like.py
+%%WWWDIR%%/plugins/stockpile/app/requirements/universal.py
%%WWWDIR%%/plugins/stockpile/app/stockpile_svc.py
%%WWWDIR%%/plugins/stockpile/conf/default.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/collection/02de522f-7e0a-4544-8afc-0c195f400f5f.yml
@@ -763,6 +755,7 @@
%%WWWDIR%%/plugins/stockpile/data/abilities/discovery/6c91884e-11ec-422f-a6ed-e76774b0daac.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/discovery/6d90e6fa-9324-4eb5-93be-9f737245bd7z.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/discovery/6e1a53c0-7352-4899-be35-fa7f364d5722.yml
+%%WWWDIR%%/plugins/stockpile/data/abilities/discovery/74d1b640-7f1e-4b36-beba-23a8228f39e0.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/discovery/7c42a30c-c8c7-44c5-80a8-862d364ac1e4.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/discovery/830bb6ed-9594-4817-b1a1-c298c0f9f425.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/discovery/85341c8c-4ecb-4579-8f53-43e3e91d7617.yml
@@ -826,12 +819,14 @@
%%WWWDIR%%/plugins/stockpile/data/abilities/impact/68235976-2404-42a8-9105-68230cfef562.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/impact/78524da1-f347-4fbb-9295-209f1f408330.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/lateral-movement/10a9d979-e342-418a-a9b0-002c483e0fa6.yml
+%%WWWDIR%%/plugins/stockpile/data/abilities/lateral-movement/22881b9d-0efa-4ef4-9704-df0f11170cc3.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/lateral-movement/3734aa1e-c536-42b3-8912-4c91b8bdce90.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/lateral-movement/40161ad0-75bd-11e9-b475-0800200c9a66.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/lateral-movement/41bb2b7a-75af-49fd-bd15-6c827df25921.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/lateral-movement/4908fdc4-74fc-4d7c-8935-26d11ad26a8d.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/lateral-movement/620b674a-7655-436c-b645-bc3e8ea51abd.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/lateral-movement/65048ec1-f7ca-49d3-9410-10813e472b30.yml
+%%WWWDIR%%/plugins/stockpile/data/abilities/lateral-movement/96d3c175-5e58-424c-8350-d7514b28a075.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/lateral-movement/aa6ec4dd-db09-4925-b9b9-43adeb154686.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/persistence/52771610-2322-44cf-816b-a7df42b4c086.yml
%%WWWDIR%%/plugins/stockpile/data/abilities/privilege-escalation/10681f2f-be03-44af-858d-f2b0812df185.yml
@@ -844,10 +839,12 @@
%%WWWDIR%%/plugins/stockpile/data/adversaries/01d77744-2515-401a-a497-d9f7241aac3c.yml
%%WWWDIR%%/plugins/stockpile/data/adversaries/09ad625e-6cba-490f-afe3-5417e7edb9c6.yml
%%WWWDIR%%/plugins/stockpile/data/adversaries/0b73bf34-fc5b-48f7-9194-dce993b915b1.yml
+%%WWWDIR%%/plugins/stockpile/data/adversaries/1bac97ca-77fc-4c9a-835e-4de1b1b7f639.yml
%%WWWDIR%%/plugins/stockpile/data/adversaries/50855e29-3b4e-4562-aa55-b3d7f93c26b8.yml
%%WWWDIR%%/plugins/stockpile/data/adversaries/564ae20d-778d-4965-93dc-b523be2e2ab4.yml
%%WWWDIR%%/plugins/stockpile/data/adversaries/78e7504d-968f-477d-8806-4d6c04b94431.yml
%%WWWDIR%%/plugins/stockpile/data/adversaries/bcdbf6b9-14c5-495c-be84-37bce32c312b.yml
+%%WWWDIR%%/plugins/stockpile/data/adversaries/c220a8e6-609c-4d5b-9e1c-068ca01c2eec.yml
%%WWWDIR%%/plugins/stockpile/data/adversaries/c724545d-a4cc-492e-8075-2ab9a699c847.yml
%%WWWDIR%%/plugins/stockpile/data/adversaries/d6ea4c1e-7959-4eb1-a292-b6fd2b06c73e.yml
%%WWWDIR%%/plugins/stockpile/data/adversaries/dbd49a4a-ba2d-40d0-9348-2db24fc4b0b6.yml
@@ -866,9 +863,9 @@
%%WWWDIR%%/plugins/stockpile/data/adversaries/packs/f98193a0-8b5b-4b5e-a5aa-e8c3adfcd4e6.yml
%%WWWDIR%%/plugins/stockpile/data/payloads/70632d81-bb39-40dd-bfba-cfd1f8196eb6.yml
%%WWWDIR%%/plugins/stockpile/data/planners/254c7035-de7d-4d76-a888-2c09ba594eca.yml
+%%WWWDIR%%/plugins/stockpile/data/planners/48e1a882-1606-4910-8f2d-2352eb80cba2.yml
%%WWWDIR%%/plugins/stockpile/data/planners/5bdec528-07ce-44cc-8997-09fe41aa2007.yml
%%WWWDIR%%/plugins/stockpile/data/planners/788107d5-dc1e-4204-9269-38df0186d3e7.yml
-%%WWWDIR%%/plugins/stockpile/data/planners/aaa7c857-37a0-4c4a-85f7-4e9f7f30e31a.yml
%%WWWDIR%%/plugins/stockpile/data/planners/f36c34f5-9439-4417-9640-fe83f4b7b12d.yml
%%WWWDIR%%/plugins/stockpile/data/sources/2ccb822c-088a-4664-8976-91be8879bc1d.yml
%%WWWDIR%%/plugins/stockpile/data/sources/4f3325d7-e6f2-4413-892a-60066052189d.yml
@@ -986,7 +983,6 @@
%%WWWDIR%%/plugins/training/app/flags/plugins/compass/flag_0.py
%%WWWDIR%%/plugins/training/app/flags/plugins/manx/flag_0.py
%%WWWDIR%%/plugins/training/app/flags/plugins/manx/flag_1.py
-%%WWWDIR%%/plugins/training/app/flags/plugins/mock/flag_0.py
%%WWWDIR%%/plugins/training/app/flags/plugins/response/flag_0.py
%%WWWDIR%%/plugins/training/app/flags/plugins/response/flag_1.py
%%WWWDIR%%/plugins/training/app/training_api.py
@@ -1028,7 +1024,6 @@
%%WWWDIR%%/plugins/training/solution_guides/OperationsFlag3.md
%%WWWDIR%%/plugins/training/solution_guides/PluginsManxFlag0.md
%%WWWDIR%%/plugins/training/solution_guides/PluginsManxFlag1.md
-%%WWWDIR%%/plugins/training/solution_guides/PluginsMockFlag0.md
%%WWWDIR%%/plugins/training/solution_guides/PluginsResponseFlag0.md
%%WWWDIR%%/plugins/training/solution_guides/PluginsResponseFlag1.md
%%WWWDIR%%/plugins/training/static/css/markdown.css
@@ -1091,6 +1086,7 @@
%%WWWDIR%%/static/img/back-blue.png
%%WWWDIR%%/static/img/back-grey.jpg
%%WWWDIR%%/static/img/back-red.png
+%%WWWDIR%%/static/img/caldera-banner.png
%%WWWDIR%%/static/img/caldera-logo.png
%%WWWDIR%%/static/img/compass.png
%%WWWDIR%%/static/img/contact.png
@@ -1254,6 +1250,8 @@
%%WWWDIR%%/tests/objects/test_operation.py
%%WWWDIR%%/tests/parsers/__init__.py
%%WWWDIR%%/tests/parsers/test_parsers.py
+%%WWWDIR%%/tests/planners/__init__.py
+%%WWWDIR%%/tests/planners/test_atomic.py
%%WWWDIR%%/tests/services/__init__.py
%%WWWDIR%%/tests/services/test_app_svc.py
%%WWWDIR%%/tests/services/test_contact_svc.py