fix: send the tenant the policy package scopes us to, and adopt v2
build_action_request emitted no tenant field at all. The deployed secrets-engine.catalog-lane.lifecycle v2 package reads known_tenant := "tenant:platform" request_tenant := object.get(input, "tenant", "") so an absent tenant is not an ignored field, it matches the wrong_tenant first-denial branch. Every gated action this engine sent would have been denied -- and the omission also produced a request_digest that could match no correctly issued decision, since tenant is hashed material. That is the same class of defect as hashing excluded fields, arriving from the other direction, and again only a real artifact exposed it. Found by answering the GLAS-WP-0015 tenant-alignment question instead of assuming the values lined up. - REQUEST_TENANT is pinned against the vendored allow envelopes, so a package retenanting fails a test rather than denying production. - An empty tenant is refused at build time. - Accepted policy version moves v1 -> v2. v1 had no tenant rule and failed open: a rotate under tenant:coulomb returned allow against the deployed package. flex-auth superseded rather than amended it, because a fail-open correction has to be visible as a version change. A test pins that a v1 decision is refused. - Vendored decision_wrong_tenant_deny.json as the denial evidence glas asked for, with tests that we refuse it on effect before anything else and that a deny legally carries no lifetime. docs/tenant-alignment.md states the three tenant values as this repo holds them. It does not resolve the JWT/store mapping: service_auth.TENANT is tenant:coulomb, which is exactly the value the package denies. That is either two layers sharing a namespace format or one wrong constant, and picking between them without an owner ruling is the fail-open shape GH-DEC-2026-008 rejected for action vocabularies. Both constants stay as they are, deliberately not unified. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01E4tNMAYcSQmZWUE4wqP4ij Assistant: claude-code Assistant-Model: opus Assistant-Process: 715726@bnt-lap001 Assistant-Session: 80a42b32-cba6-4b23-8be0-68819b1a6092
This commit is contained in:
parent
c44306b1b2
commit
80eafafe5b
8 changed files with 418 additions and 27 deletions
|
|
@ -16,8 +16,13 @@ from pathlib import Path
|
|||
|
||||
import pytest
|
||||
|
||||
from types import SimpleNamespace
|
||||
|
||||
from secrets_engine.authorization import (
|
||||
REQUEST_TENANT,
|
||||
approval_binding_digest,
|
||||
build_action_request,
|
||||
digest_material,
|
||||
digest_material,
|
||||
request_digest,
|
||||
validate_decision_envelope,
|
||||
|
|
@ -26,7 +31,7 @@ from secrets_engine.errors import DecisionError
|
|||
|
||||
FIXTURES = Path(__file__).parent / "fixtures" / "flex-auth-replay"
|
||||
|
||||
PACKAGE_DIGEST = "sha256:fe0070b79f66442ae6c218697a49c470c6c8f670aa57a30c078a5284d097bd8c"
|
||||
PACKAGE_DIGEST = "sha256:bd11c5fe77ce6439c65fea225ad6b71d2110efc5e7b5bc9b499c59cd0a53b8b4"
|
||||
SNAPSHOT_DIGEST = "sha256:f5a309bc0b36721fd6d9ad7f53eb21222162bc2eac62a0ab0802a9a1d51340bb"
|
||||
|
||||
CASES = {
|
||||
|
|
@ -116,7 +121,7 @@ def test_real_envelope_validates_against_the_published_package(name):
|
|||
envelope,
|
||||
_request_from(envelope),
|
||||
accepted_policy_packages={"secrets-engine.catalog-lane.lifecycle"},
|
||||
accepted_policy_versions={"v1"},
|
||||
accepted_policy_versions={"v2"},
|
||||
)
|
||||
assert result.action == CASES[name]["action"]
|
||||
assert result.subject_id == "secrets-engine"
|
||||
|
|
@ -156,7 +161,7 @@ def test_expired_real_envelope_fails_closed():
|
|||
envelope,
|
||||
_request_from(envelope),
|
||||
accepted_policy_packages={"secrets-engine.catalog-lane.lifecycle"},
|
||||
accepted_policy_versions={"v1"},
|
||||
accepted_policy_versions={"v2"},
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -264,7 +269,7 @@ def test_decision_validation_ties_the_claim_to_the_approval_binding_digest():
|
|||
envelope,
|
||||
request,
|
||||
accepted_policy_packages={"secrets-engine.catalog-lane.lifecycle"},
|
||||
accepted_policy_versions={"v1"},
|
||||
accepted_policy_versions={"v2"},
|
||||
expected_approval_binding_digest=APPROVAL_BINDING_DIGEST,
|
||||
)
|
||||
assert result.action == "destroy"
|
||||
|
|
@ -274,7 +279,7 @@ def test_decision_validation_ties_the_claim_to_the_approval_binding_digest():
|
|||
envelope,
|
||||
request,
|
||||
accepted_policy_packages={"secrets-engine.catalog-lane.lifecycle"},
|
||||
accepted_policy_versions={"v1"},
|
||||
accepted_policy_versions={"v2"},
|
||||
expected_approval_binding_digest="sha256:" + "c" * 64,
|
||||
)
|
||||
|
||||
|
|
@ -293,7 +298,7 @@ def test_claim_bearing_request_without_a_binding_digest_fails_closed():
|
|||
envelope,
|
||||
request,
|
||||
accepted_policy_packages={"secrets-engine.catalog-lane.lifecycle"},
|
||||
accepted_policy_versions={"v1"},
|
||||
accepted_policy_versions={"v2"},
|
||||
expected_approval_binding_digest=APPROVAL_BINDING_DIGEST,
|
||||
)
|
||||
|
||||
|
|
@ -308,5 +313,119 @@ def test_a_forged_binding_digest_is_recomputed_not_trusted():
|
|||
envelope,
|
||||
request,
|
||||
accepted_policy_packages={"secrets-engine.catalog-lane.lifecycle"},
|
||||
accepted_policy_versions={"v2"},
|
||||
)
|
||||
|
||||
|
||||
# --- tenant scoping (v2) -----------------------------------------------------
|
||||
#
|
||||
# GLAS-WP-0015 asked for the exact CheckRequest tenant and wrong-tenant denial
|
||||
# evidence. These are that evidence, taken from a real deny envelope rather than
|
||||
# asserted, plus the pin that stops our request tenant drifting from the package
|
||||
# it is scoped by.
|
||||
|
||||
WRONG_TENANT_FIXTURE = "decision_wrong_tenant_deny.json"
|
||||
|
||||
|
||||
def test_our_request_tenant_is_the_package_known_tenant():
|
||||
"""The tenant we send must be the one the package allows.
|
||||
|
||||
v2 reads request_tenant := object.get(input, "tenant", "") and allows only
|
||||
known_tenant := "tenant:platform". Pinning our constant against the real
|
||||
allow envelopes means a package retenanting shows up here rather than as a
|
||||
wrong_tenant denial in production.
|
||||
"""
|
||||
for name in ("rotate", "destroy"):
|
||||
assert _envelope(name)["binding"]["tenant"] == REQUEST_TENANT
|
||||
|
||||
|
||||
def test_built_request_carries_the_tenant_and_hashes_it():
|
||||
"""An absent tenant is a denial, not an ignored field, so it must be sent.
|
||||
|
||||
tenant is part of the digest material, so omitting it also produces a digest
|
||||
that matches no correctly issued decision -- the same class of defect as
|
||||
hashing excluded fields, arriving from the other direction.
|
||||
"""
|
||||
entry = SimpleNamespace(id="glas-primary", stage="prod")
|
||||
request = build_action_request(
|
||||
entry,
|
||||
"rotate",
|
||||
subject_id="secrets-engine",
|
||||
subject_type="service",
|
||||
purpose="rotate-exposed-key",
|
||||
fields=["password"],
|
||||
)
|
||||
assert request["tenant"] == REQUEST_TENANT
|
||||
assert "tenant" in digest_material(request)
|
||||
|
||||
untenanted = dict(request)
|
||||
del untenanted["tenant"]
|
||||
assert request_digest(untenanted) != request_digest(request)
|
||||
|
||||
|
||||
def test_build_action_request_refuses_an_empty_tenant():
|
||||
entry = SimpleNamespace(id="glas-primary", stage="prod")
|
||||
with pytest.raises(DecisionError, match="requires a tenant"):
|
||||
build_action_request(
|
||||
entry,
|
||||
"rotate",
|
||||
subject_id="secrets-engine",
|
||||
subject_type="service",
|
||||
purpose="rotate-exposed-key",
|
||||
tenant="",
|
||||
)
|
||||
|
||||
|
||||
def test_wrong_tenant_deny_envelope_fails_closed():
|
||||
"""Wrong-tenant denial evidence, from a real v2 deny envelope.
|
||||
|
||||
flex-auth sent tenant:coulomb on an otherwise-valid rotate and the package
|
||||
denied it with matched_rule wrong_tenant, so the tenant alone carried the
|
||||
denial. Our consumer must refuse it on effect before anything else -- a deny
|
||||
is not a decision we may act on, whatever else it validates.
|
||||
"""
|
||||
# Not lifetime-refreshed: a deny carries no lifetime at all, which is the
|
||||
# property test_wrong_tenant_deny_carries_no_lifetime pins.
|
||||
envelope = json.loads((FIXTURES / WRONG_TENANT_FIXTURE).read_text())
|
||||
assert envelope["effect"] == "deny"
|
||||
assert envelope["reason"] == "wrong_tenant"
|
||||
assert envelope["matched_rule"] == "wrong_tenant"
|
||||
assert envelope["binding"]["tenant"] == "tenant:coulomb"
|
||||
assert envelope["binding"]["tenant"] != REQUEST_TENANT
|
||||
|
||||
with pytest.raises(DecisionError, match="effect is not allow"):
|
||||
validate_decision_envelope(
|
||||
envelope,
|
||||
_request_from(envelope),
|
||||
accepted_policy_packages={"secrets-engine.catalog-lane.lifecycle"},
|
||||
accepted_policy_versions={"v2"},
|
||||
)
|
||||
|
||||
|
||||
def test_wrong_tenant_deny_carries_no_lifetime():
|
||||
"""A deny has no lifetime, which is why effect must be checked first.
|
||||
|
||||
DecisionEnvelope requires lifetime only when effect is allow. A consumer
|
||||
that validated lifetime before effect would raise a confusing missing-field
|
||||
error on a perfectly well-formed denial.
|
||||
"""
|
||||
envelope = json.loads((FIXTURES / WRONG_TENANT_FIXTURE).read_text())
|
||||
assert envelope.get("lifetime") is None
|
||||
|
||||
|
||||
def test_the_superseded_v1_package_is_not_accepted():
|
||||
"""v1 had no tenant rule and failed open; pinning it must not be possible.
|
||||
|
||||
A consumer still pinned to v1 would keep getting allows it should never
|
||||
have had and could not tell from the version string that the rule changed
|
||||
underneath it, which is exactly why flex-auth superseded v1 rather than
|
||||
amending it.
|
||||
"""
|
||||
envelope = _refresh_lifetime(_envelope("rotate"))
|
||||
with pytest.raises(DecisionError, match="policy version is not accepted"):
|
||||
validate_decision_envelope(
|
||||
envelope,
|
||||
_request_from(envelope),
|
||||
accepted_policy_packages={"secrets-engine.catalog-lane.lifecycle"},
|
||||
accepted_policy_versions={"v1"},
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue