pdurlej/platform

Fork 0

fix(platformctl): add tamper-evident plan hash #640

Merged

pdurlej merged 1 commit from codex/m06-plan-payload-hash into main

2026-05-30 15:20:37 +02:00

codex commented

2026-05-30 15:06:12 +02:00

Collaborator

Canary status: missing — fire canary 3+3 manually before merge

Canary Context Pack

Product story

A plan file should be tamper-evident after generation. source_sha proves the checkout; plan_hash proves the artifact payload has not been edited before apply.

What changed

Added canonical plan_hash generation in platformctl plan and hash verification in platformctl apply before runtime gates.

Why it changed

Issue #193 continues the provenance hardening segment after #192. This prevents post-generation plan mutation from silently reaching apply.

Files touched

control-plane/platformctl/plan.py
control-plane/platformctl/apply.py
control-plane/platformctl/tests/test_plan_phase3.py
control-plane/platformctl/tests/test_apply_phase3.py
control-plane/platformctl/tests/test_apply_env_file.py

Relevant context

Issue #193: PROVENANCE-HASH-01
Issue #192: git-root provenance anchor already merged
Issue #194: adversarial matrix follows after hash/provenance primitives

Runtime evidence

No runtime mutation. Local validation only.

Known constraints

The hash excludes the top-level plan_hash field and uses canonical JSON with sorted keys and compact separators.

Explicit out-of-scope

