Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac6f940e2e | ||
|
|
577a6eea75 | ||
|
|
58236bc8f0 | ||
|
|
2070ae95e7 |
@@ -12,7 +12,7 @@ Der Agent meldet den Gerätetyp mit dem passiven Hardwareinventar. `physical` be
|
|||||||
|
|
||||||
Für aktuelle virtuelle Geräte kann die WebUI einen registrierten Hypervisor aus demselben Kundenbestand zuordnen. Die Geräteübersicht zeigt diese Verbindung unter dem Hostnamen der VM und verlinkt auf die Gerätedetails des Hypervisors. Die Zuordnung gilt, solange der verknüpfte Host im Bestand ist und sich als Hypervisor meldet. Eine VM mit gemeldetem Hersteller Hetzner erhält bei fehlendem konkreten Host den Anzeigeplatzhalter „Hetzner Cloud“. Der Platzhalter hat keine Kopplung und zählt nicht als registriertes Gerät.
|
Für aktuelle virtuelle Geräte kann die WebUI einen registrierten Hypervisor aus demselben Kundenbestand zuordnen. Die Geräteübersicht zeigt diese Verbindung unter dem Hostnamen der VM und verlinkt auf die Gerätedetails des Hypervisors. Die Zuordnung gilt, solange der verknüpfte Host im Bestand ist und sich als Hypervisor meldet. Eine VM mit gemeldetem Hersteller Hetzner erhält bei fehlendem konkreten Host den Anzeigeplatzhalter „Hetzner Cloud“. Der Platzhalter hat keine Kopplung und zählt nicht als registriertes Gerät.
|
||||||
|
|
||||||
Die RAM-Spalte zeigt den für Anwendungen verfügbaren und den gesamten physischen Arbeitsspeicher in GiB. Wie beim Speicherplatz zeigt ein Balken den belegten Anteil. Die CPU-Spalte ergänzt die zuletzt gemessene Systemauslastung als Prozentwert. Die Agenten gewinnen sie aus den CPU-Zeitdifferenzen zwischen zwei Heartbeats im Abstand von ungefähr 30 Sekunden. Linux liefert systemweite Werte. Windows liefert den Wert, wenn alle logischen CPUs zu einer einzigen Prozessorgruppe gehören. Vor dem ersten aussagekräftigen Intervall bleibt die Auslastung offen. Die WebUI und MCP lesen dieselbe letzte Messung. Für Agenten ohne Ressourcenmeldung stammen verfügbare RAM-Werte aus dem vorhandenen Inventar. [Inventarprojektion](crates/server/src/devices.rs)
|
Die RAM-Spalte zeigt den für Anwendungen verfügbaren und den gesamten physischen Arbeitsspeicher in GiB. Im RAM-Balken ist der verfügbare Anteil (links) grün und der belegte Anteil grau. Die sichtbare Prozentangabe benennt den verfügbaren Anteil. Ohne gültiges Wertepaar erscheint kein Balken. Der Laufwerksbalken hebt weiterhin den belegten Anteil hervor. Die CPU-Spalte ergänzt die zuletzt gemessene Systemauslastung als Prozentwert. Die Agenten gewinnen sie aus den CPU-Zeitdifferenzen zwischen zwei Heartbeats im Abstand von ungefähr 30 Sekunden. Linux liefert systemweite Werte. Windows liefert den Wert, wenn alle logischen CPUs zu einer einzigen Prozessorgruppe gehören. Vor dem ersten aussagekräftigen Intervall bleibt die Auslastung offen. Die WebUI und MCP lesen dieselbe letzte Messung. Für Agenten ohne Ressourcenmeldung stammen verfügbare RAM-Werte aus dem vorhandenen Inventar. [Inventarprojektion](crates/server/src/devices.rs)
|
||||||
|
|
||||||
Kunden lassen sich in der WebUI anlegen und umbenennen. Unter **Gerät verwalten → Kunden wechseln** wählt eine berechtigte Person den Zielkunden. Der Server prüft die Rechte zur Geräteverwaltung im bisherigen Kunden und zur Geräteaufnahme im Zielkunden. Der bereits installierte Agent empfängt den Wechsel über seine authentisierte Verbindung und erhält ein neues Zertifikat für eine neue Kopplung. Mit der ersten gültigen Inventarmeldung der authentisierten neuen Kopplung schließt der Server den Wechsel automatisch ab. Er sperrt die bisherige Geräteidentität und schaltet den Bestand in derselben Transaktion auf den Zielkunden um. Inventar und Auftragsergebnisse der bisherigen Kopplung bleiben beim bisherigen Kunden. Noch nicht abgeschlossene Aufträge, ungeklärte Versuche und gültige offene Genehmigungen müssen vor dem Wechsel abgeschlossen werden. Gerätegebundene erhöhte Rechte erfordern eine eigene Bindung für die neue Kopplung.
|
Kunden lassen sich in der WebUI anlegen und umbenennen. Unter **Gerät verwalten → Kunden wechseln** wählt eine berechtigte Person den Zielkunden. Der Server prüft die Rechte zur Geräteverwaltung im bisherigen Kunden und zur Geräteaufnahme im Zielkunden. Der bereits installierte Agent empfängt den Wechsel über seine authentisierte Verbindung und erhält ein neues Zertifikat für eine neue Kopplung. Mit der ersten gültigen Inventarmeldung der authentisierten neuen Kopplung schließt der Server den Wechsel automatisch ab. Er sperrt die bisherige Geräteidentität und schaltet den Bestand in derselben Transaktion auf den Zielkunden um. Inventar und Auftragsergebnisse der bisherigen Kopplung bleiben beim bisherigen Kunden. Noch nicht abgeschlossene Aufträge, ungeklärte Versuche und gültige offene Genehmigungen müssen vor dem Wechsel abgeschlossen werden. Gerätegebundene erhöhte Rechte erfordern eine eigene Bindung für die neue Kopplung.
|
||||||
|
|
||||||
@@ -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)
|
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
|
## Vom Skript zum Ergebnis
|
||||||
|
|
||||||
| Schritt | Verhalten |
|
| Schritt | Verhalten |
|
||||||
|
|||||||
@@ -205,7 +205,6 @@ pub struct HelperSync<V = DefaultVerifier> {
|
|||||||
born: DateTime<Utc>,
|
born: DateTime<Utc>,
|
||||||
capture: Option<Capture>,
|
capture: Option<Capture>,
|
||||||
lease: Option<Lease>,
|
lease: Option<Lease>,
|
||||||
integrity: Option<crate::ledger::IntegrityMonitor>,
|
|
||||||
}
|
}
|
||||||
impl HelperSync<DefaultVerifier> {
|
impl HelperSync<DefaultVerifier> {
|
||||||
/// No persisted ready bit can open a newly started helper.
|
/// No persisted ready bit can open a newly started helper.
|
||||||
@@ -223,7 +222,6 @@ impl<V: Ed25519Verifier> HelperSync<V> {
|
|||||||
born: clock.now()?,
|
born: clock.now()?,
|
||||||
capture: None,
|
capture: None,
|
||||||
lease: None,
|
lease: None,
|
||||||
integrity: None,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
/// Select exactly one protected helper execution identity, closing leases.
|
/// Select exactly one protected helper execution identity, closing leases.
|
||||||
@@ -232,12 +230,6 @@ impl<V: Ed25519Verifier> HelperSync<V> {
|
|||||||
self.identity = identity;
|
self.identity = identity;
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
/// Use with one protected SQLite connection retained for this instance.
|
|
||||||
/// The native owner must run a full check before any new host effect.
|
|
||||||
pub fn with_periodic_idle_integrity_checks(mut self) -> Self {
|
|
||||||
self.integrity = Some(crate::ledger::IntegrityMonitor::default());
|
|
||||||
self
|
|
||||||
}
|
|
||||||
pub fn close(&mut self) {
|
pub fn close(&mut self) {
|
||||||
self.lease = None;
|
self.lease = None;
|
||||||
self.capture = None;
|
self.capture = None;
|
||||||
@@ -296,8 +288,7 @@ impl<V: Ed25519Verifier> HelperSync<V> {
|
|||||||
ledger_fingerprint: lease.fingerprint.clone(),
|
ledger_fingerprint: lease.fingerprint.clone(),
|
||||||
captured_at: capture.captured_at,
|
captured_at: capture.captured_at,
|
||||||
};
|
};
|
||||||
let audit_history = self.integrity.is_none();
|
self.verify_no_start_anchor(db, guard, &anchor, clock, boot)?;
|
||||||
self.verify_no_start_anchor(db, guard, &anchor, clock, boot, audit_history)?;
|
|
||||||
Ok(anchor)
|
Ok(anchor)
|
||||||
}
|
}
|
||||||
/// Consume exactly the approved update attempt and delegate its ORIGINAL
|
/// Consume exactly the approved update attempt and delegate its ORIGINAL
|
||||||
@@ -398,9 +389,9 @@ impl<V: Ed25519Verifier> HelperSync<V> {
|
|||||||
tx.commit()?;
|
tx.commit()?;
|
||||||
return Ok(outcome);
|
return Ok(outcome);
|
||||||
}
|
}
|
||||||
self.verify_no_start_anchor(&tx, guard, anchor, clock, boot, true)?;
|
self.verify_no_start_anchor(&tx, guard, anchor, clock, boot)?;
|
||||||
let observation = guard.verify_no_dispatch(request, anchor)?;
|
let observation = guard.verify_no_dispatch(request, anchor)?;
|
||||||
let now = self.verify_no_start_anchor(&tx, guard, anchor, clock, boot, true)?;
|
let now = self.verify_no_start_anchor(&tx, guard, anchor, clock, boot)?;
|
||||||
ensure!(
|
ensure!(
|
||||||
!observation.intent_id.is_nil()
|
!observation.intent_id.is_nil()
|
||||||
&& digest(&observation.intent_sha256)
|
&& digest(&observation.intent_sha256)
|
||||||
@@ -430,7 +421,6 @@ impl<V: Ed25519Verifier> HelperSync<V> {
|
|||||||
anchor: &NoStartAnchor,
|
anchor: &NoStartAnchor,
|
||||||
clock: &impl Clock,
|
clock: &impl Clock,
|
||||||
boot: &impl BootSource,
|
boot: &impl BootSource,
|
||||||
audit_history: bool,
|
|
||||||
) -> Result<DateTime<Utc>> {
|
) -> Result<DateTime<Utc>> {
|
||||||
guard.check(db)?;
|
guard.check(db)?;
|
||||||
let now = clock.now()?;
|
let now = clock.now()?;
|
||||||
@@ -455,10 +445,8 @@ impl<V: Ed25519Verifier> HelperSync<V> {
|
|||||||
&& ledger_fingerprint(db)? == anchor.ledger_fingerprint,
|
&& ledger_fingerprint(db)? == anchor.ledger_fingerprint,
|
||||||
"DENIAL_HELPER_LINEAGE_CHANGED"
|
"DENIAL_HELPER_LINEAGE_CHANGED"
|
||||||
);
|
);
|
||||||
// Idle anchor capture checks the current signed head. The native
|
// Exact equality is deliberate: a first implementation refuses even
|
||||||
// executor audits the full history before execution, and abandonment
|
// legitimate intervening progress rather than inventing lineage links.
|
||||||
// always audits it under the same transaction before recording evidence.
|
|
||||||
if audit_history {
|
|
||||||
verify_checkpoint_repair_history_with(
|
verify_checkpoint_repair_history_with(
|
||||||
db,
|
db,
|
||||||
&self.binding,
|
&self.binding,
|
||||||
@@ -466,7 +454,6 @@ impl<V: Ed25519Verifier> HelperSync<V> {
|
|||||||
self.identity,
|
self.identity,
|
||||||
&self.verifier,
|
&self.verifier,
|
||||||
)?;
|
)?;
|
||||||
}
|
|
||||||
let (response, raw): (Vec<u8>, Vec<u8>) = db.query_row(
|
let (response, raw): (Vec<u8>, Vec<u8>) = db.query_row(
|
||||||
"SELECT response,request FROM helper_sync_decisions WHERE decision_id=?1",
|
"SELECT response,request FROM helper_sync_decisions WHERE decision_id=?1",
|
||||||
[anchor.decision_id.to_string()],
|
[anchor.decision_id.to_string()],
|
||||||
@@ -496,12 +483,8 @@ impl<V: Ed25519Verifier> HelperSync<V> {
|
|||||||
&& decision.helper_journal_id == Some(anchor.journal_id)
|
&& decision.helper_journal_id == Some(anchor.journal_id)
|
||||||
&& decision.helper_checkpoint == anchor.checkpoint
|
&& decision.helper_checkpoint == anchor.checkpoint
|
||||||
&& decision.connection_generation == anchor.connection_generation
|
&& decision.connection_generation == anchor.connection_generation
|
||||||
&& decision.request_hash == anchor.sync_request_sha256
|
|
||||||
&& capture.journal_id == anchor.journal_id
|
|
||||||
&& capture.checkpoint == anchor.checkpoint
|
|
||||||
&& capture.captured_at == anchor.captured_at
|
&& capture.captured_at == anchor.captured_at
|
||||||
&& capture.boot_id == anchor.boot_id
|
&& capture.boot_id == anchor.boot_id
|
||||||
&& capture.captured_at <= decision.issued_at
|
|
||||||
&& capture.captured_at <= now,
|
&& capture.captured_at <= now,
|
||||||
"DENIAL_CONFIRMED_READY_REQUIRED"
|
"DENIAL_CONFIRMED_READY_REQUIRED"
|
||||||
);
|
);
|
||||||
@@ -540,12 +523,7 @@ impl<V: Ed25519Verifier> HelperSync<V> {
|
|||||||
);
|
);
|
||||||
let boot_id = boot.current_boot()?;
|
let boot_id = boot.current_boot()?;
|
||||||
ensure!(!boot_id.is_nil(), "BOOT_ID_REQUIRED");
|
ensure!(!boot_id.is_nil(), "BOOT_ID_REQUIRED");
|
||||||
if let Some(integrity) = &mut self.integrity {
|
|
||||||
integrity.check(db, false, "ROOT_LEDGER_INTEGRITY")?;
|
|
||||||
initialize_schema(db, &self.binding)?;
|
|
||||||
} else {
|
|
||||||
initialize(db, &self.binding)?;
|
initialize(db, &self.binding)?;
|
||||||
}
|
|
||||||
let tx = db.transaction_with_behavior(TransactionBehavior::Immediate)?;
|
let tx = db.transaction_with_behavior(TransactionBehavior::Immediate)?;
|
||||||
let meta = metadata(&tx)?;
|
let meta = metadata(&tx)?;
|
||||||
ensure!(meta.fault.is_none(), "HELPER_MANUAL_RECOVERY_REQUIRED");
|
ensure!(meta.fault.is_none(), "HELPER_MANUAL_RECOVERY_REQUIRED");
|
||||||
@@ -1053,17 +1031,13 @@ struct Meta {
|
|||||||
agent_checkpoint: u64,
|
agent_checkpoint: u64,
|
||||||
}
|
}
|
||||||
fn initialize(db: &Connection, binding: &Binding) -> Result<()> {
|
fn initialize(db: &Connection, binding: &Binding) -> Result<()> {
|
||||||
crate::ledger::check_integrity(db, "ROOT_LEDGER_INTEGRITY")?;
|
let check: String = db.query_row("PRAGMA integrity_check", [], |r| r.get(0))?;
|
||||||
initialize_schema(db, binding)
|
ensure!(check == "ok", "ROOT_LEDGER_INTEGRITY");
|
||||||
}
|
|
||||||
|
|
||||||
fn initialize_schema(db: &Connection, binding: &Binding) -> Result<()> {
|
|
||||||
db.execute_batch("PRAGMA synchronous=FULL;
|
db.execute_batch("PRAGMA synchronous=FULL;
|
||||||
CREATE TABLE IF NOT EXISTS helper_sync_meta(id INTEGER PRIMARY KEY CHECK(id=1),journal_id TEXT NOT NULL,checkpoint INTEGER NOT NULL DEFAULT 0,generation INTEGER NOT NULL DEFAULT 0,binding_sha256 TEXT NOT NULL,last_decision TEXT,fault TEXT,agent_journal_id TEXT,agent_checkpoint INTEGER NOT NULL DEFAULT 0);
|
CREATE TABLE IF NOT EXISTS helper_sync_meta(id INTEGER PRIMARY KEY CHECK(id=1),journal_id TEXT NOT NULL,checkpoint INTEGER NOT NULL DEFAULT 0,generation INTEGER NOT NULL DEFAULT 0,binding_sha256 TEXT NOT NULL,last_decision TEXT,fault TEXT,agent_journal_id TEXT,agent_checkpoint INTEGER NOT NULL DEFAULT 0);
|
||||||
CREATE TABLE IF NOT EXISTS helper_sync_rows(grant_id TEXT PRIMARY KEY,revision INTEGER NOT NULL,fingerprint TEXT NOT NULL);
|
CREATE TABLE IF NOT EXISTS helper_sync_rows(grant_id TEXT PRIMARY KEY,revision INTEGER NOT NULL,fingerprint TEXT NOT NULL);
|
||||||
CREATE TABLE IF NOT EXISTS helper_sync_captures(checkpoint INTEGER PRIMARY KEY,snapshot BLOB NOT NULL,fingerprint TEXT NOT NULL,captured_at TEXT NOT NULL);
|
CREATE TABLE IF NOT EXISTS helper_sync_captures(checkpoint INTEGER PRIMARY KEY,snapshot BLOB NOT NULL,fingerprint TEXT NOT NULL,captured_at TEXT NOT NULL);
|
||||||
CREATE TABLE IF NOT EXISTS helper_sync_decisions(decision_id TEXT PRIMARY KEY,checkpoint INTEGER NOT NULL,response BLOB NOT NULL,request BLOB NOT NULL,fingerprint TEXT NOT NULL);
|
CREATE TABLE IF NOT EXISTS helper_sync_decisions(decision_id TEXT PRIMARY KEY,checkpoint INTEGER NOT NULL,response BLOB NOT NULL,request BLOB NOT NULL,fingerprint TEXT NOT NULL);")?;
|
||||||
CREATE INDEX IF NOT EXISTS helper_sync_decisions_checkpoint ON helper_sync_decisions(checkpoint);")?;
|
|
||||||
let legacy_captures: bool = db.query_row(
|
let legacy_captures: bool = db.query_row(
|
||||||
"SELECT EXISTS(SELECT 1 FROM sqlite_schema WHERE type='table' AND name='helper_sync_captures')",
|
"SELECT EXISTS(SELECT 1 FROM sqlite_schema WHERE type='table' AND name='helper_sync_captures')",
|
||||||
[], |row| row.get(0),
|
[], |row| row.get(0),
|
||||||
@@ -1201,23 +1175,23 @@ pub fn verify_checkpoint_repair_history_with(
|
|||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let meta = metadata(db)?;
|
let meta = metadata(db)?;
|
||||||
validate_history(db, binding, &meta, meta.generation, verifier)?;
|
validate_history(db, binding, &meta, meta.generation, verifier)?;
|
||||||
let entry_count: u64 = db.query_row(
|
|
||||||
"SELECT count(*) FROM helper_sync_decisions",
|
|
||||||
[],
|
|
||||||
|row| row.get(0),
|
|
||||||
)?;
|
|
||||||
ensure!(entry_count <= 100000, "REPAIR_HISTORY_LIMIT");
|
|
||||||
let mut statement = db.prepare(
|
let mut statement = db.prepare(
|
||||||
"SELECT response,request,checkpoint FROM helper_sync_decisions ORDER BY checkpoint",
|
"SELECT response,request,checkpoint FROM helper_sync_decisions ORDER BY checkpoint",
|
||||||
)?;
|
)?;
|
||||||
let mut entries = statement.query([])?;
|
let entries = statement
|
||||||
|
.query_map([], |r| {
|
||||||
|
Ok((
|
||||||
|
r.get::<_, Vec<u8>>(0)?,
|
||||||
|
r.get::<_, Vec<u8>>(1)?,
|
||||||
|
r.get::<_, u64>(2)?,
|
||||||
|
))
|
||||||
|
})?
|
||||||
|
.collect::<rusqlite::Result<Vec<_>>>()?;
|
||||||
|
ensure!(entries.len() <= 100000, "REPAIR_HISTORY_LIMIT");
|
||||||
let mut previous = None;
|
let mut previous = None;
|
||||||
let mut previous_checkpoint = 0;
|
let mut previous_checkpoint = 0;
|
||||||
let mut previous_agent_checkpoint = 0;
|
let mut previous_agent_checkpoint = 0;
|
||||||
while let Some(entry) = entries.next()? {
|
for (signed, raw, checkpoint) in entries {
|
||||||
let signed: Vec<u8> = entry.get(0)?;
|
|
||||||
let raw: Vec<u8> = entry.get(1)?;
|
|
||||||
let checkpoint: u64 = entry.get(2)?;
|
|
||||||
let response: SignedResponse = serde_json::from_slice(&signed)?;
|
let response: SignedResponse = serde_json::from_slice(&signed)?;
|
||||||
let parsed: ReconcileDecisionPayload = serde_json::from_slice(&response.decision_bytes)?;
|
let parsed: ReconcileDecisionPayload = serde_json::from_slice(&response.decision_bytes)?;
|
||||||
let decision = verify(verifier, binding, &response, parsed.issued_at)?;
|
let decision = verify(verifier, binding, &response, parsed.issued_at)?;
|
||||||
|
|||||||
@@ -7,8 +7,7 @@ use rmm_domain::{
|
|||||||
jobs::hash,
|
jobs::hash,
|
||||||
reconciliation::{ReconciledOutcome, canonical_outcome_bytes},
|
reconciliation::{ReconciledOutcome, canonical_outcome_bytes},
|
||||||
};
|
};
|
||||||
use rusqlite::{Connection, OptionalExtension, TransactionBehavior, params};
|
use rusqlite::{OptionalExtension, TransactionBehavior, params};
|
||||||
use std::time::{Duration, Instant};
|
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
/// Finite 1 GiB bound for durable agent/helper history. Unexpected page sizes
|
/// Finite 1 GiB bound for durable agent/helper history. Unexpected page sizes
|
||||||
@@ -30,48 +29,11 @@ pub fn initialize_ledger(db: &rusqlite::Connection) -> Result<()> {
|
|||||||
CREATE TABLE IF NOT EXISTS consumed(grant_id TEXT PRIMARY KEY, agent TEXT NOT NULL, generation INTEGER NOT NULL,
|
CREATE TABLE IF NOT EXISTS consumed(grant_id TEXT PRIMARY KEY, agent TEXT NOT NULL, generation INTEGER NOT NULL,
|
||||||
job TEXT NOT NULL, attempt TEXT NOT NULL, result BLOB, UNIQUE(agent,generation,job,attempt));
|
job TEXT NOT NULL, attempt TEXT NOT NULL, result BLOB, UNIQUE(agent,generation,job,attempt));
|
||||||
CREATE TABLE IF NOT EXISTS execution_evidence(grant_id TEXT PRIMARY KEY, start BLOB NOT NULL, outcome BLOB);")?;
|
CREATE TABLE IF NOT EXISTS execution_evidence(grant_id TEXT PRIMARY KEY, start BLOB NOT NULL, outcome BLOB);")?;
|
||||||
check_integrity(db, "JOURNAL_INTEGRITY")
|
let check: String = db.query_row("PRAGMA integrity_check", [], |r| r.get(0))?;
|
||||||
}
|
ensure!(check == "ok", "JOURNAL_INTEGRITY");
|
||||||
|
|
||||||
pub fn check_integrity(db: &Connection, error_code: &'static str) -> Result<()> {
|
|
||||||
let check: String = db.query_row("PRAGMA integrity_check", [], |row| row.get(0))?;
|
|
||||||
ensure!(check == "ok", "{error_code}");
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Full integrity scans for an owner holding one protected, long-lived SQLite
|
|
||||||
/// connection. External commits and schema changes require another scan even
|
|
||||||
/// when the interval has not elapsed. No cached result authorizes an effect.
|
|
||||||
#[derive(Default)]
|
|
||||||
pub(crate) struct IntegrityMonitor {
|
|
||||||
checked: Option<(u64, u64, Instant)>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl IntegrityMonitor {
|
|
||||||
pub(crate) fn check(
|
|
||||||
&mut self,
|
|
||||||
db: &Connection,
|
|
||||||
required: bool,
|
|
||||||
error_code: &'static str,
|
|
||||||
) -> Result<()> {
|
|
||||||
let data: u64 = db.query_row("PRAGMA data_version", [], |row| row.get(0))?;
|
|
||||||
let schema: u64 = db.query_row("PRAGMA schema_version", [], |row| row.get(0))?;
|
|
||||||
if !required
|
|
||||||
&& self.checked.is_some_and(|(previous_data, previous_schema, checked)| {
|
|
||||||
data == previous_data
|
|
||||||
&& schema == previous_schema
|
|
||||||
&& checked.elapsed() < Duration::from_secs(300)
|
|
||||||
})
|
|
||||||
{
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
self.checked = None;
|
|
||||||
check_integrity(db, error_code)?;
|
|
||||||
self.checked = Some((data, schema, Instant::now()));
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Before a human WebUI closure replaces the unresolved local outcome, keep the
|
/// Before a human WebUI closure replaces the unresolved local outcome, keep the
|
||||||
/// exact original outcome bytes once. A differing second copy fails closed.
|
/// exact original outcome bytes once. A differing second copy fails closed.
|
||||||
pub(crate) fn retain_closure_original(
|
pub(crate) fn retain_closure_original(
|
||||||
@@ -417,34 +379,3 @@ pub fn start_witness_bytes(
|
|||||||
"reauthentication_required":true,"postconditions_passed":false});
|
"reauthentication_required":true,"postconditions_passed":false});
|
||||||
Ok(serde_json::to_vec(&evidence)?)
|
Ok(serde_json::to_vec(&evidence)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod integrity_tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn idle_integrity_reuses_the_check_but_reaudits_external_changes_and_expiry() {
|
|
||||||
let path = std::env::temp_dir().join(format!("rmm-integrity-{}.sqlite", Uuid::new_v4()));
|
|
||||||
{
|
|
||||||
let db = Connection::open(&path).unwrap();
|
|
||||||
db.execute_batch("CREATE TABLE sample(id INTEGER PRIMARY KEY);").unwrap();
|
|
||||||
let mut monitor = IntegrityMonitor::default();
|
|
||||||
monitor.check(&db, false, "JOURNAL_INTEGRITY").unwrap();
|
|
||||||
let first = monitor.checked.unwrap();
|
|
||||||
db.execute("INSERT INTO sample VALUES (1)", []).unwrap();
|
|
||||||
monitor.check(&db, false, "JOURNAL_INTEGRITY").unwrap();
|
|
||||||
assert_eq!(monitor.checked, Some(first));
|
|
||||||
|
|
||||||
let peer = Connection::open(&path).unwrap();
|
|
||||||
peer.execute("INSERT INTO sample VALUES (2)", []).unwrap();
|
|
||||||
monitor.check(&db, false, "JOURNAL_INTEGRITY").unwrap();
|
|
||||||
let changed = monitor.checked.unwrap();
|
|
||||||
assert_ne!(changed.0, first.0);
|
|
||||||
|
|
||||||
monitor.checked = Some((changed.0, changed.1, changed.2 - Duration::from_secs(300)));
|
|
||||||
monitor.check(&db, false, "JOURNAL_INTEGRITY").unwrap();
|
|
||||||
assert!(monitor.checked.unwrap().2 >= changed.2);
|
|
||||||
}
|
|
||||||
std::fs::remove_file(path).unwrap();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -101,7 +101,6 @@ pub struct ClientSync<V = DefaultVerifier> {
|
|||||||
verifier: V,
|
verifier: V,
|
||||||
helper_identity: HelperIdentity,
|
helper_identity: HelperIdentity,
|
||||||
pending: Option<PreparedSync>,
|
pending: Option<PreparedSync>,
|
||||||
integrity: Option<crate::ledger::IntegrityMonitor>,
|
|
||||||
channel: Option<Channel>,
|
channel: Option<Channel>,
|
||||||
gate: Option<Gate>,
|
gate: Option<Gate>,
|
||||||
}
|
}
|
||||||
@@ -118,7 +117,6 @@ impl<V: Ed25519Verifier> ClientSync<V> {
|
|||||||
verifier,
|
verifier,
|
||||||
helper_identity: HelperIdentity::Root,
|
helper_identity: HelperIdentity::Root,
|
||||||
pending: None,
|
pending: None,
|
||||||
integrity: None,
|
|
||||||
channel: None,
|
channel: None,
|
||||||
gate: None,
|
gate: None,
|
||||||
}
|
}
|
||||||
@@ -129,11 +127,6 @@ impl<V: Ed25519Verifier> ClientSync<V> {
|
|||||||
self.helper_identity = identity;
|
self.helper_identity = identity;
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
/// Use with one protected SQLite connection retained for this instance.
|
|
||||||
pub fn with_periodic_idle_integrity_checks(mut self) -> Self {
|
|
||||||
self.integrity = Some(crate::ledger::IntegrityMonitor::default());
|
|
||||||
self
|
|
||||||
}
|
|
||||||
/// Invoke on every authenticated/fenced ServerHello or transport loss.
|
/// Invoke on every authenticated/fenced ServerHello or transport loss.
|
||||||
pub fn close(&mut self) {
|
pub fn close(&mut self) {
|
||||||
self.gate = None;
|
self.gate = None;
|
||||||
@@ -613,17 +606,7 @@ impl<V: Ed25519Verifier> ClientSync<V> {
|
|||||||
channel.connection_generation > 0 && !channel.boot_id.is_nil(),
|
channel.connection_generation > 0 && !channel.boot_id.is_nil(),
|
||||||
"UNAUTHENTICATED_CHANNEL"
|
"UNAUTHENTICATED_CHANNEL"
|
||||||
);
|
);
|
||||||
if let Some(integrity) = &mut self.integrity {
|
|
||||||
let work_pending: bool = db.query_row(
|
|
||||||
"SELECT EXISTS(SELECT 1 FROM job_attempts WHERE state NOT IN ('succeeded','failed','cancelled','expired','closed_unknown'))",
|
|
||||||
[],
|
|
||||||
|row| row.get(0),
|
|
||||||
)?;
|
|
||||||
integrity.check(db, work_pending, "JOURNAL_INTEGRITY")?;
|
|
||||||
initialize_schema(db)?;
|
|
||||||
} else {
|
|
||||||
initialize(db)?;
|
initialize(db)?;
|
||||||
}
|
|
||||||
let tx = db.transaction_with_behavior(TransactionBehavior::Immediate)?;
|
let tx = db.transaction_with_behavior(TransactionBehavior::Immediate)?;
|
||||||
let meta = metadata(&tx)?;
|
let meta = metadata(&tx)?;
|
||||||
ensure!(meta.fault.is_none(), "SYNC_MANUAL_RECOVERY_REQUIRED");
|
ensure!(meta.fault.is_none(), "SYNC_MANUAL_RECOVERY_REQUIRED");
|
||||||
@@ -1164,11 +1147,8 @@ impl<V: Ed25519Verifier> ClientSync<V> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn initialize(db: &Connection) -> Result<()> {
|
pub fn initialize(db: &Connection) -> Result<()> {
|
||||||
crate::ledger::check_integrity(db, "JOURNAL_INTEGRITY")?;
|
let check: String = db.query_row("PRAGMA integrity_check", [], |r| r.get(0))?;
|
||||||
initialize_schema(db)
|
ensure!(check == "ok", "JOURNAL_INTEGRITY");
|
||||||
}
|
|
||||||
|
|
||||||
fn initialize_schema(db: &Connection) -> Result<()> {
|
|
||||||
db.execute_batch("PRAGMA synchronous=FULL;
|
db.execute_batch("PRAGMA synchronous=FULL;
|
||||||
CREATE TABLE IF NOT EXISTS reconcile_meta(id INTEGER PRIMARY KEY CHECK(id=1),journal_id TEXT NOT NULL,checkpoint INTEGER NOT NULL DEFAULT 0,high_sequence INTEGER NOT NULL DEFAULT 0,generation INTEGER NOT NULL DEFAULT 0,last_decision TEXT,pending_request TEXT,helper_id TEXT,helper_checkpoint INTEGER NOT NULL DEFAULT 0,fault TEXT);
|
CREATE TABLE IF NOT EXISTS reconcile_meta(id INTEGER PRIMARY KEY CHECK(id=1),journal_id TEXT NOT NULL,checkpoint INTEGER NOT NULL DEFAULT 0,high_sequence INTEGER NOT NULL DEFAULT 0,generation INTEGER NOT NULL DEFAULT 0,last_decision TEXT,pending_request TEXT,helper_id TEXT,helper_checkpoint INTEGER NOT NULL DEFAULT 0,fault TEXT);
|
||||||
CREATE TABLE IF NOT EXISTS reconcile_requests(id TEXT PRIMARY KEY,request BLOB NOT NULL,envelope BLOB NOT NULL,generation INTEGER NOT NULL,response BLOB);
|
CREATE TABLE IF NOT EXISTS reconcile_requests(id TEXT PRIMARY KEY,request BLOB NOT NULL,envelope BLOB NOT NULL,generation INTEGER NOT NULL,response BLOB);
|
||||||
|
|||||||
@@ -466,31 +466,6 @@ struct Fixture {
|
|||||||
identity: HelperIdentity,
|
identity: HelperIdentity,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn idle_anchor_checks_the_head_but_abandonment_rejects_damaged_history() {
|
|
||||||
let (mut f, sync, _, request, mut guard) = denial_case();
|
|
||||||
let mut sync = sync.with_periodic_idle_integrity_checks();
|
|
||||||
f.clock.now += Duration::seconds(1);
|
|
||||||
let capture = f.snapshot(&mut sync, 7);
|
|
||||||
let raw = f.request(&capture);
|
|
||||||
let ready = f.decision(&capture, &raw, 7, true);
|
|
||||||
assert!(f.apply(&mut sync, &ready, &raw).unwrap().ready);
|
|
||||||
guard.intent_recorded_at = f.clock.now;
|
|
||||||
f.db.execute(
|
|
||||||
"UPDATE helper_sync_decisions SET response=X'00' WHERE checkpoint < ?1",
|
|
||||||
[capture.checkpoint],
|
|
||||||
).unwrap();
|
|
||||||
|
|
||||||
let anchor = sync.no_start_anchor(&f.db, &guard, 7, &f.clock, &f.boot).unwrap();
|
|
||||||
guard.anchor_sha256 = hash(&serde_json::to_vec(&anchor).unwrap());
|
|
||||||
let before = denial_ledger_bytes(&f.db);
|
|
||||||
assert!(
|
|
||||||
sync.abandon_no_start(&mut f.db, &guard, &anchor, &request, &f.clock, &f.boot)
|
|
||||||
.is_err()
|
|
||||||
);
|
|
||||||
assert_eq!(denial_ledger_bytes(&f.db), before);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn checkpoint_repair_verifies_complete_signed_history_and_detects_removed_predecessor() {
|
fn checkpoint_repair_verifies_complete_signed_history_and_detects_removed_predecessor() {
|
||||||
let mut f = Fixture::new();
|
let mut f = Fixture::new();
|
||||||
|
|||||||
@@ -903,6 +903,9 @@ impl SystemHelper {
|
|||||||
RuntimeClock::enrolled_windows_update_helper(settings.binding.clone(), settings.helper.clone())
|
RuntimeClock::enrolled_windows_update_helper(settings.binding.clone(), settings.helper.clone())
|
||||||
} else { RuntimeClock::new(rmm_time_attestation::Role::SystemHelper) }.for_generation(0);
|
} else { RuntimeClock::new(rmm_time_attestation::Role::SystemHelper) }.for_generation(0);
|
||||||
let boot = WindowsBoot::capture()?;
|
let boot = WindowsBoot::capture()?;
|
||||||
|
let sync = HelperSync::with_verifier(settings.binding.clone(), DalekVerifier, &clock)
|
||||||
|
.ok()
|
||||||
|
.map(|s| s.with_helper_identity(HelperIdentity::System));
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
settings,
|
settings,
|
||||||
pin,
|
pin,
|
||||||
@@ -911,8 +914,7 @@ impl SystemHelper {
|
|||||||
db,
|
db,
|
||||||
clock,
|
clock,
|
||||||
boot,
|
boot,
|
||||||
// The initial connection creates the reconciler using its own qualified time.
|
sync,
|
||||||
sync: None,
|
|
||||||
last_diagnostic: None,
|
last_diagnostic: None,
|
||||||
last_apply_diagnostic: None,
|
last_apply_diagnostic: None,
|
||||||
unsettled_msi: None,
|
unsettled_msi: None,
|
||||||
@@ -1006,17 +1008,14 @@ impl SystemHelper {
|
|||||||
}
|
}
|
||||||
fn sync(&mut self) -> Result<&mut HelperSync<DalekVerifier>> {
|
fn sync(&mut self) -> Result<&mut HelperSync<DalekVerifier>> {
|
||||||
if self.sync.is_none() {
|
if self.sync.is_none() {
|
||||||
let sync = HelperSync::with_verifier(
|
self.sync = Some(
|
||||||
|
HelperSync::with_verifier(
|
||||||
self.settings.binding.clone(),
|
self.settings.binding.clone(),
|
||||||
DalekVerifier,
|
DalekVerifier,
|
||||||
&self.clock,
|
&self.clock,
|
||||||
)?
|
)?
|
||||||
.with_helper_identity(HelperIdentity::System);
|
.with_helper_identity(HelperIdentity::System),
|
||||||
self.sync = Some(if self.settings.managed_scripts() {
|
);
|
||||||
sync.with_periodic_idle_integrity_checks()
|
|
||||||
} else {
|
|
||||||
sync
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
self.sync.as_mut().context("SYSTEM_SYNC_CLOSED")
|
self.sync.as_mut().context("SYSTEM_SYNC_CLOSED")
|
||||||
}
|
}
|
||||||
@@ -1291,16 +1290,6 @@ impl SystemHelper {
|
|||||||
}
|
}
|
||||||
ensure!(self.settings.enable_effects, "SYSTEM_EFFECTS_DISABLED");
|
ensure!(self.settings.enable_effects, "SYSTEM_EFFECTS_DISABLED");
|
||||||
verified_window(&self.settings.binding, request, &self.clock)?;
|
verified_window(&self.settings.binding, request, &self.clock)?;
|
||||||
if self.settings.managed_scripts() {
|
|
||||||
ledger::check_integrity(&self.db, "ROOT_LEDGER_INTEGRITY")?;
|
|
||||||
rmm_agent_core::helper_reconcile::verify_checkpoint_repair_history_with(
|
|
||||||
&self.db,
|
|
||||||
&self.settings.binding,
|
|
||||||
None,
|
|
||||||
HelperIdentity::System,
|
|
||||||
&DalekVerifier,
|
|
||||||
)?;
|
|
||||||
}
|
|
||||||
self.sync()?;
|
self.sync()?;
|
||||||
ensure!(
|
ensure!(
|
||||||
self.sync.as_ref().unwrap().can_start(
|
self.sync.as_ref().unwrap().can_start(
|
||||||
|
|||||||
@@ -1291,8 +1291,8 @@ impl Agent {
|
|||||||
&& !self.helper_apply_unconfirmed
|
&& !self.helper_apply_unconfirmed
|
||||||
&& !self.prepared
|
&& !self.prepared
|
||||||
&& self.running.is_none()
|
&& self.running.is_none()
|
||||||
&& self.helper_probe_at.elapsed() >= Duration::from_secs(30)
|
|
||||||
&& !self.journal.connection().query_row("SELECT EXISTS(SELECT 1 FROM job_attempts WHERE state IN ('requesting','running','verifying'))",[],|r|r.get::<_,bool>(0))?
|
&& !self.journal.connection().query_row("SELECT EXISTS(SELECT 1 FROM job_attempts WHERE state IN ('requesting','running','verifying'))",[],|r|r.get::<_,bool>(0))?
|
||||||
|
&& self.helper_probe_at.elapsed() >= Duration::from_secs(30)
|
||||||
{
|
{
|
||||||
let agent = self.identity.agent_id.clone();
|
let agent = self.identity.agent_id.clone();
|
||||||
let asset = self.identity.asset_id.clone();
|
let asset = self.identity.asset_id.clone();
|
||||||
@@ -2663,9 +2663,8 @@ impl Agent {
|
|||||||
let mut heartbeat = Instant::now() - Duration::from_secs(60);
|
let mut heartbeat = Instant::now() - Duration::from_secs(60);
|
||||||
let mut previous_cpu = None;
|
let mut previous_cpu = None;
|
||||||
let mut heartbeat_after = Duration::from_secs(30);
|
let mut heartbeat_after = Duration::from_secs(30);
|
||||||
let active_tick = Duration::from_millis(20);
|
let mut tick = tokio::time::interval(Duration::from_millis(20));
|
||||||
let idle_tick = Duration::from_millis(250);
|
tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
|
||||||
let mut next_tick = tokio::time::Instant::now();
|
|
||||||
let mut readiness_at = Instant::now() - Duration::from_secs(5);
|
let mut readiness_at = Instant::now() - Duration::from_secs(5);
|
||||||
#[cfg(feature = "system-helper")]
|
#[cfg(feature = "system-helper")]
|
||||||
let mut update_control_at = Instant::now() - Duration::from_secs(2);
|
let mut update_control_at = Instant::now() - Duration::from_secs(2);
|
||||||
@@ -2676,19 +2675,9 @@ impl Agent {
|
|||||||
running.cancel.store(true, Ordering::SeqCst);
|
running.cancel.store(true, Ordering::SeqCst);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let control_pending = self.running.is_some()
|
|
||||||
|| self.prepared
|
|
||||||
|| self.deferred_sync.is_some()
|
|
||||||
|| self.deferred_permit.is_some()
|
|
||||||
|| self.helper_control_pending();
|
|
||||||
#[cfg(feature = "system-helper")]
|
|
||||||
let control_pending = control_pending || self.helper_probe.is_some();
|
|
||||||
let cadence = if control_pending { active_tick } else { idle_tick };
|
|
||||||
next_tick = next_tick.min(tokio::time::Instant::now() + cadence);
|
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
Some(completion)=self.completed_rx.recv()=>{self.completed(generation,completion)?;needs_sync=true;},
|
Some(completion)=self.completed_rx.recv()=>{self.completed(generation,completion)?;needs_sync=true;},
|
||||||
_=tokio::time::sleep_until(next_tick)=>{
|
_=tick.tick()=>{
|
||||||
next_tick = tokio::time::Instant::now() + cadence;
|
|
||||||
if !stop.load(Ordering::SeqCst) && self.poll_sync_apply(generation,true).is_err(){self.close_gate();needs_sync=true;}
|
if !stop.load(Ordering::SeqCst) && self.poll_sync_apply(generation,true).is_err(){self.close_gate();needs_sync=true;}
|
||||||
#[cfg(feature = "system-helper")]
|
#[cfg(feature = "system-helper")]
|
||||||
if !stop.load(Ordering::SeqCst) && self.poll_helper(&channel,generation).await.is_err() {self.close_gate();needs_sync=self.sync.is_some();}
|
if !stop.load(Ordering::SeqCst) && self.poll_helper(&channel,generation).await.is_err() {self.close_gate();needs_sync=self.sync.is_some();}
|
||||||
@@ -2720,9 +2709,7 @@ impl Agent {
|
|||||||
if self.sync.is_some() && !self.prepared && !self.helper_control_busy_for_sync() && rmm_agent_windows::job_readiness::refresh_due(needs_sync,sync_at.elapsed(),self.sync.as_ref().and_then(|s|s.validity_deadline()),self.clock.reading().ok().map(|r|r.upper)) {
|
if self.sync.is_some() && !self.prepared && !self.helper_control_busy_for_sync() && rmm_agent_windows::job_readiness::refresh_due(needs_sync,sync_at.elapsed(),self.sync.as_ref().and_then(|s|s.validity_deadline()),self.clock.reading().ok().map(|r|r.upper)) {
|
||||||
if self.start_sync(&channel,generation).await.is_err(){self.close_gate();needs_sync=true;}else{needs_sync=false;}sync_at=Instant::now();
|
if self.start_sync(&channel,generation).await.is_err(){self.close_gate();needs_sync=true;}else{needs_sync=false;}sync_at=Instant::now();
|
||||||
}
|
}
|
||||||
if Instant::now() >= permit_after && !needs_sync && !self.prepared && self.config.enable_jobs
|
if Instant::now() >= permit_after && !needs_sync && !self.prepared && self.ready(generation) && jobs::events(self.journal.connection())?.is_empty() && self.journal.count()?==0 {
|
||||||
&& self.journal.connection().prepare_cached("SELECT EXISTS(SELECT 1 FROM job_attempts WHERE state='accepted' AND cancel_requested=0)")?.query_row([], |row| row.get::<_, bool>(0))?
|
|
||||||
&& self.ready(generation) && jobs::events(self.journal.connection())?.is_empty() && self.journal.count()?==0 {
|
|
||||||
// A transiently stale clock skips this tick; it must not end the session.
|
// A transiently stale clock skips this tick; it must not end the session.
|
||||||
if let Ok(now)=self.clock.now() && let Some(offer)=jobs::next_at(self.journal.connection(),now)? {
|
if let Ok(now)=self.clock.now() && let Some(offer)=jobs::next_at(self.journal.connection(),now)? {
|
||||||
let job=self.binding.as_ref().context("JOB_BINDING_REQUIRED")?.job(&offer.payload_bytes)?;
|
let job=self.binding.as_ref().context("JOB_BINDING_REQUIRED")?.job(&offer.payload_bytes)?;
|
||||||
@@ -3091,19 +3078,7 @@ async fn run_service_binding(path: &Path, stop: &'static AtomicBool, release_gua
|
|||||||
ensure!(rmm_agent_windows::echo_probe::protected_scope()? == *scope, "WINDOWS_ECHO_CONFIGURATION_CHANGED");
|
ensure!(rmm_agent_windows::echo_probe::protected_scope()? == *scope, "WINDOWS_ECHO_CONFIGURATION_CHANGED");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let sync = if config.enable_jobs && (!config.windows_echo_probe_only || config.echo_scope.is_some()) {
|
let sync=if config.enable_jobs && (!config.windows_echo_probe_only || config.echo_scope.is_some()) {binding.clone().map(|binding|reconcile::ClientSync::new(binding).with_helper_identity(reconcile::HelperIdentity::System))} else {None};
|
||||||
binding.clone().map(|binding| {
|
|
||||||
let sync = reconcile::ClientSync::new(binding)
|
|
||||||
.with_helper_identity(reconcile::HelperIdentity::System);
|
|
||||||
if config.localservice_time_policy.is_some() {
|
|
||||||
sync.with_periodic_idle_integrity_checks()
|
|
||||||
} else {
|
|
||||||
sync
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
let (completed_tx,completed_rx)=tokio::sync::mpsc::channel(1);
|
let (completed_tx,completed_rx)=tokio::sync::mpsc::channel(1);
|
||||||
let mut agent = Agent {
|
let mut agent = Agent {
|
||||||
config,
|
config,
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ use axum::{
|
|||||||
Json, Router,
|
Json, Router,
|
||||||
extract::{Path, Query, State},
|
extract::{Path, Query, State},
|
||||||
http::{HeaderMap, StatusCode},
|
http::{HeaderMap, StatusCode},
|
||||||
routing::{delete, post},
|
routing::{delete, patch, post},
|
||||||
};
|
};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use serde_json::{Value, json};
|
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",
|
"/api/v1/tenants/{tenant}/devices/{asset}/archive",
|
||||||
post(archive_device),
|
post(archive_device),
|
||||||
)
|
)
|
||||||
|
.route(
|
||||||
|
"/api/v1/tenants/{tenant}/devices/{asset}/purpose",
|
||||||
|
patch(update_device_purpose),
|
||||||
|
)
|
||||||
.route(
|
.route(
|
||||||
"/api/v1/tenants/{tenant}/operation-plans/{plan}/revocation",
|
"/api/v1/tenants/{tenant}/operation-plans/{plan}/revocation",
|
||||||
post(revoke_plan),
|
post(revoke_plan),
|
||||||
@@ -132,6 +136,66 @@ async fn archive_device(
|
|||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok(Json(json!({"asset_id":asset, "archived":input.archived})))
|
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)]
|
#[derive(Deserialize)]
|
||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
struct Pairing {
|
struct Pairing {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ WITH classified AS (
|
|||||||
a.last_authenticated_at,a.last_authenticated_certificate_sha256,a.certificate_sha256,
|
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.enrollment_generation,a.assignment_version,a.capabilities,a.reported_agent_version,
|
||||||
a.system_usage,a.system_usage_observed_at,
|
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
|
CASE
|
||||||
WHEN a.revoked_at IS NOT NULL THEN 'revoked'
|
WHEN a.revoked_at IS NOT NULL THEN 'revoked'
|
||||||
WHEN asset.archived_at IS NOT NULL THEN 'archived'
|
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"),
|
"agent_id":row.get::<Uuid,_>("agent_id"),"asset_id":row.get::<Uuid,_>("asset_id"),
|
||||||
"status":row.get::<String,_>("status"),"lifecycle":row.get::<String,_>("lifecycle"),
|
"status":row.get::<String,_>("status"),"lifecycle":row.get::<String,_>("lifecycle"),
|
||||||
"archived_at":row.get::<Option<DateTime<Utc>>,_>("archived_at"),"revoked_at":revoked,
|
"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(),
|
"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_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()),
|
"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"});
|
"rollout":{"max_parallel":1,"halt_after_failures":1},"reason":"test customer authorization"});
|
||||||
for request in [
|
for request in [
|
||||||
client.get(format!("{base}/{b}/devices/{asset}")),
|
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.delete(format!("{base}/{b}/devices/{asset}?agent_id={id}")),
|
||||||
client
|
client
|
||||||
.post(format!("{base}/{b}/operation-plans"))
|
.post(format!("{base}/{b}/operation-plans"))
|
||||||
@@ -530,6 +532,14 @@ mod tests {
|
|||||||
.send().await.unwrap().json::<Value>().await.unwrap();
|
.send().await.unwrap().json::<Value>().await.unwrap();
|
||||||
let deletion = || client.delete(&pair).header("origin", origin).header("cookie", cookie);
|
let deletion = || client.delete(&pair).header("origin", origin).header("cookie", cookie);
|
||||||
let csrf = session["csrf_token"].as_str().unwrap();
|
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);
|
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")
|
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();
|
.bind(a).bind(&issuer).execute(&admin).await.unwrap();
|
||||||
@@ -537,6 +547,25 @@ mod tests {
|
|||||||
.bind(a).bind(asset).execute(&admin).await.unwrap();
|
.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)")
|
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();
|
.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().send().await.unwrap().status(), StatusCode::FORBIDDEN);
|
||||||
assert_eq!(deletion().header("x-csrf-token",csrf).send().await.unwrap().status(), StatusCode::CONFLICT);
|
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}"))
|
let revoked = client.post(format!("{base}/{a}/devices/{asset}/revocation?agent_id={id}"))
|
||||||
|
|||||||
@@ -11,6 +11,11 @@
|
|||||||
| Windows | `discwindowstest`, Windows 11 Pro x64, Agent `0.1.16` aus dem offiziellen GNU-Kanal |
|
| Windows | `discwindowstest`, Windows 11 Pro x64, Agent `0.1.16` aus dem offiziellen GNU-Kanal |
|
||||||
| Quellstand mit Dokumentation | Gitea-Branch `main` |
|
| Quellstand mit Dokumentation | Gitea-Branch `main` |
|
||||||
|
|
||||||
|
## Ergänzungen zur Geräteansicht
|
||||||
|
|
||||||
|
- **RAM-Balken:** Der alte Balken hob bei „RAM frei / gesamt“ den belegten Anteil hervor. Der neue Balken färbt verfügbare Kapazität grün und belegte grau und beschriftet den freien Anteil direkt. Bei fehlenden oder ungültigen Werten wird kein Balken gezeichnet. Build, 80 Komponententests und sechs Browserprüfungen einschließlich 0 %, 75 % und 100 % frei bestanden. WebUI `577a6ee` am 19. November 2026 um 18:38 UTC ausgeliefert. Angemeldetes Chromium bestätigte für neun reale Geräte die gerenderten Segmentbreiten und Beschriftungen bei 1280, 900 und 390 px. API, Datenbank und Agenten mussten nicht geändert werden. [Browserregression](../tests/browser/customer-management.spec.ts)
|
||||||
|
- **Zweck je Gerät:** Optionale Spalte im Bestand und in der Historie, Freitextpflege im Gerätedetail. WebUI-Build, 80 Komponententests, fünf Browserprüfungen und HTTP-Rundlauf auf isoliertem PostgreSQL mit Schreib-, Lese- und Fremdkundenfällen bestanden. Am 19. November 2026 um 14:10 UTC wurde `2070ae9` mit [Migration 45](../migrations/0045_device_purpose.sql) aktiviert. API, öffentliche API und Gateway bestanden die TLS-Healthchecks; der öffentliche WebUI-Index entsprach dem Build. Angemeldetes Chromium zeigte die Zweck-Spalte für sechs Geräte, den Editor im Gerätedetail und die Spalte bei 390 px Breite. Bei der Live-Sichtprüfung wurde nichts gespeichert; kein Agentwechsel. [Bedienung](public-access.md#zweck-eines-geräts-pflegen) · [Browserregression](../tests/browser/device-purpose.spec.ts)
|
||||||
|
|
||||||
## Geräteaktionen über MCP
|
## 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.
|
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.
|
||||||
|
|||||||
@@ -8,6 +8,10 @@ Die öffentliche WebUI verwendet ein lokales Benutzerkonto mit Passwort und eine
|
|||||||
|
|
||||||
Berechtigte Benutzer können Kunden anlegen und umbenennen. Zur Aufnahme den Zielkunden wählen und unter **Verwaltung → Geräteaufnahme** einen Einmalcode erzeugen. Der Code gilt für diesen Kunden und verfällt bei erfolgreicher Aufnahme oder nach 15 Minuten. Die WebUI zeigt für die veröffentlichten Plattformen Download und Installationsbefehl. Auf dem neuen Gerät das HTTPS-Skript mit Administratorrechten aufrufen und den Code am Prompt eingeben. Für lokale Administrator-Skripte die dafür angebotene Installationsoption wählen. Der Windows-Kanal ist `x86_64-pc-windows-gnu`. [Linux-Installer](https://discovery.ease-technologies.de:8443/install/linux.sh) · [Windows-Installer](https://discovery.ease-technologies.de:8443/install/windows.ps1)
|
Berechtigte Benutzer können Kunden anlegen und umbenennen. Zur Aufnahme den Zielkunden wählen und unter **Verwaltung → Geräteaufnahme** einen Einmalcode erzeugen. Der Code gilt für diesen Kunden und verfällt bei erfolgreicher Aufnahme oder nach 15 Minuten. Die WebUI zeigt für die veröffentlichten Plattformen Download und Installationsbefehl. Auf dem neuen Gerät das HTTPS-Skript mit Administratorrechten aufrufen und den Code am Prompt eingeben. Für lokale Administrator-Skripte die dafür angebotene Installationsoption wählen. Der Windows-Kanal ist `x86_64-pc-windows-gnu`. [Linux-Installer](https://discovery.ease-technologies.de:8443/install/linux.sh) · [Windows-Installer](https://discovery.ease-technologies.de:8443/install/windows.ps1)
|
||||||
|
|
||||||
|
### Zweck eines Geräts pflegen
|
||||||
|
|
||||||
|
Unter **Geräte** den Hostnamen öffnen und im Abschnitt **Zweck** auf **Zweck bearbeiten** klicken. Der Freitext darf bis zu 500 Zeichen enthalten. Speichern übernimmt ihn auch in die Übersicht. Zum Entfernen das Feld leeren und erneut speichern. Das Bearbeiten erfordert `inventory:read` und `devices:revoke` im betreffenden Kunden.
|
||||||
|
|
||||||
### Hypervisor einer VM zuordnen
|
### Hypervisor einer VM zuordnen
|
||||||
|
|
||||||
Eine VM unter **Geräte** öffnen und unter **Gerät verwalten → Hypervisor zuordnen** einen Host aus demselben Kundenbestand auswählen. Die Zuordnung speichern. Der Hostname erscheint unter dem VM-Namen in der Übersicht und öffnet die Details des Hypervisors. **Kein konkreter Hypervisor** entfernt die gespeicherte Zuordnung.
|
Eine VM unter **Geräte** öffnen und unter **Gerät verwalten → Hypervisor zuordnen** einen Host aus demselben Kundenbestand auswählen. Die Zuordnung speichern. Der Hostname erscheint unter dem VM-Namen in der Übersicht und öffnet die Details des Hypervisors. **Kein konkreter Hypervisor** entfernt die gespeicherte Zuordnung.
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -20,6 +20,63 @@ test.beforeAll(async () => {
|
|||||||
|
|
||||||
test.afterAll(async () => { await server?.close(); });
|
test.afterAll(async () => { await server?.close(); });
|
||||||
|
|
||||||
|
test('draws the free RAM share accurately on desktop and mobile', async ({ page }) => {
|
||||||
|
const customer = { tenant_id: '11111111-1111-4111-8111-111111111111', name: 'RAM-Test' };
|
||||||
|
const gib = 2 ** 30;
|
||||||
|
const readings = [
|
||||||
|
['mostly-free', 12 * gib, 16 * gib],
|
||||||
|
['all-used', 0, 16 * gib],
|
||||||
|
['all-free', 16 * gib, 16 * gib],
|
||||||
|
['missing-available', null, 16 * gib],
|
||||||
|
['invalid-range', 17 * gib, 16 * gib],
|
||||||
|
['invalid-total', 0, 0],
|
||||||
|
] as const;
|
||||||
|
const listing = (items: unknown[]) => ({
|
||||||
|
items, next_cursor: null, truncated: false, completeness: 'complete', as_of: '2026-11-19T12:00:00Z'
|
||||||
|
});
|
||||||
|
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: 'ram-reader', testsimulation: false, tenant_id: customer.tenant_id,
|
||||||
|
csrf_token: 'ram-fixture', permissions: ['inventory:read'] }
|
||||||
|
}));
|
||||||
|
await page.route(`${origin}/api/v1/**`, route => {
|
||||||
|
const pathname = new URL(route.request().url()).pathname;
|
||||||
|
if (pathname === '/api/v1/tenants') return route.fulfill({ json: listing([customer]) });
|
||||||
|
if (pathname === '/api/v1/devices') return route.fulfill({
|
||||||
|
json: listing(readings.map(([hostname, free, total]) => ({
|
||||||
|
tenant_id: customer.tenant_id, customer_name: customer.name, asset_id: hostname, agent_id: hostname,
|
||||||
|
lifecycle: 'current', status: 'online', hostname, ram_available_bytes: free, ram_total_bytes: total,
|
||||||
|
disk_free_bytes: 12 * gib, disk_total_bytes: 16 * gib
|
||||||
|
})))
|
||||||
|
});
|
||||||
|
return route.fulfill({ status: 404 });
|
||||||
|
});
|
||||||
|
await page.goto(`${origin}/#geraete`);
|
||||||
|
const row = (host: string) => page.getByRole('row').filter({ has: page.getByRole('button', { name: host, exact: true }) });
|
||||||
|
const ram = (host: string) => row(host).locator('[data-label="RAM frei / gesamt"]');
|
||||||
|
await expect(ram('mostly-free')).toContainText('12 / 16 GiB');
|
||||||
|
await expect(ram('mostly-free').locator('.capacity-caption')).toHaveText('75 % frei');
|
||||||
|
await expect(row('mostly-free').locator('[data-label="Speicher frei / gesamt"] .capacity-track i'))
|
||||||
|
.toHaveAttribute('style', 'width: 25%;');
|
||||||
|
for (const width of [1280, 900, 390]) {
|
||||||
|
await page.setViewportSize({ width, height: 844 });
|
||||||
|
for (const [host, free] of [['mostly-free', 75], ['all-used', 0], ['all-free', 100]] as const) {
|
||||||
|
const bar = ram(host).getByRole('img', { name: `${free} % frei, ${100 - free} % belegt` });
|
||||||
|
await expect(bar).toBeVisible();
|
||||||
|
const [track = 0, freeWidth = 0, usedWidth = 0] = await bar.evaluate(el => [el, ...Array.from(el.children)]
|
||||||
|
.map(part => part.getBoundingClientRect().width));
|
||||||
|
expect(track).toBeGreaterThan(0);
|
||||||
|
expect(freeWidth / track).toBeCloseTo(free / 100, 2);
|
||||||
|
expect(usedWidth / track).toBeCloseTo((100 - free) / 100, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (const host of ['missing-available', 'invalid-range', 'invalid-total']) {
|
||||||
|
await expect(ram(host).locator('.capacity-track')).toHaveCount(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
test('creates and renames a customer, opens its inventory, and hides editing for a reader', async ({ page }) => {
|
test('creates and renames a customer, opens its inventory, and hides editing for a reader', async ({ page }) => {
|
||||||
const home = { tenant_id: '11111111-1111-4111-8111-111111111111', name: 'Testzentrale' };
|
const home = { tenant_id: '11111111-1111-4111-8111-111111111111', name: 'Testzentrale' };
|
||||||
const customerId = '22222222-2222-4222-8222-222222222222';
|
const customerId = '22222222-2222-4222-8222-222222222222';
|
||||||
@@ -108,12 +165,12 @@ test('creates and renames a customer, opens its inventory, and hides editing for
|
|||||||
const headers = page.locator('.fleet-table thead th[scope="col"]');
|
const headers = page.locator('.fleet-table thead th[scope="col"]');
|
||||||
await expect(headers.nth(0)).toHaveText('Hostname');
|
await expect(headers.nth(0)).toHaveText('Hostname');
|
||||||
await expect(headers.nth(1)).toHaveText('Type');
|
await expect(headers.nth(1)).toHaveText('Type');
|
||||||
await expect(device.getByRole('cell').nth(2)).toHaveText('hypervisor');
|
await expect(device.locator('[data-label="Type"]')).toHaveText('hypervisor');
|
||||||
await expect(device.getByRole('cell').nth(3)).toHaveText('Proxmox VE');
|
await expect(device.locator('[data-label="OS"]')).toHaveText('Proxmox VE');
|
||||||
const memory = device.locator('[data-label="RAM frei / gesamt"]');
|
const memory = device.locator('[data-label="RAM frei / gesamt"]');
|
||||||
await expect(memory).toHaveText('6 / 16 GiB');
|
await expect(memory).toContainText('6 / 16 GiB');
|
||||||
await expect(memory.locator('.capacity-track')).toHaveAttribute('title', '37,5 % frei');
|
await expect(memory.getByRole('img', { name: '37,5 % frei, 62,5 % belegt' })).toBeVisible();
|
||||||
await expect(memory.locator('.capacity-track i')).toHaveAttribute('style', 'width: 62.5%;');
|
await expect(memory.locator('.capacity-free')).toHaveAttribute('style', 'width: 37.5%;');
|
||||||
await expect(device.locator('[data-label="Speicher frei / gesamt"] .capacity-track i'))
|
await expect(device.locator('[data-label="Speicher frei / gesamt"] .capacity-track i'))
|
||||||
.toHaveAttribute('style', 'width: 25%;');
|
.toHaveAttribute('style', 'width: 25%;');
|
||||||
await expect(device.getByText('Auslastung 0 %', { exact: true })).toBeVisible();
|
await expect(device.getByText('Auslastung 0 %', { exact: true })).toBeVisible();
|
||||||
|
|||||||
@@ -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<intern>';
|
||||||
|
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);
|
||||||
|
});
|
||||||
+103
-18
@@ -29,6 +29,7 @@ import { SyncAlignmentReview } from './sync-alignment-review';
|
|||||||
import { SystemNonstartReview } from './system-nonstart-review';
|
import { SystemNonstartReview } from './system-nonstart-review';
|
||||||
|
|
||||||
const unknown = 'Nicht gemeldet';
|
const unknown = 'Nicht gemeldet';
|
||||||
|
const noPurpose = 'Nicht hinterlegt';
|
||||||
const number = new Intl.NumberFormat('de-DE', { maximumFractionDigits: 1 });
|
const number = new Intl.NumberFormat('de-DE', { maximumFractionDigits: 1 });
|
||||||
const date = new Intl.DateTimeFormat('de-DE', { dateStyle: 'medium', timeStyle: 'short' });
|
const date = new Intl.DateTimeFormat('de-DE', { dateStyle: 'medium', timeStyle: 'short' });
|
||||||
function label(value: unknown) {
|
function label(value: unknown) {
|
||||||
@@ -88,24 +89,35 @@ function Presence({ d }: { d: RecordValue }) {
|
|||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
function Capacity({ free, total }: { free: unknown; total: unknown }) {
|
function Capacity({ free, total, showBreakdown = false }: {
|
||||||
|
free: unknown;
|
||||||
|
total: unknown;
|
||||||
|
showBreakdown?: boolean;
|
||||||
|
}) {
|
||||||
|
const freePercent = typeof free === 'number' && typeof total === 'number' &&
|
||||||
|
Number.isFinite(total) && free >= 0 && free <= total && total > 0
|
||||||
|
? (free / total) * 100
|
||||||
|
: null;
|
||||||
|
const displayFree = freePercent === null ? null : Math.round(freePercent * 10) / 10;
|
||||||
|
const freeLabel = displayFree === null ? '' : `${number.format(displayFree)} % frei`;
|
||||||
|
const breakdown = displayFree === null ? '' : `${freeLabel}, ${number.format(100 - displayFree)} % belegt`;
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<span>{capacity(free, total)}</span>
|
<span>{capacity(free, total)}</span>
|
||||||
{typeof free === 'number' &&
|
{freePercent !== null && (showBreakdown ? (
|
||||||
typeof total === 'number' &&
|
<>
|
||||||
Number.isFinite(total) &&
|
<span className="capacity-track capacity-breakdown" role="img"
|
||||||
free >= 0 &&
|
aria-label={breakdown} title={breakdown}>
|
||||||
free <= total &&
|
<span className="capacity-free" style={{ width: `${freePercent}%` }} />
|
||||||
total > 0 && (
|
<span className="capacity-used" />
|
||||||
<span
|
|
||||||
className="capacity-track"
|
|
||||||
title={`${number.format((100 * free) / total)} % frei`}
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<i style={{ width: `${(100 * (total - free)) / total}%` }} />
|
|
||||||
</span>
|
</span>
|
||||||
)}
|
<small className="capacity-caption" aria-hidden="true">{freeLabel}</small>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<span className="capacity-track" title={freeLabel} aria-hidden="true">
|
||||||
|
<i style={{ width: `${100 - freePercent}%` }} />
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -127,6 +139,64 @@ function devicePath(customer: string, asset: string) {
|
|||||||
return tenantPath(customer, '/devices/' + encodeURIComponent(asset));
|
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<string | null>(null);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const tooLong = Array.from(draft?.trim() ?? '').length > 500;
|
||||||
|
const close = () => { setDraft(null); setError(null); };
|
||||||
|
return (
|
||||||
|
<section className="device-purpose">
|
||||||
|
<h2>Zweck</h2>
|
||||||
|
{editor && draft !== null ? (
|
||||||
|
<form onSubmit={async (e) => {
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}}>
|
||||||
|
<label>
|
||||||
|
Zweck des Geräts
|
||||||
|
<textarea autoFocus rows={3} value={draft} disabled={busy}
|
||||||
|
aria-describedby="device-purpose-help" aria-invalid={tooLong}
|
||||||
|
onChange={(e) => setDraft(e.target.value)} />
|
||||||
|
</label>
|
||||||
|
<p id="device-purpose-help" className={tooLong ? 'error' : 'muted'}>
|
||||||
|
{tooLong ? 'Der Zweck ist zu lang. ' : ''}Maximal 500 Zeichen. Zum Entfernen das Feld leeren.
|
||||||
|
</p>
|
||||||
|
<ErrorBox error={error} />
|
||||||
|
<button type="submit" disabled={busy || tooLong}>{busy ? 'Speichert …' : 'Zweck speichern'}</button>{' '}
|
||||||
|
<button type="button" className="quiet" disabled={busy} onClick={close}>Abbrechen</button>
|
||||||
|
</form>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<p className={'purpose-text' + (value ? '' : ' muted')}>{value || noPurpose}</p>
|
||||||
|
{editor && <button className="quiet" onClick={() => setDraft(value)}>Zweck bearbeiten</button>}
|
||||||
|
{success && <p role="status">Zweck gespeichert.</p>}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function reportedScriptProfiles(device: RecordValue) {
|
function reportedScriptProfiles(device: RecordValue) {
|
||||||
const os = devicePlatform(device);
|
const os = devicePlatform(device);
|
||||||
if (!os || !Array.isArray(device.capabilities)) return 'Nicht gemeldet';
|
if (!os || !Array.isArray(device.capabilities)) return 'Nicht gemeldet';
|
||||||
@@ -176,6 +246,7 @@ function DeviceDetail({
|
|||||||
[error, setError] = useState<string | null>(null);
|
[error, setError] = useState<string | null>(null);
|
||||||
const [confirmDelete, setConfirmDelete] = useState(false);
|
const [confirmDelete, setConfirmDelete] = useState(false);
|
||||||
const [managing, setManaging] = useState(false);
|
const [managing, setManaging] = useState(false);
|
||||||
|
const [purposeSaved, setPurposeSaved] = useState(false);
|
||||||
const d = detail.data;
|
const d = detail.data;
|
||||||
const scoped = membership.data;
|
const scoped = membership.data;
|
||||||
const volumes = Array.isArray(d?.volumes) ? d.volumes.map((v) => record(v)) : [];
|
const volumes = Array.isArray(d?.volumes) ? d.volumes.map((v) => record(v)) : [];
|
||||||
@@ -221,6 +292,14 @@ function DeviceDetail({
|
|||||||
))}
|
))}
|
||||||
</dl>
|
</dl>
|
||||||
</section>
|
</section>
|
||||||
|
<DevicePurpose
|
||||||
|
value={typeof d.purpose === 'string' ? d.purpose : ''}
|
||||||
|
path={path}
|
||||||
|
customer={customer}
|
||||||
|
editor={scoped && allowed(scoped, 'devices:revoke') && allowed(scoped, 'inventory:read') ? scoped : null}
|
||||||
|
success={purposeSaved}
|
||||||
|
onSaved={() => { setPurposeSaved(true); detail.reload(); }}
|
||||||
|
/>
|
||||||
<DeviceInventoryPanels device={d} />
|
<DeviceInventoryPanels device={d} />
|
||||||
{volumes.length > 0 && (
|
{volumes.length > 0 && (
|
||||||
<section>
|
<section>
|
||||||
@@ -557,9 +636,9 @@ export function Devices({
|
|||||||
<span className="sr-only">Ziel auswählen</span>
|
<span className="sr-only">Ziel auswählen</span>
|
||||||
</th>
|
</th>
|
||||||
)}
|
)}
|
||||||
{['Hostname', 'Type', 'OS', 'Status', 'Speicher frei / gesamt', 'RAM frei / gesamt', 'CPU', 'Kunde'].map(
|
{['Hostname', 'Type', 'Zweck', 'OS', 'Status', 'Speicher frei / gesamt', 'RAM frei / gesamt', 'CPU', 'Kunde'].map(
|
||||||
(h) => (
|
(h) => (
|
||||||
<th scope="col" key={h}>
|
<th scope="col" key={h} className={h === 'Zweck' ? 'purpose-col' : undefined}>
|
||||||
{h}
|
{h}
|
||||||
</th>
|
</th>
|
||||||
)
|
)
|
||||||
@@ -571,7 +650,8 @@ export function Devices({
|
|||||||
const asset = objectId(d, 'asset'),
|
const asset = objectId(d, 'asset'),
|
||||||
agent = objectId(d, 'agent'),
|
agent = objectId(d, 'agent'),
|
||||||
customer = objectId(d, 'tenant'),
|
customer = objectId(d, 'tenant'),
|
||||||
model = cpu(d);
|
model = cpu(d),
|
||||||
|
purpose = typeof d.purpose === 'string' ? d.purpose : '';
|
||||||
const show = () => {
|
const show = () => {
|
||||||
setDeletionNotice('');
|
setDeletionNotice('');
|
||||||
window.location.hash = ['geraete', customer, asset, agent]
|
window.location.hash = ['geraete', customer, asset, agent]
|
||||||
@@ -608,6 +688,11 @@ export function Devices({
|
|||||||
<HypervisorLabel device={d} />
|
<HypervisorLabel device={d} />
|
||||||
</td>
|
</td>
|
||||||
<td data-label="Type">{label(d.device_type)}</td>
|
<td data-label="Type">{label(d.device_type)}</td>
|
||||||
|
<td data-label="Zweck" className="purpose-col">
|
||||||
|
<span className={'purpose-text' + (purpose ? '' : ' muted')} title={purpose || undefined}>
|
||||||
|
{purpose || noPurpose}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
<td data-label="OS">{label(d.os)}</td>
|
<td data-label="OS">{label(d.os)}</td>
|
||||||
<td data-label="Status" className="device-presence">
|
<td data-label="Status" className="device-presence">
|
||||||
<Presence d={d} />
|
<Presence d={d} />
|
||||||
@@ -619,7 +704,7 @@ export function Devices({
|
|||||||
<Capacity free={d.disk_free_bytes} total={d.disk_total_bytes} />
|
<Capacity free={d.disk_free_bytes} total={d.disk_total_bytes} />
|
||||||
</td>
|
</td>
|
||||||
<td data-label="RAM frei / gesamt" className="capacity-cell" title={measuredAt(d.ram_observed_at)}>
|
<td data-label="RAM frei / gesamt" className="capacity-cell" title={measuredAt(d.ram_observed_at)}>
|
||||||
<Capacity free={d.ram_available_bytes} total={d.ram_total_bytes} />
|
<Capacity free={d.ram_available_bytes} total={d.ram_total_bytes} showBreakdown />
|
||||||
</td>
|
</td>
|
||||||
<td data-label="CPU">
|
<td data-label="CPU">
|
||||||
{model.primary}
|
{model.primary}
|
||||||
|
|||||||
+10
-1
@@ -97,12 +97,20 @@ section.fleet { padding:0; overflow:hidden; }
|
|||||||
.vm-hypervisor { display:flex; align-items:baseline; gap:6px; margin-top:5px; color:var(--subtle); font-size:.78rem; overflow-wrap:anywhere; }
|
.vm-hypervisor { display:flex; align-items:baseline; gap:6px; margin-top:5px; color:var(--subtle); font-size:.78rem; overflow-wrap:anywhere; }
|
||||||
.vm-hypervisor .nav-icon { width:13px; height:13px; flex:none; align-self:flex-start; margin-top:2px; }
|
.vm-hypervisor .nav-icon { width:13px; height:13px; flex:none; align-self:flex-start; margin-top:2px; }
|
||||||
.fleet-table .target-col { width:35px; }
|
.fleet-table .target-col { width:35px; }
|
||||||
|
.fleet-table th.purpose-col { width:17%; }
|
||||||
|
.purpose-text { white-space:pre-wrap; overflow-wrap:anywhere; }
|
||||||
|
.fleet-table .purpose-text { display:-webkit-box; -webkit-box-orient:vertical; -webkit-line-clamp:3; overflow:hidden; }
|
||||||
|
.device-purpose textarea { font-family:inherit; }
|
||||||
.fleet-table td[data-label="Type"] { overflow-wrap:anywhere; }
|
.fleet-table td[data-label="Type"] { overflow-wrap:anywhere; }
|
||||||
.fleet-table input[type=checkbox] { margin:0; }
|
.fleet-table input[type=checkbox] { margin:0; }
|
||||||
.host-link { padding:0; background:none; color:var(--accent); text-align:left; font-weight:680; margin:0; overflow-wrap:anywhere; }
|
.host-link { padding:0; background:none; color:var(--accent); text-align:left; font-weight:680; margin:0; overflow-wrap:anywhere; }
|
||||||
.fleet-table .capacity-cell { font-variant-numeric:tabular-nums; }
|
.fleet-table .capacity-cell { font-variant-numeric:tabular-nums; }
|
||||||
.capacity-track { display:block; width:min(90px,100%); border-radius:2px; background:#e1ebe6; height:4px; margin-top:6px; overflow:hidden; }
|
.capacity-track { display:block; width:min(90px,100%); border-radius:2px; background:#e1ebe6; height:4px; margin-top:6px; overflow:hidden; }
|
||||||
.capacity-track i { display:block; height:100%; background:#659d84; }
|
.capacity-track i { display:block; height:100%; background:#659d84; }
|
||||||
|
.capacity-breakdown { display:flex; height:6px; }
|
||||||
|
.capacity-free { flex:none; background:#2e7657; }
|
||||||
|
.capacity-used { flex:1; background:#b5c2be; }
|
||||||
|
.capacity-caption { display:block; color:var(--subtle); }
|
||||||
.presence { display:inline-flex; align-items:center; gap:5px; border-radius:20px; padding:2px 8px; background:#edf1ef; color:#4d5f59; font-size:.8rem; font-weight:650; }
|
.presence { display:inline-flex; align-items:center; gap:5px; border-radius:20px; padding:2px 8px; background:#edf1ef; color:#4d5f59; font-size:.8rem; font-weight:650; }
|
||||||
.presence i { width:6px; height:6px; border-radius:50%; background:currentColor; }
|
.presence i { width:6px; height:6px; border-radius:50%; background:currentColor; }
|
||||||
.presence.online { color:#236343; background:#e6f4e9; }
|
.presence.online { color:#236343; background:#e6f4e9; }
|
||||||
@@ -156,7 +164,8 @@ section.fleet { padding:0; overflow:hidden; }
|
|||||||
.fleet-table td,.fleet-table td:first-child,.fleet-table td:last-child {display:block;padding:0;border:0;font-size:.9rem;}
|
.fleet-table td,.fleet-table td:first-child,.fleet-table td:last-child {display:block;padding:0;border:0;font-size:.9rem;}
|
||||||
.fleet-table td[data-label]::before {content:attr(data-label);display:block;color:var(--subtle);font-size:.73rem;}
|
.fleet-table td[data-label]::before {content:attr(data-label);display:block;color:var(--subtle);font-size:.73rem;}
|
||||||
.fleet-table .hostname {grid-column:1/-1;padding-right:28px;} .host-link {font-size:1rem;}
|
.fleet-table .hostname {grid-column:1/-1;padding-right:28px;} .host-link {font-size:1rem;}
|
||||||
.fleet-table .target-col {position:absolute;right:14px;top:14px;width:auto;} .capacity-track {width:76px;}
|
.fleet-table .purpose-col {grid-column:1/-1;}
|
||||||
|
.fleet-table .target-col {position:absolute;right:14px;top:14px;width:auto;} .capacity-track {width:min(76px,100%);}
|
||||||
.list-footer {border-top:1px solid var(--line);flex-wrap:wrap;} .facts {grid-template-columns:1fr 1fr;gap:12px;}
|
.list-footer {border-top:1px solid var(--line);flex-wrap:wrap;} .facts {grid-template-columns:1fr 1fr;gap:12px;}
|
||||||
}
|
}
|
||||||
@media(max-width:450px) { .sidebar nav a {flex-direction:column;gap:2px;} .crumb span,.crumb i {display:none;} .login {margin:18px 12px;} .facts {grid-template-columns:1fr;} }
|
@media(max-width:450px) { .sidebar nav a {flex-direction:column;gap:2px;} .crumb span,.crumb i {display:none;} .login {margin:18px 12px;} .facts {grid-template-columns:1fr;} }
|
||||||
|
|||||||
Reference in New Issue
Block a user