Verify signed time independently of job admission for passive Windows clients
Rust development slice / linux (push) Failing after 7s
Rust development slice / linux (push) Failing after 7s
This commit is contained in:
@@ -458,9 +458,13 @@ impl Agent {
|
|||||||
identity: &crate::certificate_rotation::DeviceIdentity,
|
identity: &crate::certificate_rotation::DeviceIdentity,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
ensure!(self.time_refresh.is_none(), "TIME_REFRESH_ALREADY_RUNNING");
|
ensure!(self.time_refresh.is_none(), "TIME_REFRESH_ALREADY_RUNNING");
|
||||||
if !self.config.enable_jobs {
|
use rmm_agent_windows::signed_clock::{CONFIG_PATH, SamplingMode};
|
||||||
|
// Presence opts into sampling only. Each role opens and verifies the
|
||||||
|
// protected profile and signed response itself before accepting time.
|
||||||
|
let Some(mode) = SamplingMode::configured(self.config.enable_jobs, Path::new(CONFIG_PATH))?
|
||||||
|
else {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
};
|
||||||
let client = crate::https_channel::mtls_client(
|
let client = crate::https_channel::mtls_client(
|
||||||
self.config.connect_address,
|
self.config.connect_address,
|
||||||
&self.ca,
|
&self.ca,
|
||||||
@@ -495,12 +499,7 @@ impl Agent {
|
|||||||
if result.is_err() {
|
if result.is_err() {
|
||||||
let _ = own_clock.close_generation(generation);
|
let _ = own_clock.close_generation(generation);
|
||||||
}
|
}
|
||||||
tokio::time::sleep(if result.is_ok() {
|
tokio::time::sleep(mode.interval(result.is_ok())).await;
|
||||||
Duration::from_millis(20)
|
|
||||||
} else {
|
|
||||||
Duration::from_millis(500)
|
|
||||||
})
|
|
||||||
.await;
|
|
||||||
}
|
}
|
||||||
let _ = own_clock.close_generation(generation);
|
let _ = own_clock.close_generation(generation);
|
||||||
}));
|
}));
|
||||||
@@ -521,12 +520,7 @@ impl Agent {
|
|||||||
if result.is_err() {
|
if result.is_err() {
|
||||||
let _ = time_helper.time_close(generation).await;
|
let _ = time_helper.time_close(generation).await;
|
||||||
}
|
}
|
||||||
tokio::time::sleep(if result.is_ok() {
|
tokio::time::sleep(mode.interval(result.is_ok())).await;
|
||||||
Duration::from_millis(20)
|
|
||||||
} else {
|
|
||||||
Duration::from_millis(500)
|
|
||||||
})
|
|
||||||
.await;
|
|
||||||
}
|
}
|
||||||
let _ = time_helper.time_close(generation).await;
|
let _ = time_helper.time_close(generation).await;
|
||||||
}));
|
}));
|
||||||
@@ -1554,7 +1548,9 @@ impl Agent {
|
|||||||
);
|
);
|
||||||
self.clock = self.clock.for_generation(generation);
|
self.clock = self.clock.for_generation(generation);
|
||||||
#[cfg(feature = "system-helper")]
|
#[cfg(feature = "system-helper")]
|
||||||
|
if self.config.enable_jobs {
|
||||||
self.start_time_refresh(generation, &identity)?;
|
self.start_time_refresh(generation, &identity)?;
|
||||||
|
}
|
||||||
self.queue_inventory(generation)?;
|
self.queue_inventory(generation)?;
|
||||||
self.queue_update_observation(generation)?;
|
self.queue_update_observation(generation)?;
|
||||||
self.replay(&channel, generation).await?;
|
self.replay(&channel, generation).await?;
|
||||||
@@ -1673,6 +1669,15 @@ impl Agent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if heartbeat.elapsed() >= heartbeat_after {
|
if heartbeat.elapsed() >= heartbeat_after {
|
||||||
|
#[cfg(feature = "system-helper")]
|
||||||
|
if !self.config.enable_jobs
|
||||||
|
&& self.time_refresh.is_none()
|
||||||
|
&& self.start_time_refresh(generation, &identity).is_err()
|
||||||
|
{
|
||||||
|
// An absent or unreadable profile must never take passive
|
||||||
|
// inventory offline. Retry setup at the next heartbeat.
|
||||||
|
eprintln!("PASSIVE_SIGNED_TIME_UNAVAILABLE");
|
||||||
|
}
|
||||||
let payload = Payload::Heartbeat(Heartbeat {
|
let payload = Payload::Heartbeat(Heartbeat {
|
||||||
instance_id: self.instance.clone(),
|
instance_id: self.instance.clone(),
|
||||||
uptime_seconds: self.started.elapsed().as_secs(),
|
uptime_seconds: self.started.elapsed().as_secs(),
|
||||||
|
|||||||
@@ -10,6 +10,29 @@ use uuid::Uuid;
|
|||||||
const SECOND_NS: u64 = 1_000_000_000;
|
const SECOND_NS: u64 = 1_000_000_000;
|
||||||
const MAX_BASE_ERROR_NS: u64 = 10_000_000;
|
const MAX_BASE_ERROR_NS: u64 = 10_000_000;
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
|
pub enum SamplingMode {
|
||||||
|
Passive,
|
||||||
|
Jobs,
|
||||||
|
}
|
||||||
|
impl SamplingMode {
|
||||||
|
pub fn configured(jobs: bool, profile: &std::path::Path) -> std::io::Result<Option<Self>> {
|
||||||
|
if jobs {
|
||||||
|
return Ok(Some(Self::Jobs));
|
||||||
|
}
|
||||||
|
Ok(profile.try_exists()?.then_some(Self::Passive))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn interval(self, verified: bool) -> std::time::Duration {
|
||||||
|
use std::time::Duration;
|
||||||
|
match (self, verified) {
|
||||||
|
(Self::Passive, _) => Duration::from_secs(30),
|
||||||
|
(Self::Jobs, true) => Duration::from_millis(20),
|
||||||
|
(Self::Jobs, false) => Duration::from_millis(500),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn independent_time_key(time_key_hex: &str, job_key_hex: &str) -> Result<[u8; 32]> {
|
fn independent_time_key(time_key_hex: &str, job_key_hex: &str) -> Result<[u8; 32]> {
|
||||||
fn decode(value: &str) -> Result<[u8; 32]> {
|
fn decode(value: &str) -> Result<[u8; 32]> {
|
||||||
ensure!(
|
ensure!(
|
||||||
@@ -1137,6 +1160,30 @@ pub use installed::{BoundClock, CONFIG_PATH, Comparison, RuntimeClock, SignedClo
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn passive_sampling_requires_a_profile_and_uses_heartbeat_cadence() {
|
||||||
|
let dir = std::env::temp_dir().join(Uuid::new_v4().to_string());
|
||||||
|
std::fs::create_dir(&dir).unwrap();
|
||||||
|
let profile = dir.join("time-attestation.json");
|
||||||
|
assert_eq!(SamplingMode::configured(false, &profile).unwrap(), None);
|
||||||
|
assert_eq!(
|
||||||
|
SamplingMode::configured(true, &profile).unwrap(),
|
||||||
|
Some(SamplingMode::Jobs)
|
||||||
|
);
|
||||||
|
std::fs::write(&profile, b"{}").unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
SamplingMode::configured(false, &profile).unwrap(),
|
||||||
|
Some(SamplingMode::Passive)
|
||||||
|
);
|
||||||
|
for verified in [false, true] {
|
||||||
|
assert_eq!(
|
||||||
|
SamplingMode::Passive.interval(verified),
|
||||||
|
std::time::Duration::from_secs(30)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
std::fs::remove_dir_all(dir).unwrap();
|
||||||
|
}
|
||||||
fn sample(ns: u64) -> Sample {
|
fn sample(ns: u64) -> Sample {
|
||||||
Sample {
|
Sample {
|
||||||
wall_utc_ns: 1_800_000_000_000_000_000 + ns as i64,
|
wall_utc_ns: 1_800_000_000_000_000_000 + ns as i64,
|
||||||
|
|||||||
@@ -104,3 +104,26 @@ und ersetzt diese Bindung nicht. Nach der getrennten passiven Paarwartung dürfe
|
|||||||
die tatsächlichen neuen LocalService-/SYSTEM-Kernel-/Servicebelege mit vorhandenen
|
die tatsächlichen neuen LocalService-/SYSTEM-Kernel-/Servicebelege mit vorhandenen
|
||||||
Source-, Rawcapture- und Plattformbelegen verbunden werden. Erst danach wird die
|
Source-, Rawcapture- und Plattformbelegen verbunden werden. Erst danach wird die
|
||||||
echte V2-Konfiguration erstellt; Runtimefrische und Genehmigungen folgen getrennt.
|
echte V2-Konfiguration erstellt; Runtimefrische und Genehmigungen folgen getrennt.
|
||||||
|
|
||||||
|
## Zeitprüfung bei ausgeschalteten Jobs am 15. November 2026
|
||||||
|
|
||||||
|
Die Konsole der laufenden VM bestätigte, dass weder der Jobschalter noch die
|
||||||
|
Jobbindung konfiguriert waren. Die Zeitprofildatei war noch nicht installiert.
|
||||||
|
Die bisherige Runtime übersprang bei ausgeschalteten Jobs auch den gesamten
|
||||||
|
signierten Zeitvergleich. Damit konnte die geplante Rollenprüfung über diesen
|
||||||
|
passiven Dienststand nicht beginnen.
|
||||||
|
|
||||||
|
Im neuen Quellstand prüft der Agent am Heartbeat, ob das geschützte Zeitprofil
|
||||||
|
vorliegt. Erst dann beginnen Agent und Helper den vorhandenen Vergleich mit
|
||||||
|
eigenen Challenges. Für den passiven Betrieb beträgt die Pause zwischen
|
||||||
|
Vergleichen pro Rolle 30 Sekunden. Die Datei allein belegt keine Zeitqualität.
|
||||||
|
Beide Rollen prüfen Pin, Gerätebindung, Signatur und Fristen. Der Jobschalter,
|
||||||
|
die JobClock und die Genehmigung bleiben getrennt. Ein Fehler beim Start des
|
||||||
|
passiven Vergleichs lässt Heartbeats und Inventar weiterlaufen.
|
||||||
|
|
||||||
|
Neun gezielte Prüfungen bestanden erst lokal und dann auf der Cloud-Linux-VM
|
||||||
|
als UID 65534 (Exit 0, 15 weitere Tests gefiltert, Ergebnis-SHA-256
|
||||||
|
`3424b0f916f0c9e68ed24d8ee0adeeb5feb5e8e834f63cfcbaadc5e45b06f840`).
|
||||||
|
Die neue Prüfung umfasst Profilauswahl und Abfrageintervall. Der Windows-Crossbuild
|
||||||
|
der Librarytests und Clippy mit allen Windows-Targets und `system-helper`
|
||||||
|
bestanden. Die installierten Dienstbinärdateien haben eigene Versionsnachweise.
|
||||||
|
|||||||
Reference in New Issue
Block a user