No adversarial test matrix yet (#194)
No runtime apply or service restart
No schema migration beyond adding the plan hash field to generated artifacts

Requested decision

Approve merge if tests and Patchwarden checks are green.

Merge blockers

Apply accepts a tampered plan payload
Apply rejects valid freshly-generated plans
Approved SHA fields or existing provenance checks regress

Spec sources read

Forgejo issue #193
docs/forgejo-agent-operations.md
control-plane/platformctl/plan.py
control-plane/platformctl/apply.py
control-plane/platformctl/tests/test_plan_phase3.py
control-plane/platformctl/tests/test_apply_phase3.py
control-plane/platformctl/tests/test_apply_env_file.py

Validation

PYTHONPATH=control-plane control-plane/.venv/bin/python -m pytest control-plane/platformctl/tests/test_plan_phase3.py control-plane/platformctl/tests/test_apply_phase3.py control-plane/platformctl/tests/test_apply_env_file.py — 87 passed
PYTHONPATH=control-plane control-plane/.venv/bin/python -m platformctl.cli validate all --json — passed

Closes #193

Canary status: missing — fire canary 3+3 manually before merge ## Canary Context Pack ### Product story A plan file should be tamper-evident after generation. `source_sha` proves the checkout; `plan_hash` proves the artifact payload has not been edited before apply. ### What changed Added canonical `plan_hash` generation in `platformctl plan` and hash verification in `platformctl apply` before runtime gates. ### Why it changed Issue #193 continues the provenance hardening segment after #192. This prevents post-generation plan mutation from silently reaching apply. ### Files touched - `control-plane/platformctl/plan.py` - `control-plane/platformctl/apply.py` - `control-plane/platformctl/tests/test_plan_phase3.py` - `control-plane/platformctl/tests/test_apply_phase3.py` - `control-plane/platformctl/tests/test_apply_env_file.py` ### Relevant context - Issue #193: PROVENANCE-HASH-01 - Issue #192: git-root provenance anchor already merged - Issue #194: adversarial matrix follows after hash/provenance primitives ### Runtime evidence No runtime mutation. Local validation only. ### Known constraints The hash excludes the top-level `plan_hash` field and uses canonical JSON with sorted keys and compact separators. ### Explicit out-of-scope - No adversarial test matrix yet (#194) - No runtime apply or service restart - No schema migration beyond adding the plan hash field to generated artifacts ### Requested decision Approve merge if tests and Patchwarden checks are green. ### Merge blockers - Apply accepts a tampered plan payload - Apply rejects valid freshly-generated plans - Approved SHA fields or existing provenance checks regress ## Spec sources read - Forgejo issue #193 - `docs/forgejo-agent-operations.md` - `control-plane/platformctl/plan.py` - `control-plane/platformctl/apply.py` - `control-plane/platformctl/tests/test_plan_phase3.py` - `control-plane/platformctl/tests/test_apply_phase3.py` - `control-plane/platformctl/tests/test_apply_env_file.py` ## Validation - `PYTHONPATH=control-plane control-plane/.venv/bin/python -m pytest control-plane/platformctl/tests/test_plan_phase3.py control-plane/platformctl/tests/test_apply_phase3.py control-plane/platformctl/tests/test_apply_env_file.py` — 87 passed - `PYTHONPATH=control-plane control-plane/.venv/bin/python -m platformctl.cli validate all --json` — passed Closes #193

codex added 1 commit

2026-05-30 15:06:13 +02:00

fix(platformctl): add tamper-evident plan hash

platformctl plan / auto-apply scope (pull_request) Successful in 26s

Details

pyfallow / Pyfallow gate (control-plane) (pull_request) Successful in 23s

Details

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

Details

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

Details

base-is-main / guard (pull_request) Successful in 2s

Details

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

Details

patchwarden-client-dry-run / collect-diff (pull_request) Successful in 5s

Details

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

Details

canary-required / canary (pull_request) Successful in 17s

Details

patchwarden-client-dry-run / dry-run (pull_request) Successful in 24s

Details

patchwarden-pr-sanity / sanity (pull_request) Successful in 4m27s

Details

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

Details

d4c920c628

codex added the

class/security-sensitive

label

2026-05-30 15:06:13 +02:00

codex commented

2026-05-30 15:14:50 +02:00

Author

Collaborator

Patchwarden PR sanity

Status: eligible_sanity_clean
PR: 640
Commit: d4c920c6289376dcd57521bb806d7a6959f62f12
Security-sensitive label: present
Authority: advisory model review plus deterministic blockers only
3+3 canary: still alive; this does not replace it

Deterministic findings

info sensitive-path-touched Sensitive path touched — control-plane/platformctl/apply.py
- Evidence: control-plane/platformctl/apply.py
- Next: Route through the existing 3+3/risk-tier process; model review remains advisory.

Model reviewers

`global-glm` / `glm-5.1:cloud`

Status: ok
Verdict: OK
low Hash validation failure uses EXIT_APPROVAL_MISMATCH exit code
- Evidence: control-plane/platformctl/apply.py lines 637-644: validate_plan_hash error returns EXIT_APPROVAL_MISMATCH, same as approval gate failure
- Next: Consider adding a distinct exit code (e.g., EXIT_PLAN_INTEGRITY) in a follow-up to improve observability and allow callers to distinguish approval failures from tamper evidence

`global-deepseek` / `deepseek-v4-pro:cloud`

Status: ok
Verdict: OK
low Non-recursive canonical JSON may cause hash mismatch on nested key reordering
- Evidence: control-plane/platformctl/plan.py: _canonical_plan_jsonusesjson.dumps(payload, sort_keys=True, ...), which sorts only top-level keys. Nested dicts (e.g., inside changes list) retain insertion order. If the plan is deserialized and r
- Next: Use a recursive sort or a canonical JSON library (e.g., canonicaljson) to ensure deterministic hashing across environments.
low Hash validation reuses EXIT_APPROVAL_MISMATCH exit code
- Evidence: control-plane/platformctl/apply.py: validate_plan_hashfailure returnsEXIT_APPROVAL_MISMATCH, conflating hash integrity errors with approval mismatches in automation that relies on exit codes.
- Next: Introduce a distinct exit code for plan hash validation failures to improve error handling clarity.

`redteam` / `kimi-k2.6:cloud`

Status: error
Verdict: -
Note: ReadTimeout: The read operation timed out
Findings: none

Policy notes

GLM 5.1 + DeepSeek V4 Pro are the operator-required model mix for this bot.
Optional red-team model is enabled only when PLATFORMCTL_PR_SANITY_REDTEAM_MODEL is configured.
Auto-merge is not enabled here.

# Patchwarden PR sanity - Status: `eligible_sanity_clean` - PR: `640` - Commit: `d4c920c6289376dcd57521bb806d7a6959f62f12` - Security-sensitive label: `present` - Authority: advisory model review plus deterministic blockers only - 3+3 canary: still alive; this does not replace it ## Deterministic findings - **`info` `sensitive-path-touched`** Sensitive path touched — `control-plane/platformctl/apply.py` - Evidence: `control-plane/platformctl/apply.py` - Next: Route through the existing 3+3/risk-tier process; model review remains advisory. ## Model reviewers ### `global-glm` / `glm-5.1:cloud` - Status: `ok` - Verdict: `OK` - **`low`** Hash validation failure uses EXIT_APPROVAL_MISMATCH exit code - Evidence: `control-plane/platformctl/apply.py lines 637-644: validate_plan_hash error returns EXIT_APPROVAL_MISMATCH, same as approval gate failure` - Next: Consider adding a distinct exit code (e.g., EXIT_PLAN_INTEGRITY) in a follow-up to improve observability and allow callers to distinguish approval failures from tamper evidence ### `global-deepseek` / `deepseek-v4-pro:cloud` - Status: `ok` - Verdict: `OK` - **`low`** Non-recursive canonical JSON may cause hash mismatch on nested key reordering - Evidence: `control-plane/platformctl/plan.py: `_canonical_plan_json` uses `json.dumps(payload, sort_keys=True, ...)`, which sorts only top-level keys. Nested dicts (e.g., inside `changes` list) retain insertion order. If the plan is deserialized and r` - Next: Use a recursive sort or a canonical JSON library (e.g., `canonicaljson`) to ensure deterministic hashing across environments. - **`low`** Hash validation reuses EXIT_APPROVAL_MISMATCH exit code - Evidence: `control-plane/platformctl/apply.py: `validate_plan_hash` failure returns `EXIT_APPROVAL_MISMATCH`, conflating hash integrity errors with approval mismatches in automation that relies on exit codes.` - Next: Introduce a distinct exit code for plan hash validation failures to improve error handling clarity. ### `redteam` / `kimi-k2.6:cloud` - Status: `error` - Verdict: `-` - Note: ReadTimeout: The read operation timed out - Findings: none ## Policy notes - GLM 5.1 + DeepSeek V4 Pro are the operator-required model mix for this bot. - Optional red-team model is enabled only when `PLATFORMCTL_PR_SANITY_REDTEAM_MODEL` is configured. - Auto-merge is not enabled here.