M2 of the remaining-hierarchies work. `pic apply --dir` now owns the org-tree
SHAPE, not just node content: a `[group]` manifest for a group that doesn't
exist is CREATED under its declared parent, and an existing group whose declared
parent changed is REPARENTED — all inside the single tree-apply transaction
(create + reparent; structural prune is deferred to M3 with the ownership layer).
group_repo: extract transaction-aware structural mutations — `create_group_tx`,
`reparent_group_tx` (the ancestor-walk cycle guard, now reading through the tx so
it sees in-tx writes), `delete_group_tx`, and `acquire_structural_lock_tx`. The
trait `create`/`reparent`/`delete` delegate to them (one SQL definition,
behavior-preserving: the coarse structural advisory lock + structure_version
bump + delete=RESTRICT all preserved).
apply_service: `TreeNode` gains `parent_slug` + `name`. `prepare_tree` classifies
group nodes into existing (resolved id, maybe reparent) vs to-create (absent →
deferred), returning a `PreparedTree { prepared, creates, reparents, token }`.
`apply_tree` adds Phase 0 (`reconcile_tree_structure_tx`): create absent groups
parent-first (topo loop with cycle/unresolved-parent detection) and reparent
existing ones, then Phase A/B reconcile content as before. A to-create group
reconciles against an empty CurrentState (all-Create) — so it needs no DB read
and sidesteps the pool-vs-tx coupling. The bound-plan token folds a
declared-absent marker, so a group created out-of-band between plan and apply
trips StateMoved.
authz (apply_api `authz_tree`): a to-create group mirrors the interactive create
gate — root-level needs `InstanceCreateGroup`, a subgroup under an existing
parent needs only `GroupAdmin(parent)`; a reparent needs `GroupAdmin` at the
group, the SOURCE parent, and the DESTINATION parent (§5.6, parity with
`reparent_group`). No 404 on a to-create node.
CLI: `[group] parent` manifest key (else the parent is inferred from the nearest
ancestor directory's group); `build_tree` emits `parent_slug` + `name` per group
node; the apply report shows a `groups +N reparented M` line.
Reviewed by subagent (core mechanism verified sound: topo termination, empty-
CurrentState reconcile, in-tx cycle guard, atomicity, StateMoved, idempotency);
fixed the two authz-parity gaps it found (missing source-parent check on
reparent; over-gated subgroup create). Tests: a new `tree_shape` journey
(create + reparent + no-op re-plan); 393 manager-core lib + the Phase-5 tree/
group/ext journeys all green; clippy -D warnings clean.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
506 lines
18 KiB
Rust
506 lines
18 KiB
Rust
//! Admin HTTP surface for the declarative reconcile engine.
|
|
//!
|
|
//! `POST /api/v1/admin/apps/{id}/plan` — diff a desired-state bundle
|
|
//! against the app's live state and return the plan. Read-only; requires
|
|
//! `AppRead`. The `apply` route (write path) lands in the next milestone.
|
|
|
|
use axum::{
|
|
extract::{Path, State},
|
|
http::StatusCode,
|
|
response::{IntoResponse, Response},
|
|
routing::{get, post},
|
|
Extension, Json, Router,
|
|
};
|
|
use picloud_shared::{AppId, GroupId, Principal};
|
|
use serde::Deserialize;
|
|
use serde_json::json;
|
|
|
|
use crate::app_repo::AppRepository;
|
|
use crate::apply_service::{
|
|
ApplyError, ApplyOwner, ApplyReport, ApplyService, Bundle, BundleTrigger, ExtPointView,
|
|
NodeKind, PlanResult, TreeBundle, TreePlanResult,
|
|
};
|
|
use crate::authz::{require, AuthzDenied, Capability};
|
|
use crate::group_repo::GroupRepository;
|
|
|
|
/// Build the apply/plan router. Mounted under `/api/v1/admin`.
|
|
pub fn apply_router(service: ApplyService) -> Router {
|
|
Router::new()
|
|
.route("/apps/{id}/plan", post(plan_handler))
|
|
.route("/apps/{id}/apply", post(apply_handler))
|
|
.route("/groups/{id}/plan", post(group_plan_handler))
|
|
.route("/groups/{id}/apply", post(group_apply_handler))
|
|
.route("/apps/{id}/extension-points", get(app_ext_points_handler))
|
|
.route(
|
|
"/groups/{id}/extension-points",
|
|
get(group_ext_points_handler),
|
|
)
|
|
.route("/tree/plan", post(tree_plan_handler))
|
|
.route("/tree/apply", post(tree_apply_handler))
|
|
.with_state(service)
|
|
}
|
|
|
|
/// `GET .../apps/{id}/extension-points` — list the app's OWN extension-point
|
|
/// declarations (for `pic pull`). Read-only; viewer-tier (`AppRead`).
|
|
async fn app_ext_points_handler(
|
|
State(svc): State<ApplyService>,
|
|
Extension(principal): Extension<Principal>,
|
|
Path(id_or_slug): Path<String>,
|
|
) -> Result<Json<Vec<ExtPointView>>, ApplyError> {
|
|
let app_id = resolve_app_id(svc.apps.as_ref(), &id_or_slug).await?;
|
|
require(svc.authz.as_ref(), &principal, Capability::AppRead(app_id))
|
|
.await
|
|
.map_err(map_authz)?;
|
|
Ok(Json(
|
|
svc.list_extension_points(ApplyOwner::App(app_id)).await?,
|
|
))
|
|
}
|
|
|
|
/// `GET .../groups/{id}/extension-points` — list the group's OWN extension-point
|
|
/// declarations. Read-only; viewer-tier (`GroupScriptsRead`).
|
|
async fn group_ext_points_handler(
|
|
State(svc): State<ApplyService>,
|
|
Extension(principal): Extension<Principal>,
|
|
Path(id_or_slug): Path<String>,
|
|
) -> Result<Json<Vec<ExtPointView>>, ApplyError> {
|
|
let group_id = resolve_group_id(svc.groups.as_ref(), &id_or_slug).await?;
|
|
require(
|
|
svc.authz.as_ref(),
|
|
&principal,
|
|
Capability::GroupScriptsRead(group_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
Ok(Json(
|
|
svc.list_extension_points(ApplyOwner::Group(group_id))
|
|
.await?,
|
|
))
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
pub struct ApplyRequest {
|
|
pub bundle: Bundle,
|
|
#[serde(default)]
|
|
pub prune: bool,
|
|
/// Optional bound-plan token from a prior `plan`. When present, apply
|
|
/// refuses (409) if the app's live state has changed since.
|
|
#[serde(default)]
|
|
pub expected_token: Option<String>,
|
|
}
|
|
|
|
async fn apply_handler(
|
|
State(svc): State<ApplyService>,
|
|
Extension(principal): Extension<Principal>,
|
|
Path(id_or_slug): Path<String>,
|
|
Json(req): Json<ApplyRequest>,
|
|
) -> Result<Json<ApplyReport>, ApplyError> {
|
|
let app_id = resolve_app_id(svc.apps.as_ref(), &id_or_slug).await?;
|
|
require_app_node_writes(&svc, &principal, app_id, &req.bundle, req.prune).await?;
|
|
let report = svc
|
|
.apply(
|
|
app_id,
|
|
&req.bundle,
|
|
req.prune,
|
|
principal.user_id,
|
|
req.expected_token.as_deref(),
|
|
)
|
|
.await?;
|
|
Ok(Json(report))
|
|
}
|
|
|
|
async fn plan_handler(
|
|
State(svc): State<ApplyService>,
|
|
Extension(principal): Extension<Principal>,
|
|
Path(id_or_slug): Path<String>,
|
|
Json(bundle): Json<Bundle>,
|
|
) -> Result<Json<PlanResult>, ApplyError> {
|
|
let app_id = resolve_app_id(svc.apps.as_ref(), &id_or_slug).await?;
|
|
// NOTE: the returned `Plan` discloses live secret NAMES (not values). That
|
|
// is safe today only because `AppRead` and `AppSecretsRead` are co-granted
|
|
// at every tier (same `script:read` scope, both in the viewer role). If a
|
|
// future authz split puts `AppSecretsRead` on its own tier, this handler
|
|
// must additionally require it — otherwise it leaks names a principal
|
|
// couldn't enumerate via the secrets API.
|
|
require(svc.authz.as_ref(), &principal, Capability::AppRead(app_id))
|
|
.await
|
|
.map_err(map_authz)?;
|
|
let plan = svc.plan(app_id, &bundle).await?;
|
|
Ok(Json(plan))
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Group node apply (Phase 5): a group declares only scripts + vars (+ secret
|
|
// names). The bundle reuses the app `Bundle` shape with empty routes/triggers;
|
|
// the service rejects routes/triggers on a group node.
|
|
// ----------------------------------------------------------------------------
|
|
|
|
async fn group_plan_handler(
|
|
State(svc): State<ApplyService>,
|
|
Extension(principal): Extension<Principal>,
|
|
Path(id_or_slug): Path<String>,
|
|
Json(bundle): Json<Bundle>,
|
|
) -> Result<Json<PlanResult>, ApplyError> {
|
|
let group_id = resolve_group_id(svc.groups.as_ref(), &id_or_slug).await?;
|
|
// Plan discloses the group's script + var + secret names; viewer-tier reads.
|
|
require(
|
|
svc.authz.as_ref(),
|
|
&principal,
|
|
Capability::GroupScriptsRead(group_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
let plan = svc.plan_owner(ApplyOwner::Group(group_id), &bundle).await?;
|
|
Ok(Json(plan))
|
|
}
|
|
|
|
async fn group_apply_handler(
|
|
State(svc): State<ApplyService>,
|
|
Extension(principal): Extension<Principal>,
|
|
Path(id_or_slug): Path<String>,
|
|
Json(req): Json<ApplyRequest>,
|
|
) -> Result<Json<ApplyReport>, ApplyError> {
|
|
let group_id = resolve_group_id(svc.groups.as_ref(), &id_or_slug).await?;
|
|
require_group_node_writes(&svc, &principal, group_id, &req.bundle, req.prune).await?;
|
|
let report = svc
|
|
.apply_owner(
|
|
ApplyOwner::Group(group_id),
|
|
&req.bundle,
|
|
req.prune,
|
|
principal.user_id,
|
|
req.expected_token.as_deref(),
|
|
)
|
|
.await?;
|
|
Ok(Json(report))
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Tree apply (Phase 5): a whole project subtree in one transaction. The actor
|
|
// must hold the relevant read/write caps for EVERY node touched.
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#[derive(Deserialize)]
|
|
struct TreeApplyRequest {
|
|
bundle: TreeBundle,
|
|
#[serde(default)]
|
|
prune: bool,
|
|
#[serde(default)]
|
|
expected_token: Option<String>,
|
|
}
|
|
|
|
async fn tree_plan_handler(
|
|
State(svc): State<ApplyService>,
|
|
Extension(principal): Extension<Principal>,
|
|
Json(bundle): Json<TreeBundle>,
|
|
) -> Result<Json<TreePlanResult>, ApplyError> {
|
|
authz_tree(&svc, &principal, &bundle, None).await?;
|
|
Ok(Json(svc.plan_tree(&bundle).await?))
|
|
}
|
|
|
|
async fn tree_apply_handler(
|
|
State(svc): State<ApplyService>,
|
|
Extension(principal): Extension<Principal>,
|
|
Json(req): Json<TreeApplyRequest>,
|
|
) -> Result<Json<ApplyReport>, ApplyError> {
|
|
authz_tree(&svc, &principal, &req.bundle, Some(req.prune)).await?;
|
|
let report = svc
|
|
.apply_tree(
|
|
&req.bundle,
|
|
req.prune,
|
|
principal.user_id,
|
|
req.expected_token.as_deref(),
|
|
)
|
|
.await?;
|
|
Ok(Json(report))
|
|
}
|
|
|
|
/// Per-node capability check for a tree plan/apply. `prune` widens an apply's
|
|
/// write requirement to every kind. A plan (`prune` ignored, no writes) needs
|
|
/// only the per-node read cap.
|
|
#[allow(clippy::too_many_lines)]
|
|
async fn authz_tree(
|
|
svc: &ApplyService,
|
|
principal: &Principal,
|
|
bundle: &TreeBundle,
|
|
apply_prune: Option<bool>,
|
|
) -> Result<(), ApplyError> {
|
|
for node in &bundle.nodes {
|
|
match node.kind {
|
|
NodeKind::App => {
|
|
let app_id = resolve_app_id(svc.apps.as_ref(), &node.slug).await?;
|
|
match apply_prune {
|
|
Some(prune) => {
|
|
require_app_node_writes(svc, principal, app_id, &node.bundle, prune)
|
|
.await?;
|
|
}
|
|
None => {
|
|
require(svc.authz.as_ref(), principal, Capability::AppRead(app_id))
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
}
|
|
}
|
|
NodeKind::Group => {
|
|
let existing = svc
|
|
.groups
|
|
.get_by_slug(&node.slug)
|
|
.await
|
|
.map_err(|e| ApplyError::Backend(e.to_string()))?;
|
|
let Some(g) = existing else {
|
|
// To-create group (M2): mirror the interactive create gate
|
|
// (`groups_api::create_group`). A root-level group (no
|
|
// resolvable parent) needs `InstanceCreateGroup`; a subgroup
|
|
// under an EXISTING parent needs only `GroupAdmin(parent)`.
|
|
// A parent that is itself to-create has no id yet → fall
|
|
// back to `InstanceCreateGroup`.
|
|
let parent = match &node.parent_slug {
|
|
Some(p) => svc
|
|
.groups
|
|
.get_by_slug(p)
|
|
.await
|
|
.map_err(|e| ApplyError::Backend(e.to_string()))?,
|
|
None => None,
|
|
};
|
|
match parent {
|
|
Some(pg) => {
|
|
require(svc.authz.as_ref(), principal, Capability::GroupAdmin(pg.id))
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
None => {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::InstanceCreateGroup,
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
}
|
|
continue;
|
|
};
|
|
let group_id = g.id;
|
|
match apply_prune {
|
|
Some(prune) => {
|
|
require_group_node_writes(svc, principal, group_id, &node.bundle, prune)
|
|
.await?;
|
|
// Reparent: an explicit parent differing from the live
|
|
// one needs GroupAdmin at the group, the SOURCE parent,
|
|
// and the DESTINATION parent — mirroring the interactive
|
|
// `reparent_group` (§5.6 triply-gated).
|
|
if let Some(parent) = &node.parent_slug {
|
|
if let Some(pg) = svc
|
|
.groups
|
|
.get_by_slug(parent)
|
|
.await
|
|
.map_err(|e| ApplyError::Backend(e.to_string()))?
|
|
{
|
|
if Some(pg.id) != g.parent_id {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::GroupAdmin(group_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
if let Some(src) = g.parent_id {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::GroupAdmin(src),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::GroupAdmin(pg.id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
None => {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::GroupScriptsRead(group_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// App-node write caps: per resource kind the bundle touches, widened to all
|
|
/// kinds when `prune` (which deletes empty-section resources + cascades). Read
|
|
/// is always needed. Shared by the single-app and tree apply paths.
|
|
async fn require_app_node_writes(
|
|
svc: &ApplyService,
|
|
principal: &Principal,
|
|
app_id: picloud_shared::AppId,
|
|
bundle: &Bundle,
|
|
prune: bool,
|
|
) -> Result<(), ApplyError> {
|
|
require(svc.authz.as_ref(), principal, Capability::AppRead(app_id))
|
|
.await
|
|
.map_err(map_authz)?;
|
|
// Extension points are module-resolution declarations, so they gate on the
|
|
// same script-write tier as modules — without this, an ext-point-only
|
|
// bundle (no `default`, so no script) would pass with viewer-tier `AppRead`
|
|
// and let a reader open the §5.5 import trust boundary.
|
|
if prune || !bundle.scripts.is_empty() || !bundle.extension_points.is_empty() {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::AppWriteScript(app_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
if prune || !bundle.routes.is_empty() {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::AppWriteRoute(app_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
if prune || !bundle.triggers.is_empty() {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::AppManageTriggers(app_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
if prune || !bundle.vars.is_empty() {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::AppVarsWrite(app_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
// Email triggers resolve + decrypt a stored secret by name server-side
|
|
// (`AppSecretsRead`), so require it so apply can't bind a secret the
|
|
// principal couldn't otherwise read.
|
|
if bundle.triggers.iter().any(BundleTrigger::is_email) {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::AppSecretsRead(app_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// Group-node write caps (editor-tier): scripts → `GroupScriptsWrite`, vars →
|
|
/// `GroupVarsWrite`, both on prune.
|
|
async fn require_group_node_writes(
|
|
svc: &ApplyService,
|
|
principal: &Principal,
|
|
group_id: GroupId,
|
|
bundle: &Bundle,
|
|
prune: bool,
|
|
) -> Result<(), ApplyError> {
|
|
// Extension points gate on the script-write tier (see the app variant).
|
|
if prune || !bundle.scripts.is_empty() || !bundle.extension_points.is_empty() {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::GroupScriptsWrite(group_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
if prune || !bundle.vars.is_empty() {
|
|
require(
|
|
svc.authz.as_ref(),
|
|
principal,
|
|
Capability::GroupVarsWrite(group_id),
|
|
)
|
|
.await
|
|
.map_err(map_authz)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// Resolve a slug-or-id path param to a `GroupId`, mapping miss → 404.
|
|
async fn resolve_group_id(
|
|
groups: &dyn GroupRepository,
|
|
ident: &str,
|
|
) -> Result<GroupId, ApplyError> {
|
|
let found = if let Ok(uuid) = ident.parse::<uuid::Uuid>() {
|
|
groups
|
|
.get_by_id(uuid.into())
|
|
.await
|
|
.map_err(|e| ApplyError::Backend(e.to_string()))?
|
|
} else {
|
|
groups
|
|
.get_by_slug(ident)
|
|
.await
|
|
.map_err(|e| ApplyError::Backend(e.to_string()))?
|
|
};
|
|
found
|
|
.map(|g| g.id)
|
|
.ok_or_else(|| ApplyError::AppNotFound(format!("group {ident}")))
|
|
}
|
|
|
|
/// Resolve a slug-or-id path param to an `AppId`, mapping miss → 404.
|
|
/// Mirrors the `triggers_api` helper of the same shape.
|
|
async fn resolve_app_id(apps: &dyn AppRepository, ident: &str) -> Result<AppId, ApplyError> {
|
|
crate::app_repo::resolve_app(apps, ident)
|
|
.await
|
|
.map_err(|e| ApplyError::Backend(e.to_string()))?
|
|
.map(|l| l.app.id)
|
|
.ok_or_else(|| ApplyError::AppNotFound(ident.to_string()))
|
|
}
|
|
|
|
fn map_authz(denied: AuthzDenied) -> ApplyError {
|
|
match denied {
|
|
AuthzDenied::Denied => ApplyError::Forbidden,
|
|
AuthzDenied::Repo(e) => ApplyError::AuthzRepo(e.to_string()),
|
|
}
|
|
}
|
|
|
|
impl IntoResponse for ApplyError {
|
|
fn into_response(self) -> Response {
|
|
let (status, body) = match &self {
|
|
Self::AppNotFound(_) => (StatusCode::NOT_FOUND, json!({ "error": self.to_string() })),
|
|
Self::Invalid(_) => (
|
|
StatusCode::UNPROCESSABLE_ENTITY,
|
|
json!({ "error": self.to_string() }),
|
|
),
|
|
Self::StateMoved => (StatusCode::CONFLICT, json!({ "error": self.to_string() })),
|
|
Self::Forbidden => (StatusCode::FORBIDDEN, json!({ "error": self.to_string() })),
|
|
Self::AuthzRepo(e) => {
|
|
tracing::error!(error = %e, "apply authz repo error");
|
|
(
|
|
StatusCode::INTERNAL_SERVER_ERROR,
|
|
json!({ "error": "internal error" }),
|
|
)
|
|
}
|
|
Self::Backend(e) => {
|
|
tracing::error!(error = %e, "apply backend error");
|
|
(
|
|
StatusCode::INTERNAL_SERVER_ERROR,
|
|
json!({ "error": "internal error" }),
|
|
)
|
|
}
|
|
};
|
|
(status, Json(body)).into_response()
|
|
}
|
|
}
|