diff --git a/Rust_RMM_Implementierungsspezifikation.md b/Rust_RMM_Implementierungsspezifikation.md index 4569cb2..53fe529 100644 --- a/Rust_RMM_Implementierungsspezifikation.md +++ b/Rust_RMM_Implementierungsspezifikation.md @@ -20,6 +20,8 @@ Eine ausgeschiedene Installation kann nach Widerruf und persönlicher Bestätigu In den Gerätedetails erscheinen OS-Installationszeit, letzter Systemstart, Hersteller, BIOS-Seriennummer, Netzwerkkarten samt IPv4- und IPv6-Adressen, installierte Software und die bei der letzten Inventur angemeldeten Benutzer. Windows meldet den vom Betriebssystem erfassten Installationszeitpunkt. Linux kennzeichnet den Zeitstempel aus dem Installer-Verzeichnis oder dem Root-Dateisystem als Schätzung. Das Softwareinventar erfasst Linux-Pakete aus dpkg und Windows-Systeminstallationen aus der Uninstall-Registrierung. Begrenzte Meldungen werden ausgewiesen. Herstellergarantie und Firmwaredaten erscheinen bei verfügbarem Befund. Die Daten gehören zum kundengebundenen Inventar des Geräts. [Geräteansicht](web/src/device-inventory.tsx) +Die Spalte **Zweck** und das Gerätedetail zeigen optionalen Freitext. Unter **Zweck bearbeiten** können Betreiber mit Inventarlese- und Geräteverwaltungsrecht für den betreffenden Kunden bis zu 500 Zeichen speichern oder den Text entfernen. Der Zweck gehört zum Gerät beim bisherigen Kunden und wird beim Kundenwechsel nicht übernommen. Die Änderung wird ohne den Text auditiert und erzeugt keinen Geräteauftrag. + ## Vom Skript zum Ergebnis | Schritt | Verhalten | diff --git a/crates/server/src/controls.rs b/crates/server/src/controls.rs index 593c882..a731f5f 100644 --- a/crates/server/src/controls.rs +++ b/crates/server/src/controls.rs @@ -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) -> Router { "/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, 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, + h: HeaderMap, + Path((tenant, asset)): Path<(Uuid, Uuid)>, + Json(input): Json, +) -> Result, 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 = 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 { diff --git a/crates/server/src/device_list.sql b/crates/server/src/device_list.sql index c90961c..29f3917 100644 --- a/crates/server/src/device_list.sql +++ b/crates/server/src/device_list.sql @@ -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' diff --git a/crates/server/src/devices.rs b/crates/server/src/devices.rs index 443e9c9..7d508f6 100644 --- a/crates/server/src/devices.rs +++ b/crates/server/src/devices.rs @@ -533,7 +533,8 @@ fn project(row: &PgRow, now: DateTime, full: bool, hosts: &HashMap("agent_id"),"asset_id":row.get::("asset_id"), "status":row.get::("status"),"lifecycle":row.get::("lifecycle"), "archived_at":row.get::>,_>("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::,_>("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()), diff --git a/crates/server/src/local_auth.rs b/crates/server/src/local_auth.rs index 08146bd..2239820 100644 --- a/crates/server/src/local_auth.rs +++ b/crates/server/src/local_auth.rs @@ -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::().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 = 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 = 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}")) diff --git a/docs/mvp-completion-plan.md b/docs/mvp-completion-plan.md index 80073a1..ee3baf5 100644 --- a/docs/mvp-completion-plan.md +++ b/docs/mvp-completion-plan.md @@ -11,6 +11,10 @@ | Windows | `discwindowstest`, Windows 11 Pro x64, Agent `0.1.16` aus dem offiziellen GNU-Kanal | | Quellstand mit Dokumentation | Gitea-Branch `main` | +## Ergänzungen zur Geräteansicht + +- **Zweck je Gerät:** Optionale Spalte im Bestand und in der Historie, Freitextpflege im Gerätedetail. WebUI-Build, 80 Komponententests und der [Chromium-Test](../tests/browser/device-purpose.spec.ts) für Speichern, Leeren, Schreibfehler und reine Leserechte bestanden. [Migration 45](../migrations/0045_device_purpose.sql) ist auf isoliertem PostgreSQL angewendet. Öffentliche Bereitstellung und Sichtprüfung folgen. + ## Geräteaktionen über MCP Alle acht Versuche lieferten Exitcode 0. Bei beiden Neustarts wurde die Wiederanmeldung derselben Kopplung nach einem tatsächlichen Bootwechsel geprüft. Der Ping wurde jeweils erst nach dieser Wiederanmeldung eingereicht. Die Zeiten in der Tabelle sind UTC. diff --git a/migrations/0045_device_purpose.sql b/migrations/0045_device_purpose.sql new file mode 100644 index 0000000..b2fea38 --- /dev/null +++ b/migrations/0045_device_purpose.sql @@ -0,0 +1,3 @@ +-- Operator metadata belongs to the asset, not the installation or its inventory. +ALTER TABLE assets ADD COLUMN purpose text CHECK (char_length(purpose) BETWEEN 1 AND 500); +GRANT UPDATE(purpose) ON assets TO rmm_app; diff --git a/tests/browser/device-purpose.spec.ts b/tests/browser/device-purpose.spec.ts new file mode 100644 index 0000000..17f49e3 --- /dev/null +++ b/tests/browser/device-purpose.spec.ts @@ -0,0 +1,98 @@ +import { test, expect } from '../../web/node_modules/@playwright/test/index.js'; +import { createServer, type ViteDevServer } from '../../web/node_modules/vite/dist/node/index.js'; +import { resolve } from 'node:path'; + +let server: ViteDevServer; +let origin: string; +test.beforeAll(async () => { + server = await createServer({ + root: resolve(__dirname, '../../web'), configFile: false, + server: { host: '127.0.0.1', port: 0 }, logLevel: 'silent' + }); + await server.listen(); + const address = server.httpServer!.address(); + if (!address || typeof address === 'string') throw new Error('Missing local fixture address'); + origin = `http://127.0.0.1:${address.port}`; +}); +test.afterAll(async () => { await server?.close(); }); + +test('shows, edits and clears device purpose without giving readers an editor', async ({ page }) => { + const customer = { tenant_id: '11111111-1111-4111-8111-111111111111', name: 'Fixture' }; + const path = `/api/v1/tenants/${customer.tenant_id}/devices/device-1`; + const listing = (items: unknown[]) => ({ + items, next_cursor: null, truncated: false, completeness: 'complete', as_of: '2026-11-19T12:00:00Z' + }); + let purpose: string | null = null; + let writer = true; + let reject = true; + const writes: string[] = []; + const device = () => ({ + tenant_id: customer.tenant_id, customer_name: customer.name, asset_id: 'device-1', agent_id: 'agent-1', + lifecycle: 'current', status: 'online', hostname: 'DATEN-SRV', os: 'Linux', purpose + }); + await page.route(`${origin}/auth/config`, route => route.fulfill({ + json: { local_login_enabled: true, oidc_configured: false, oidc_login_url: null, dev_login_enabled: false } + })); + await page.route(`${origin}/auth/session`, route => route.fulfill({ + json: { + principal: writer ? 'device-operator' : 'inventory-reader', testsimulation: false, + tenant_id: customer.tenant_id, csrf_token: 'purpose-csrf', + permissions: writer ? ['inventory:read', 'devices:revoke'] : ['inventory:read'] + } + })); + await page.route(`${origin}/api/v1/**`, route => { + const request = route.request(); + const pathname = new URL(request.url()).pathname; + if (request.method() === 'GET') { + if (pathname === '/api/v1/tenants') return route.fulfill({ json: listing([customer]) }); + if (pathname === '/api/v1/devices') return route.fulfill({ json: listing([device()]) }); + if (pathname === path) return route.fulfill({ json: device() }); + } + if (request.method() === 'PATCH' && pathname === `${path}/purpose`) { + expect(writer).toBe(true); + expect(request.headers()['x-csrf-token']).toBe('purpose-csrf'); + expect(request.headers()['x-rmm-tenant']).toBe(customer.tenant_id); + const text = request.postDataJSON().purpose; + writes.push(text); + if (reject) return route.fulfill({ status: 403, json: { code: 'FORBIDDEN', message: 'Speichern abgelehnt' } }); + purpose = text.trim() || null; + return route.fulfill({ json: { asset_id: 'device-1', purpose } }); + } + return route.fulfill({ status: 404, json: { code: 'UNEXPECTED_FIXTURE_REQUEST', message: pathname } }); + }); + + await page.goto(`${origin}/#geraete`); + await expect(page.getByRole('columnheader', { name: 'Zweck' })).toBeVisible(); + await expect(page.getByRole('cell', { name: 'Nicht hinterlegt' })).toBeVisible(); + await page.getByRole('button', { name: 'DATEN-SRV' }).click(); + await page.getByRole('button', { name: 'Zweck bearbeiten' }).click(); + const editor = page.getByRole('textbox', { name: 'Zweck des Geräts' }); + const save = page.getByRole('button', { name: 'Zweck speichern' }); + await editor.fill('ü'.repeat(501)); + await expect(save).toBeDisabled(); + expect(writes).toEqual([]); + const text = 'Dateien für Nürnberg\n'; + await editor.fill(text); + await save.click(); + await expect(page.getByRole('alert')).toContainText('Speichern abgelehnt'); + await expect(editor).toHaveValue(text); + reject = false; + await save.click(); + await expect(page.getByText('Zweck gespeichert.')).toBeVisible(); + await page.getByRole('button', { name: 'Zur Geräteliste' }).click(); + await expect(page.locator('td[data-label="Zweck"]')).toHaveText(text.replace('\n', ' ')); + await page.setViewportSize({ width: 390, height: 844 }); + await expect(page.locator('td[data-label="Zweck"]')).toBeVisible(); + await page.getByRole('button', { name: 'DATEN-SRV' }).click(); + await page.getByRole('button', { name: 'Zweck bearbeiten' }).click(); + await expect(editor).toHaveValue(text); + await editor.fill(''); + await save.click(); + await expect(page.getByText('Nicht hinterlegt', { exact: true })).toBeVisible(); + expect(writes).toEqual([text, text, '']); + writer = false; + purpose = text; + await page.reload(); + await expect(page.locator('.device-purpose .purpose-text')).toHaveText(text.replace('\n', ' ')); + await expect(page.getByRole('button', { name: 'Zweck bearbeiten' })).toHaveCount(0); +}); diff --git a/web/src/devices.tsx b/web/src/devices.tsx index 7f7d348..18ee27d 100644 --- a/web/src/devices.tsx +++ b/web/src/devices.tsx @@ -29,6 +29,7 @@ import { SyncAlignmentReview } from './sync-alignment-review'; import { SystemNonstartReview } from './system-nonstart-review'; const unknown = 'Nicht gemeldet'; +const noPurpose = 'Nicht hinterlegt'; const number = new Intl.NumberFormat('de-DE', { maximumFractionDigits: 1 }); const date = new Intl.DateTimeFormat('de-DE', { dateStyle: 'medium', timeStyle: 'short' }); function label(value: unknown) { @@ -127,6 +128,64 @@ function devicePath(customer: string, asset: string) { return tenantPath(customer, '/devices/' + encodeURIComponent(asset)); } +function DevicePurpose({ value, path, customer, editor, success, onSaved }: { + value: string; + path: string; + customer: string; + editor: Session | null; + success: boolean; + onSaved: () => void; +}) { + const [draft, setDraft] = useState(null); + const [busy, setBusy] = useState(false); + const [error, setError] = useState(null); + const tooLong = Array.from(draft?.trim() ?? '').length > 500; + const close = () => { setDraft(null); setError(null); }; + return ( +
+

Zweck

+ {editor && draft !== null ? ( +
{ + e.preventDefault(); + if (busy || tooLong) return; + setBusy(true); + setError(null); + try { + await request(path + '/purpose', { + method: 'PATCH', tenantId: customer, csrf: editor.csrf_token, body: { purpose: draft } + }); + close(); + onSaved(); + } catch (e) { + setError(errorText(e)); + } finally { + setBusy(false); + } + }}> +