Record verified passive time samples for each Windows service role
Rust development slice / linux (push) Failing after 7s
Rust development slice / linux (push) Failing after 7s
This commit is contained in:
@@ -177,6 +177,7 @@ struct TimeRefresh {
|
||||
clock: rmm_agent_windows::signed_clock::RuntimeClock,
|
||||
helper: Option<rmm_agent_windows::helper_runtime::Client>,
|
||||
tasks: Vec<tokio::task::JoinHandle<()>>,
|
||||
samples: Vec<Arc<std::sync::OnceLock<VerifiedTimeSample>>>,
|
||||
}
|
||||
#[cfg(feature = "system-helper")]
|
||||
impl Drop for TimeRefresh {
|
||||
@@ -189,6 +190,30 @@ impl Drop for TimeRefresh {
|
||||
}
|
||||
}
|
||||
#[cfg(feature = "system-helper")]
|
||||
struct VerifiedTimeSample {
|
||||
request: rmm_time_attestation::Request,
|
||||
response_hash: String,
|
||||
observed_at: chrono::DateTime<Utc>,
|
||||
}
|
||||
#[cfg(feature = "system-helper")]
|
||||
impl VerifiedTimeSample {
|
||||
fn new(request: rmm_time_attestation::Request, response_hash: String) -> Self {
|
||||
Self {
|
||||
request,
|
||||
response_hash,
|
||||
observed_at: Utc::now(),
|
||||
}
|
||||
}
|
||||
fn persist(&self, state: &Path) -> Result<()> {
|
||||
rmm_agent_windows::helper_runtime::record_verified_time(
|
||||
state,
|
||||
&self.request,
|
||||
&self.response_hash,
|
||||
self.observed_at,
|
||||
)
|
||||
}
|
||||
}
|
||||
#[cfg(feature = "system-helper")]
|
||||
async fn time_response(
|
||||
client: &reqwest::Client,
|
||||
address: std::net::SocketAddr,
|
||||
@@ -484,6 +509,17 @@ impl Agent {
|
||||
let own_stop = stop.clone();
|
||||
let own_http = client.clone();
|
||||
let address = self.config.connect_address;
|
||||
// Only the connection owner publishes observations. Dropping it also
|
||||
// discards unfinished samples, so an old worker cannot overwrite a newer report.
|
||||
let sample_slot =
|
||||
|| (mode == SamplingMode::Passive).then(|| Arc::new(std::sync::OnceLock::new()));
|
||||
let own_receipt = sample_slot();
|
||||
let helper_receipt = helper.as_ref().and_then(|_| sample_slot());
|
||||
let samples = own_receipt
|
||||
.iter()
|
||||
.chain(helper_receipt.iter())
|
||||
.cloned()
|
||||
.collect();
|
||||
tasks.push(tokio::spawn(async move {
|
||||
while !own_stop.load(Ordering::SeqCst) {
|
||||
let result = async {
|
||||
@@ -493,7 +529,12 @@ impl Agent {
|
||||
let request = own_clock.begin(generation)?;
|
||||
let bytes = time_response(&own_http, address, &request).await?;
|
||||
ensure!(!own_stop.load(Ordering::SeqCst), "TIME_CONNECTION_CLOSED");
|
||||
own_clock.complete(generation, &bytes)
|
||||
own_clock.complete(generation, &bytes)?;
|
||||
if let Some(slot) = own_receipt.as_ref().filter(|s| s.get().is_none()) {
|
||||
let hash = format!("{:x}", Sha256::digest(&bytes));
|
||||
let _ = slot.set(VerifiedTimeSample::new(request, hash));
|
||||
}
|
||||
Ok::<(), anyhow::Error>(())
|
||||
}
|
||||
.await;
|
||||
if result.is_err() {
|
||||
@@ -514,7 +555,14 @@ impl Agent {
|
||||
!helper_stop.load(Ordering::SeqCst),
|
||||
"TIME_CONNECTION_CLOSED"
|
||||
);
|
||||
time_helper.time_complete(generation, bytes).await
|
||||
let pending = helper_receipt.as_ref().filter(|s| s.get().is_none());
|
||||
let report =
|
||||
pending.map(|slot| (slot, format!("{:x}", Sha256::digest(&bytes))));
|
||||
time_helper.time_complete(generation, bytes).await?;
|
||||
if let Some((slot, hash)) = report {
|
||||
let _ = slot.set(VerifiedTimeSample::new(request, hash));
|
||||
}
|
||||
Ok::<(), anyhow::Error>(())
|
||||
}
|
||||
.await;
|
||||
if result.is_err() {
|
||||
@@ -531,6 +579,7 @@ impl Agent {
|
||||
clock,
|
||||
helper,
|
||||
tasks,
|
||||
samples,
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
@@ -1694,6 +1743,14 @@ impl Agent {
|
||||
)?;
|
||||
channel.poll(poll).await?;
|
||||
}
|
||||
#[cfg(feature = "system-helper")]
|
||||
if let Some(refresh) = &mut self.time_refresh {
|
||||
let state = &self.config.state_directory;
|
||||
refresh.samples.retain(|slot| {
|
||||
slot.get()
|
||||
.is_none_or(|sample| sample.persist(state).is_err())
|
||||
});
|
||||
}
|
||||
heartbeat = Instant::now();
|
||||
heartbeat_after = Duration::from_millis(rand::random_range(27000..33000));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user