fix: [nomad-step-2] S2.1 — vault/policies/*.hcl + tools/vault-apply-policies.sh (#879)
Land the Vault ACL policies and an idempotent apply script. 18 policies:
service-{forgejo,woodpecker}, bot-{dev,review,gardener,architect,planner,
predictor,supervisor,vault,dev-qwen}, runner-{GITHUB,CODEBERG,CLAWHUB,
NPM,DOCKER_HUB}_TOKEN + runner-DEPLOY_KEY, and dispatcher.
tools/vault-apply-policies.sh diffs each file against the on-server
policy text before calling hvault_policy_apply, reporting created /
updated / unchanged per file. --dry-run prints planned names + SHA256
and makes no Vault calls.
vault/policies/AGENTS.md documents the naming convention (service-/
bot-/runner-/dispatcher), the KV path each policy grants, the rationale
for one-policy-per-runner-secret (AD-006 least-privilege at dispatch
time), and what lands in later S2.* issues (#880-#884).
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
a34a478a8e
commit
2d6bdae70b
20 changed files with 501 additions and 0 deletions
66
vault/policies/AGENTS.md
Normal file
66
vault/policies/AGENTS.md
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
# vault/policies/ — Agent Instructions
|
||||
|
||||
HashiCorp Vault ACL policies for the disinto factory. One `.hcl` file per
|
||||
policy; the basename (minus `.hcl`) is the Vault policy name applied to it.
|
||||
Synced into Vault by `tools/vault-apply-policies.sh` (idempotent — see the
|
||||
script header for the contract).
|
||||
|
||||
This directory is part of the **Nomad+Vault migration (Step 2)** — see
|
||||
issues #879–#884. Policies attach to Nomad jobs via workload identity in
|
||||
S2.4; this PR only lands the files + apply script.
|
||||
|
||||
## Naming convention
|
||||
|
||||
| Prefix | Audience | KV scope |
|
||||
|---|---|---|
|
||||
| `service-<name>.hcl` | Long-running platform services (forgejo, woodpecker) | `kv/data/disinto/shared/<name>/*` |
|
||||
| `bot-<name>.hcl` | Per-agent jobs (dev, review, gardener, …) | `kv/data/disinto/bots/<name>/*` + shared forge URL |
|
||||
| `runner-<TOKEN>.hcl` | Per-secret policy for vault-runner ephemeral dispatch | exactly one `kv/data/disinto/runner/<TOKEN>` path |
|
||||
| `dispatcher.hcl` | Long-running edge dispatcher | `kv/data/disinto/runner/*` + `kv/data/disinto/shared/ops-repo/*` |
|
||||
|
||||
The KV mount name `kv/` is the convention this migration uses (mounted as
|
||||
KV v2). Vault addresses KV v2 data at `kv/data/<path>` and metadata at
|
||||
`kv/metadata/<path>` — policies that need `list` always target the
|
||||
`metadata` path; reads target `data`.
|
||||
|
||||
## Policy → KV path summary
|
||||
|
||||
| Policy | Reads |
|
||||
|---|---|
|
||||
| `service-forgejo` | `kv/data/disinto/shared/forgejo/*` |
|
||||
| `service-woodpecker` | `kv/data/disinto/shared/woodpecker/*` |
|
||||
| `bot-<role>` (dev, review, gardener, architect, planner, predictor, supervisor, vault, dev-qwen) | `kv/data/disinto/bots/<role>/*` + `kv/data/disinto/shared/forge/*` |
|
||||
| `runner-<TOKEN>` (GITHUB\_TOKEN, CODEBERG\_TOKEN, CLAWHUB\_TOKEN, DEPLOY\_KEY, NPM\_TOKEN, DOCKER\_HUB\_TOKEN) | `kv/data/disinto/runner/<TOKEN>` (exactly one) |
|
||||
| `dispatcher` | `kv/data/disinto/runner/*` + `kv/data/disinto/shared/ops-repo/*` |
|
||||
|
||||
## Why one policy per runner secret
|
||||
|
||||
`vault-runner` (Step 5) reads each action TOML's `secrets = [...]` list
|
||||
and composes only those `runner-<NAME>` policies onto the per-dispatch
|
||||
ephemeral token. Wildcards or batched policies would hand the runner more
|
||||
secrets than the action declared — defeats AD-006 (least-privilege per
|
||||
external action). Adding a new declarable secret = adding one new
|
||||
`runner-<NAME>.hcl` here + extending the SECRETS allow-list in vault-action
|
||||
validation.
|
||||
|
||||
## Adding a new policy
|
||||
|
||||
1. Drop a file matching one of the four naming patterns above. Use an
|
||||
existing file in the same family as the template — comment header,
|
||||
capability list, and KV path layout should match the family.
|
||||
2. Run `tools/vault-apply-policies.sh --dry-run` to confirm the new
|
||||
basename appears in the planned-work list with the expected SHA.
|
||||
3. Run `tools/vault-apply-policies.sh` against a Vault instance to
|
||||
create it; re-run to confirm it reports `unchanged`.
|
||||
4. The CI fmt + validate step lands in S2.6 (#884). Until then
|
||||
`vault policy fmt <file>` locally is the fastest sanity check.
|
||||
|
||||
## What this directory does NOT own
|
||||
|
||||
- **Attaching policies to Nomad jobs.** That's S2.4 (#882) via the
|
||||
jobspec `template { vault { policies = […] } }` stanza.
|
||||
- **Enabling JWT auth + Nomad workload identity roles.** That's S2.3
|
||||
(#881).
|
||||
- **Writing the secret values themselves.** That's S2.2 (#880) via
|
||||
`tools/vault-import.sh`.
|
||||
- **CI policy fmt + validate + roles.yaml check.** That's S2.6 (#884).
|
||||
16
vault/policies/bot-architect.hcl
Normal file
16
vault/policies/bot-architect.hcl
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# vault/policies/bot-architect.hcl
|
||||
#
|
||||
# Architect agent: reads its own bot KV namespace + the shared forge URL.
|
||||
# Attached to the architect-agent Nomad job via workload identity (S2.4).
|
||||
|
||||
path "kv/data/disinto/bots/architect/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/bots/architect/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
|
||||
path "kv/data/disinto/shared/forge/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
18
vault/policies/bot-dev-qwen.hcl
Normal file
18
vault/policies/bot-dev-qwen.hcl
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
# vault/policies/bot-dev-qwen.hcl
|
||||
#
|
||||
# Local-Qwen dev agent (agents-llama profile): reads its own bot KV
|
||||
# namespace + the shared forge URL. Attached to the dev-qwen Nomad job
|
||||
# via workload identity (S2.4). KV path mirrors the bot basename:
|
||||
# kv/disinto/bots/dev-qwen/*.
|
||||
|
||||
path "kv/data/disinto/bots/dev-qwen/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/bots/dev-qwen/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
|
||||
path "kv/data/disinto/shared/forge/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
16
vault/policies/bot-dev.hcl
Normal file
16
vault/policies/bot-dev.hcl
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# vault/policies/bot-dev.hcl
|
||||
#
|
||||
# Dev agent: reads its own bot KV namespace + the shared forge URL.
|
||||
# Attached to the dev-agent Nomad job via workload identity (S2.4).
|
||||
|
||||
path "kv/data/disinto/bots/dev/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/bots/dev/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
|
||||
path "kv/data/disinto/shared/forge/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
16
vault/policies/bot-gardener.hcl
Normal file
16
vault/policies/bot-gardener.hcl
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# vault/policies/bot-gardener.hcl
|
||||
#
|
||||
# Gardener agent: reads its own bot KV namespace + the shared forge URL.
|
||||
# Attached to the gardener-agent Nomad job via workload identity (S2.4).
|
||||
|
||||
path "kv/data/disinto/bots/gardener/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/bots/gardener/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
|
||||
path "kv/data/disinto/shared/forge/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
16
vault/policies/bot-planner.hcl
Normal file
16
vault/policies/bot-planner.hcl
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# vault/policies/bot-planner.hcl
|
||||
#
|
||||
# Planner agent: reads its own bot KV namespace + the shared forge URL.
|
||||
# Attached to the planner-agent Nomad job via workload identity (S2.4).
|
||||
|
||||
path "kv/data/disinto/bots/planner/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/bots/planner/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
|
||||
path "kv/data/disinto/shared/forge/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
16
vault/policies/bot-predictor.hcl
Normal file
16
vault/policies/bot-predictor.hcl
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# vault/policies/bot-predictor.hcl
|
||||
#
|
||||
# Predictor agent: reads its own bot KV namespace + the shared forge URL.
|
||||
# Attached to the predictor-agent Nomad job via workload identity (S2.4).
|
||||
|
||||
path "kv/data/disinto/bots/predictor/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/bots/predictor/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
|
||||
path "kv/data/disinto/shared/forge/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
16
vault/policies/bot-review.hcl
Normal file
16
vault/policies/bot-review.hcl
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# vault/policies/bot-review.hcl
|
||||
#
|
||||
# Review agent: reads its own bot KV namespace + the shared forge URL.
|
||||
# Attached to the review-agent Nomad job via workload identity (S2.4).
|
||||
|
||||
path "kv/data/disinto/bots/review/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/bots/review/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
|
||||
path "kv/data/disinto/shared/forge/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
16
vault/policies/bot-supervisor.hcl
Normal file
16
vault/policies/bot-supervisor.hcl
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# vault/policies/bot-supervisor.hcl
|
||||
#
|
||||
# Supervisor agent: reads its own bot KV namespace + the shared forge URL.
|
||||
# Attached to the supervisor-agent Nomad job via workload identity (S2.4).
|
||||
|
||||
path "kv/data/disinto/bots/supervisor/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/bots/supervisor/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
|
||||
path "kv/data/disinto/shared/forge/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
20
vault/policies/bot-vault.hcl
Normal file
20
vault/policies/bot-vault.hcl
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
# vault/policies/bot-vault.hcl
|
||||
#
|
||||
# Vault agent (the legacy edge dispatcher / vault-action runner): reads its
|
||||
# own bot KV namespace + the shared forge URL. Attached to the vault-agent
|
||||
# Nomad job via workload identity (S2.4).
|
||||
#
|
||||
# NOTE: distinct from the runner-* policies, which gate per-secret access
|
||||
# for vault-runner ephemeral dispatches (Step 5).
|
||||
|
||||
path "kv/data/disinto/bots/vault/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/bots/vault/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
|
||||
path "kv/data/disinto/shared/forge/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
29
vault/policies/dispatcher.hcl
Normal file
29
vault/policies/dispatcher.hcl
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
# vault/policies/dispatcher.hcl
|
||||
#
|
||||
# Edge dispatcher policy: needs to enumerate the runner secret namespace
|
||||
# (to check secret presence before dispatching) and read the shared
|
||||
# ops-repo credentials (token + clone URL) it uses to fetch action TOMLs.
|
||||
#
|
||||
# Scope:
|
||||
# - kv/disinto/runner/* — read all per-secret values + list keys
|
||||
# - kv/disinto/shared/ops-repo/* — read the ops-repo creds bundle
|
||||
#
|
||||
# The actual ephemeral runner container created per dispatch gets the
|
||||
# narrow runner-<NAME> policies, NOT this one. This policy stays bound
|
||||
# to the long-running dispatcher only.
|
||||
|
||||
path "kv/data/disinto/runner/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/runner/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
|
||||
path "kv/data/disinto/shared/ops-repo/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/shared/ops-repo/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
10
vault/policies/runner-CLAWHUB_TOKEN.hcl
Normal file
10
vault/policies/runner-CLAWHUB_TOKEN.hcl
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
# vault/policies/runner-CLAWHUB_TOKEN.hcl
|
||||
#
|
||||
# Per-secret runner policy: ClawHub token for skill-registry publish.
|
||||
# vault-runner (Step 5) composes only the runner-* policies named by the
|
||||
# dispatching action's `secrets = [...]` list, so this policy intentionally
|
||||
# scopes a single KV path — no wildcards, no list capability.
|
||||
|
||||
path "kv/data/disinto/runner/CLAWHUB_TOKEN" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
10
vault/policies/runner-CODEBERG_TOKEN.hcl
Normal file
10
vault/policies/runner-CODEBERG_TOKEN.hcl
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
# vault/policies/runner-CODEBERG_TOKEN.hcl
|
||||
#
|
||||
# Per-secret runner policy: Codeberg PAT for upstream-repo mirror push.
|
||||
# vault-runner (Step 5) composes only the runner-* policies named by the
|
||||
# dispatching action's `secrets = [...]` list, so this policy intentionally
|
||||
# scopes a single KV path — no wildcards, no list capability.
|
||||
|
||||
path "kv/data/disinto/runner/CODEBERG_TOKEN" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
10
vault/policies/runner-DEPLOY_KEY.hcl
Normal file
10
vault/policies/runner-DEPLOY_KEY.hcl
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
# vault/policies/runner-DEPLOY_KEY.hcl
|
||||
#
|
||||
# Per-secret runner policy: SSH deploy key for git push to a release target.
|
||||
# vault-runner (Step 5) composes only the runner-* policies named by the
|
||||
# dispatching action's `secrets = [...]` list, so this policy intentionally
|
||||
# scopes a single KV path — no wildcards, no list capability.
|
||||
|
||||
path "kv/data/disinto/runner/DEPLOY_KEY" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
10
vault/policies/runner-DOCKER_HUB_TOKEN.hcl
Normal file
10
vault/policies/runner-DOCKER_HUB_TOKEN.hcl
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
# vault/policies/runner-DOCKER_HUB_TOKEN.hcl
|
||||
#
|
||||
# Per-secret runner policy: Docker Hub access token for image push.
|
||||
# vault-runner (Step 5) composes only the runner-* policies named by the
|
||||
# dispatching action's `secrets = [...]` list, so this policy intentionally
|
||||
# scopes a single KV path — no wildcards, no list capability.
|
||||
|
||||
path "kv/data/disinto/runner/DOCKER_HUB_TOKEN" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
10
vault/policies/runner-GITHUB_TOKEN.hcl
Normal file
10
vault/policies/runner-GITHUB_TOKEN.hcl
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
# vault/policies/runner-GITHUB_TOKEN.hcl
|
||||
#
|
||||
# Per-secret runner policy: GitHub PAT for cross-mirror push / API calls.
|
||||
# vault-runner (Step 5) composes only the runner-* policies named by the
|
||||
# dispatching action's `secrets = [...]` list, so this policy intentionally
|
||||
# scopes a single KV path — no wildcards, no list capability.
|
||||
|
||||
path "kv/data/disinto/runner/GITHUB_TOKEN" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
10
vault/policies/runner-NPM_TOKEN.hcl
Normal file
10
vault/policies/runner-NPM_TOKEN.hcl
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
# vault/policies/runner-NPM_TOKEN.hcl
|
||||
#
|
||||
# Per-secret runner policy: npm registry auth token for package publish.
|
||||
# vault-runner (Step 5) composes only the runner-* policies named by the
|
||||
# dispatching action's `secrets = [...]` list, so this policy intentionally
|
||||
# scopes a single KV path — no wildcards, no list capability.
|
||||
|
||||
path "kv/data/disinto/runner/NPM_TOKEN" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
15
vault/policies/service-forgejo.hcl
Normal file
15
vault/policies/service-forgejo.hcl
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
# vault/policies/service-forgejo.hcl
|
||||
#
|
||||
# Read-only access to shared Forgejo secrets (admin password, OAuth client
|
||||
# config). Attached to the Forgejo Nomad job via workload identity (S2.4).
|
||||
#
|
||||
# Scope: kv/disinto/shared/forgejo/* — entries owned by the operator and
|
||||
# shared between forgejo + the chat OAuth client (issue #855 lineage).
|
||||
|
||||
path "kv/data/disinto/shared/forgejo/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/shared/forgejo/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
15
vault/policies/service-woodpecker.hcl
Normal file
15
vault/policies/service-woodpecker.hcl
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
# vault/policies/service-woodpecker.hcl
|
||||
#
|
||||
# Read-only access to shared Woodpecker secrets (agent secret, forge OAuth
|
||||
# client). Attached to the Woodpecker Nomad job via workload identity (S2.4).
|
||||
#
|
||||
# Scope: kv/disinto/shared/woodpecker/* — entries owned by the operator
|
||||
# and consumed by woodpecker-server + woodpecker-agent.
|
||||
|
||||
path "kv/data/disinto/shared/woodpecker/*" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "kv/metadata/disinto/shared/woodpecker/*" {
|
||||
capabilities = ["list", "read"]
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue