Validate order search and audit decisions against PostgreSQL
This commit is contained in:
@@ -71,6 +71,13 @@ async fn inbox_count_cursor_history_and_customer_permissions() {
|
|||||||
sqlx::query("INSERT INTO approval_requests(tenant_id,operation_id,plan_id,principal,idempotency_key,request_hash,created_at,approval_state)
|
sqlx::query("INSERT INTO approval_requests(tenant_id,operation_id,plan_id,principal,idempotency_key,request_hash,created_at,approval_state)
|
||||||
VALUES($1,$2,$3,'mcp:fixture',$4,'fixture',$5,$6)")
|
VALUES($1,$2,$3,'mcp:fixture',$4,'fixture',$5,$6)")
|
||||||
.bind(tenant).bind(op_id).bind(plan_id).bind(plan_id.to_string()).bind(stamp).bind(status).execute(&admin).await.unwrap();
|
.bind(tenant).bind(op_id).bind(plan_id).bind(plan_id.to_string()).bind(stamp).bind(status).execute(&admin).await.unwrap();
|
||||||
|
if status == "rejected" {
|
||||||
|
sqlx::query("INSERT INTO audit_events VALUES($1,$2,$3,'plan_authorization',$4,$5)")
|
||||||
|
.bind(tenant).bind(Uuid::new_v4()).bind(format!("reviewer:{tenant}"))
|
||||||
|
.bind(json!({"operation_id":op_id,"plan_id":plan_id,"plan_hash":"fixture",
|
||||||
|
"decision":"reject","testsimulation":true}))
|
||||||
|
.bind(stamp + chrono::Duration::seconds(5)).execute(&admin).await.unwrap();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,6 +180,25 @@ async fn inbox_count_cursor_history_and_customer_permissions() {
|
|||||||
.collect();
|
.collect();
|
||||||
assert_eq!(states.len(), 2);
|
assert_eq!(states.len(), 2);
|
||||||
assert!(states.contains(&"expired") && states.contains(&"rejected"));
|
assert!(states.contains(&"expired") && states.contains(&"rejected"));
|
||||||
|
let items = history["items"].as_array().unwrap();
|
||||||
|
let rejected = items.iter().find(|item| item["approval_state"] == "rejected").unwrap();
|
||||||
|
assert_eq!(rejected["decision"]["principal"], format!("reviewer:{a}"));
|
||||||
|
assert_eq!(rejected["decision"]["testsimulation"], true);
|
||||||
|
let at: DateTime<Utc> = serde_json::from_value(rejected["decision"]["at"].clone()).unwrap();
|
||||||
|
assert_eq!(at.timestamp_micros(), (stamp + chrono::Duration::seconds(5)).timestamp_micros());
|
||||||
|
assert!(items.iter().find(|item| item["approval_state"] == "expired").unwrap()["decision"].is_null());
|
||||||
|
|
||||||
|
// Filter the authorized storage rows before applying the page limit.
|
||||||
|
for (tenant, disclose_names, matches) in [(a, true, 1), (b, false, 0)] {
|
||||||
|
let mut tx = rmm_persistence::tenant_tx(&state.pool, tenant).await.unwrap();
|
||||||
|
let rows: Vec<(Uuid, DateTime<Utc>)> = sqlx::query_as(include_str!("../order_filter.sql"))
|
||||||
|
.bind(Utc::now()).bind(None::<DateTime<Utc>>).bind(Uuid::nil())
|
||||||
|
.bind(stamp - chrono::Duration::seconds(1)).bind(stamp + chrono::Duration::seconds(1))
|
||||||
|
.bind("kernel").bind("rejected").bind("Kunde").bind(None::<Uuid>).bind(disclose_names)
|
||||||
|
.bind(1_i64).fetch_all(&mut *tx).await.unwrap();
|
||||||
|
assert_eq!(rows.len(), matches);
|
||||||
|
tx.commit().await.unwrap();
|
||||||
|
}
|
||||||
let count = list(
|
let count = list(
|
||||||
&state,
|
&state,
|
||||||
&p,
|
&p,
|
||||||
|
|||||||
@@ -17,22 +17,23 @@ SELECT p.tenant_id, p.name AS customer_name, p.plan_id, p.plan_hash,
|
|||||||
WHEN decision.event_id IS NOT NULL THEN jsonb_build_object(
|
WHEN decision.event_id IS NOT NULL THEN jsonb_build_object(
|
||||||
'principal', decision.principal, 'at', decision.created_at,
|
'principal', decision.principal, 'at', decision.created_at,
|
||||||
'testsimulation', decision.data->'testsimulation' = 'true'::jsonb)
|
'testsimulation', decision.data->'testsimulation' = 'true'::jsonb)
|
||||||
WHEN r.approval_state = 'approved' AND authorization.authorization_id IS NOT NULL THEN jsonb_build_object(
|
WHEN r.approval_state = 'approved' AND approved.authorization_id IS NOT NULL THEN jsonb_build_object(
|
||||||
'principal', authorization.principal, 'at', authorization.created_at,
|
'principal', approved.principal, 'at', approved.created_at,
|
||||||
'testsimulation', authorization.testsimulation)
|
'testsimulation', approved.testsimulation)
|
||||||
END AS decision,
|
END AS decision,
|
||||||
coalesce(targets.items, '[]'::jsonb) AS targets
|
coalesce(targets.items, '[]'::jsonb) AS targets
|
||||||
FROM selected p
|
FROM selected p
|
||||||
LEFT JOIN approval_requests r USING (tenant_id,plan_id)
|
LEFT JOIN approval_requests r USING (tenant_id,plan_id)
|
||||||
LEFT JOIN authorizations authorization ON authorization.tenant_id = p.tenant_id
|
LEFT JOIN authorizations approved ON approved.tenant_id = p.tenant_id
|
||||||
AND authorization.operation_id = r.operation_id AND authorization.plan_id = p.plan_id
|
AND approved.operation_id = r.operation_id AND approved.plan_id = p.plan_id
|
||||||
LEFT JOIN LATERAL (
|
LEFT JOIN LATERAL (
|
||||||
SELECT e.event_id, e.principal, e.created_at, e.data
|
SELECT e.event_id, e.principal, e.created_at, e.data
|
||||||
FROM audit_events e
|
FROM audit_events e
|
||||||
WHERE e.tenant_id = p.tenant_id AND e.data->>'operation_id' = r.operation_id::text
|
WHERE e.tenant_id = p.tenant_id AND e.data->>'operation_id' = r.operation_id::text
|
||||||
|
AND e.data->>'plan_id' = p.plan_id::text
|
||||||
AND e.event_type IN ('plan_revoked', 'plan_authorization')
|
AND e.event_type IN ('plan_revoked', 'plan_authorization')
|
||||||
AND ((r.approval_state = 'revoked' AND e.event_type = 'plan_revoked')
|
AND ((r.approval_state = 'revoked' AND e.event_type = 'plan_revoked')
|
||||||
OR (e.event_type = 'plan_authorization' AND e.data->>'plan_id' = p.plan_id::text
|
OR (e.event_type = 'plan_authorization'
|
||||||
AND e.data->>'plan_hash' = p.plan_hash
|
AND e.data->>'plan_hash' = p.plan_hash
|
||||||
AND e.data->>'decision' = CASE r.approval_state WHEN 'approved' THEN 'approve' WHEN 'rejected' THEN 'reject' END))
|
AND e.data->>'decision' = CASE r.approval_state WHEN 'approved' THEN 'approve' WHEN 'rejected' THEN 'reject' END))
|
||||||
ORDER BY e.created_at, e.event_id
|
ORDER BY e.created_at, e.event_id
|
||||||
|
|||||||
Reference in New Issue
Block a user