Wire scoped API keys and add advisory settle-amount tripwire
Scoped API keys (P1): migrate 58 admin endpoints from require_admin to
require_scope so ks_ keys with Read-only/License-issuer/Support/Full-admin roles
work as intended. 12 sensitive endpoints stay master-key-only (issuer key,
provider connect/disconnect, web password, api-key CRUD, db-info, operator-name,
per-license tier change). require_scope is re-exported from api::admin so both
auth gates import from one place. Adds role-boundary tests.
Settle-amount tripwire (P1): get_invoice_status now returns
ProviderInvoiceSnapshot { status, amount }. On a confirmed settle,
audit_settle_amount (shared by the webhook and reconcile issue paths) compares
the provider-reported sat amount against the invoice's amount_sats and, on drift,
logs a warning + writes an invoice.amount_mismatch audit row, then issues anyway.
Advisory by design: a hard gate would fight an operator's BTCPay payment
tolerance, and Settled already implies paid-in-full. SAT-only — skips non-SAT
settles (fiat subscription renewals) and unparseable amounts.
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
//! convention (Stripe, Zaprite, etc.) and avoids a UX where the
|
||||
//! buyer cancels mid-month and immediately loses what they paid for.
|
||||
|
||||
use crate::api::admin::{request_context, require_admin};
|
||||
use crate::api::admin::{request_context, require_scope};
|
||||
use crate::api::AppState;
|
||||
use crate::error::{AppError, AppResult};
|
||||
use axum::{
|
||||
@@ -58,7 +58,7 @@ pub async fn admin_list(
|
||||
headers: HeaderMap,
|
||||
Query(q): Query<ListQuery>,
|
||||
) -> AppResult<Json<Value>> {
|
||||
require_admin(&state, &headers)?;
|
||||
require_scope(&state, &headers, "subscriptions:read").await?;
|
||||
if let Some(s) = q.status.as_deref() {
|
||||
if !["active", "past_due", "cancelled", "lapsed"].contains(&s) {
|
||||
return Err(AppError::BadRequest(format!(
|
||||
@@ -115,7 +115,7 @@ pub async fn admin_cancel(
|
||||
Path(id): Path<String>,
|
||||
body: Option<Json<CancelReq>>,
|
||||
) -> AppResult<Json<Value>> {
|
||||
let actor_hash = require_admin(&state, &headers)?;
|
||||
let actor_hash = require_scope(&state, &headers, "subscriptions:write").await?;
|
||||
let (ip, ua) = request_context(&headers);
|
||||
let reason = body.and_then(|Json(b)| b.reason).filter(|s| !s.trim().is_empty());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user