This commit is contained in:
@@ -3,7 +3,7 @@ use axum::{
|
||||
Json, Router,
|
||||
extract::{Path, Query, State},
|
||||
http::{HeaderMap, StatusCode},
|
||||
routing::{delete, post},
|
||||
routing::{delete, patch, post},
|
||||
};
|
||||
use serde::Deserialize;
|
||||
use serde_json::{Value, json};
|
||||
@@ -34,6 +34,10 @@ pub fn routes(r: Router<crate::State>) -> Router<crate::State> {
|
||||
"/api/v1/tenants/{tenant}/devices/{asset}/archive",
|
||||
post(archive_device),
|
||||
)
|
||||
.route(
|
||||
"/api/v1/tenants/{tenant}/devices/{asset}/purpose",
|
||||
patch(update_device_purpose),
|
||||
)
|
||||
.route(
|
||||
"/api/v1/tenants/{tenant}/operation-plans/{plan}/revocation",
|
||||
post(revoke_plan),
|
||||
@@ -132,6 +136,66 @@ async fn archive_device(
|
||||
tx.commit().await?;
|
||||
Ok(Json(json!({"asset_id":asset, "archived":input.archived})))
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct Purpose {
|
||||
purpose: String,
|
||||
}
|
||||
|
||||
fn normalize_purpose(raw: &str) -> Result<Option<String>, Error> {
|
||||
let normalized = raw.replace("\r\n", "\n");
|
||||
let text = normalized.trim();
|
||||
if text.chars().count() > 500
|
||||
|| normalized
|
||||
.chars()
|
||||
.any(|c| c.is_control() && !matches!(c, '\n' | '\t'))
|
||||
{
|
||||
return Err(Error(StatusCode::BAD_REQUEST, "VALIDATION_ERROR"));
|
||||
}
|
||||
Ok((!text.is_empty()).then(|| text.to_owned()))
|
||||
}
|
||||
|
||||
async fn update_device_purpose(
|
||||
State(s): State<crate::State>,
|
||||
h: HeaderMap,
|
||||
Path((tenant, asset)): Path<(Uuid, Uuid)>,
|
||||
Json(input): Json<Purpose>,
|
||||
) -> Result<Json<Value>, Error> {
|
||||
const EVENT: &str = "device_purpose_updated";
|
||||
let (p, mut tx) = context(&s, &h, tenant, "devices:revoke", EVENT).await?;
|
||||
crate::permissions::require_principal(&mut tx, &p, "inventory:read").await?;
|
||||
let purpose = normalize_purpose(&input.purpose)?;
|
||||
let current: Option<String> = sqlx::query_scalar(
|
||||
"SELECT purpose FROM assets WHERE tenant_id=$1 AND asset_id=$2
|
||||
AND EXISTS (SELECT 1 FROM agent_installations a WHERE a.tenant_id=$1 AND a.asset_id=$2
|
||||
AND NOT a.customer_transfer_pending)
|
||||
FOR UPDATE",
|
||||
)
|
||||
.bind(tenant)
|
||||
.bind(asset)
|
||||
.fetch_optional(&mut *tx)
|
||||
.await?
|
||||
.ok_or(Error(StatusCode::NOT_FOUND, "NOT_FOUND"))?;
|
||||
if current != purpose {
|
||||
sqlx::query("UPDATE assets SET purpose=$3 WHERE tenant_id=$1 AND asset_id=$2")
|
||||
.bind(tenant)
|
||||
.bind(asset)
|
||||
.bind(&purpose)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
audit(
|
||||
&mut tx,
|
||||
&p,
|
||||
EVENT,
|
||||
json!({"asset_id":asset,"cleared":purpose.is_none()}),
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
tx.commit().await?;
|
||||
Ok(Json(json!({"asset_id":asset,"purpose":purpose})))
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct Pairing {
|
||||
|
||||
@@ -3,7 +3,7 @@ WITH classified AS (
|
||||
a.last_authenticated_at,a.last_authenticated_certificate_sha256,a.certificate_sha256,
|
||||
a.enrollment_generation,a.assignment_version,a.capabilities,a.reported_agent_version,
|
||||
a.system_usage,a.system_usage_observed_at,
|
||||
asset.archived_at,asset.hypervisor_asset_id,t.name AS customer_name,
|
||||
asset.archived_at,asset.hypervisor_asset_id,asset.purpose,t.name AS customer_name,
|
||||
CASE
|
||||
WHEN a.revoked_at IS NOT NULL THEN 'revoked'
|
||||
WHEN asset.archived_at IS NOT NULL THEN 'archived'
|
||||
|
||||
@@ -533,7 +533,8 @@ fn project(row: &PgRow, now: DateTime<Utc>, full: bool, hosts: &HashMap<Uuid, Ho
|
||||
"agent_id":row.get::<Uuid,_>("agent_id"),"asset_id":row.get::<Uuid,_>("asset_id"),
|
||||
"status":row.get::<String,_>("status"),"lifecycle":row.get::<String,_>("lifecycle"),
|
||||
"archived_at":row.get::<Option<DateTime<Utc>>,_>("archived_at"),"revoked_at":revoked,
|
||||
"hostname":data["hostname"].as_str(),"device_type":device_type,"os":os_label(&data),
|
||||
"hostname":data["hostname"].as_str(),"purpose":row.get::<Option<String>,_>("purpose"),
|
||||
"device_type":device_type,"os":os_label(&data),
|
||||
"disk_free_bytes":data["root_available_bytes"].as_u64(),"disk_total_bytes":data["root_total_bytes"].as_u64(),
|
||||
"cpu_model":cpu["model"].as_str().or_else(||windows["cpu_model"].as_str()),
|
||||
"cpu_logical_count":cpu["logical_processors"].as_u64().or_else(||windows["logical_processors_visible"].as_u64()),
|
||||
|
||||
@@ -492,6 +492,8 @@ mod tests {
|
||||
"rollout":{"max_parallel":1,"halt_after_failures":1},"reason":"test customer authorization"});
|
||||
for request in [
|
||||
client.get(format!("{base}/{b}/devices/{asset}")),
|
||||
client.patch(format!("{base}/{b}/devices/{asset}/purpose"))
|
||||
.json(&json!({"purpose":"foreign write"})),
|
||||
client.delete(format!("{base}/{b}/devices/{asset}?agent_id={id}")),
|
||||
client
|
||||
.post(format!("{base}/{b}/operation-plans"))
|
||||
@@ -530,6 +532,14 @@ mod tests {
|
||||
.send().await.unwrap().json::<Value>().await.unwrap();
|
||||
let deletion = || client.delete(&pair).header("origin", origin).header("cookie", cookie);
|
||||
let csrf = session["csrf_token"].as_str().unwrap();
|
||||
let detail = format!("{base}/{a}/devices/{asset}");
|
||||
let purpose = format!("{detail}/purpose");
|
||||
let update = |text: &str| client.patch(&purpose).header("origin", origin)
|
||||
.header("cookie", cookie).json(&json!({"purpose":text}));
|
||||
assert_eq!(client.patch(&purpose).bearer_auth(&token).json(&json!({"purpose":"token write"}))
|
||||
.send().await.unwrap().status(), StatusCode::FORBIDDEN);
|
||||
assert_eq!(update("reader denied").header("x-csrf-token", csrf)
|
||||
.send().await.unwrap().status(), StatusCode::FORBIDDEN);
|
||||
assert_eq!(deletion().header("x-csrf-token", csrf).send().await.unwrap().status(), StatusCode::FORBIDDEN);
|
||||
sqlx::query("UPDATE memberships SET permissions=array_append(permissions,'devices:revoke') WHERE tenant_id=$1 AND principal=$2")
|
||||
.bind(a).bind(&issuer).execute(&admin).await.unwrap();
|
||||
@@ -537,6 +547,25 @@ mod tests {
|
||||
.bind(a).bind(asset).execute(&admin).await.unwrap();
|
||||
sqlx::query("INSERT INTO agent_installations(tenant_id,agent_id,asset_id,certificate_sha256) VALUES($1,$2,$3,$4)")
|
||||
.bind(a).bind(id).bind(asset).bind(hash(id.as_bytes())).execute(&admin).await.unwrap();
|
||||
assert_eq!(update("missing CSRF").send().await.unwrap().status(), StatusCode::FORBIDDEN);
|
||||
assert_eq!(update(&"ü".repeat(501)).header("x-csrf-token", csrf)
|
||||
.send().await.unwrap().status(), StatusCode::BAD_REQUEST);
|
||||
let text = "Dateiserver für Nürnberg\nNur Entwicklung";
|
||||
let saved: Value = update(" Dateiserver für Nürnberg\r\nNur Entwicklung ")
|
||||
.header("x-csrf-token", csrf).send().await.unwrap().error_for_status().unwrap().json().await.unwrap();
|
||||
assert_eq!(saved["purpose"], text);
|
||||
let device: Value = client.get(&detail).bearer_auth(&token)
|
||||
.send().await.unwrap().error_for_status().unwrap().json().await.unwrap();
|
||||
assert_eq!(device["purpose"], text);
|
||||
let other: Option<String> = sqlx::query_scalar("SELECT purpose FROM assets WHERE tenant_id=$1 AND asset_id=$2")
|
||||
.bind(b).bind(asset).fetch_one(&admin).await.unwrap();
|
||||
assert!(other.is_none());
|
||||
let cleared: Value = update(" \n ").header("x-csrf-token", csrf)
|
||||
.send().await.unwrap().error_for_status().unwrap().json().await.unwrap();
|
||||
assert_eq!(cleared["purpose"], Value::Null);
|
||||
let events: Vec<Value> = sqlx::query_scalar("SELECT data->'decision' FROM audit_events WHERE tenant_id=$1 AND event_type='device_purpose_updated' ORDER BY created_at")
|
||||
.bind(a).fetch_all(&admin).await.unwrap();
|
||||
assert_eq!(events, [json!({"asset_id":asset,"cleared":false}), json!({"asset_id":asset,"cleared":true})]);
|
||||
assert_eq!(deletion().send().await.unwrap().status(), StatusCode::FORBIDDEN);
|
||||
assert_eq!(deletion().header("x-csrf-token",csrf).send().await.unwrap().status(), StatusCode::CONFLICT);
|
||||
let revoked = client.post(format!("{base}/{a}/devices/{asset}/revocation?agent_id={id}"))
|
||||
|
||||
Reference in New Issue
Block a user