fix(host-agent): allow compose PROJECT_ROOT assignment #416

Merged

pdurlej merged 1 commit from codex/fix/host-agent-project-root-assignment into main

2026-05-24 11:35:32 +02:00

codex commented

2026-05-24 11:19:44 +02:00

Collaborator

Canary status: missing — rely on required Forgejo checks; host-agent trust-boundary fix.

Canary Context Pack

Product story

#413 correctly forces Docker Compose interpolation to use /opt/pdurlej-platform/current, but the RS2000 host-agent wrapper still rejected the resulting command because it did not allow a leading PROJECT_ROOT=... assignment before docker compose. Trusted-main apply must be able to run the fixed command without opening the wrapper to arbitrary environment injection.

What changed

Allows exactly one optional leading PROJECT_ROOT=<path> assignment before docker compose after the existing approved cd prefix handling.
Validates the value against /opt/pdurlej-platform/current or the current approved workdir.
Exports only that validated PROJECT_ROOT into the docker compose process.
Keeps arbitrary leading env assignments denied.
Adds wrapper tests for allowed and denied cases.

Why it changed

Read-only RS2000 testing showed platform-host-agent: denied exit 126 for the #413 command shape: cd /opt/pdurlej-platform/current && PROJECT_ROOT=/opt/pdurlej-platform/current docker compose .... Without this wrapper change, #413 cannot take effect through the deploy host-agent path.

Files touched

ops/rs2000/platform-host-agent-wrapper
tests/test_platform_host_agent_wrapper.py

Relevant context

#413 fix(apply): force compose PROJECT_ROOT to remote root
control-plane/platformctl/apply.py now generates PROJECT_ROOT=<remote_root> docker compose ...
platform-host-agent-wrapper is the RS2000 command allowlist boundary.

Runtime evidence

No production mutation in this PR. The failure motivating this PR is a read-only host-agent deny for the generated #413 command shape.

Known constraints

This must not allow arbitrary env assignment prefixes. The accepted surface is intentionally limited to one validated PROJECT_ROOT assignment immediately before docker compose.

Explicit out-of-scope

No production apply.
No runner restart.
No broader host-agent command expansion.
No support for arbitrary environment variables.

Requested decision

Approve and merge so the existing release-root promote/apply path can accept #413's corrected compose command shape.

Merge blockers

Any path where a caller can pass arbitrary env variables through the host-agent wrapper.
Any acceptance of untrusted PROJECT_ROOT values outside /opt/pdurlej-platform/current or the wrapper-approved workdir.

Spec sources read

ops/rs2000/platform-host-agent-wrapper — command allowlist implementation.
tests/test_platform_host_agent_wrapper.py — wrapper behavior contract.
control-plane/platformctl/apply.py — generated #413 compose command shape.
control-plane/platformctl/tests/test_apply_env_file.py and test_apply_phase3.py — expected PROJECT_ROOT command output.

Verification

bash -n ops/rs2000/platform-host-agent-wrapper — pass.
pytest -q tests/test_platform_host_agent_wrapper.py — 17 passed.
pytest -q tests/test_platform_host_agent_wrapper.py control-plane/platformctl/tests/test_apply_env_file.py control-plane/platformctl/tests/test_apply_phase3.py — 75 passed.
git diff --check — pass.

Canary status: missing — rely on required Forgejo checks; host-agent trust-boundary fix. ## Canary Context Pack ### Product story #413 correctly forces Docker Compose interpolation to use `/opt/pdurlej-platform/current`, but the RS2000 host-agent wrapper still rejected the resulting command because it did not allow a leading `PROJECT_ROOT=...` assignment before `docker compose`. Trusted-main apply must be able to run the fixed command without opening the wrapper to arbitrary environment injection. ### What changed - Allows exactly one optional leading `PROJECT_ROOT=<path>` assignment before `docker compose` after the existing approved `cd` prefix handling. - Validates the value against `/opt/pdurlej-platform/current` or the current approved workdir. - Exports only that validated `PROJECT_ROOT` into the `docker compose` process. - Keeps arbitrary leading env assignments denied. - Adds wrapper tests for allowed and denied cases. ### Why it changed Read-only RS2000 testing showed `platform-host-agent: denied exit 126` for the #413 command shape: `cd /opt/pdurlej-platform/current && PROJECT_ROOT=/opt/pdurlej-platform/current docker compose ...`. Without this wrapper change, #413 cannot take effect through the deploy host-agent path. ### Files touched - `ops/rs2000/platform-host-agent-wrapper` - `tests/test_platform_host_agent_wrapper.py` ### Relevant context - #413 `fix(apply): force compose PROJECT_ROOT to remote root` - `control-plane/platformctl/apply.py` now generates `PROJECT_ROOT=<remote_root> docker compose ...` - `platform-host-agent-wrapper` is the RS2000 command allowlist boundary. ### Runtime evidence No production mutation in this PR. The failure motivating this PR is a read-only host-agent deny for the generated #413 command shape. ### Known constraints This must not allow arbitrary env assignment prefixes. The accepted surface is intentionally limited to one validated `PROJECT_ROOT` assignment immediately before `docker compose`. ### Explicit out-of-scope - No production apply. - No runner restart. - No broader host-agent command expansion. - No support for arbitrary environment variables. ### Requested decision Approve and merge so the existing release-root promote/apply path can accept #413's corrected compose command shape. ### Merge blockers - Any path where a caller can pass arbitrary env variables through the host-agent wrapper. - Any acceptance of untrusted `PROJECT_ROOT` values outside `/opt/pdurlej-platform/current` or the wrapper-approved workdir. ## Spec sources read - `ops/rs2000/platform-host-agent-wrapper` — command allowlist implementation. - `tests/test_platform_host_agent_wrapper.py` — wrapper behavior contract. - `control-plane/platformctl/apply.py` — generated #413 compose command shape. - `control-plane/platformctl/tests/test_apply_env_file.py` and `test_apply_phase3.py` — expected `PROJECT_ROOT` command output. ## Verification - `bash -n ops/rs2000/platform-host-agent-wrapper` — pass. - `pytest -q tests/test_platform_host_agent_wrapper.py` — `17 passed`. - `pytest -q tests/test_platform_host_agent_wrapper.py control-plane/platformctl/tests/test_apply_env_file.py control-plane/platformctl/tests/test_apply_phase3.py` — `75 passed`. - `git diff --check` — pass.

codex added 1 commit

2026-05-24 11:19:44 +02:00

fix(host-agent): allow compose PROJECT_ROOT assignment

canary-required / collect-diff (pull_request) Successful in 4s

Details

patchwarden-pr-sanity / collect-diff (pull_request) Successful in 4s

Details

python-ci / Python 3.11 (pull_request) Successful in 40s

Details

python-ci / Python 3.12 (pull_request) Successful in 41s

Details

python-ci / Python 3.13 (pull_request) Successful in 42s