Qualify enrolled Windows job clocks from the local time service
Rust development slice / linux (push) Failing after 15s
Rust development slice / linux (push) Failing after 15s
This commit is contained in:
@@ -839,6 +839,10 @@ impl Agent {
|
||||
) -> Result<()> {
|
||||
ensure!(self.time_refresh.is_none(), "TIME_REFRESH_ALREADY_RUNNING");
|
||||
use rmm_agent_windows::signed_clock::{CONFIG_PATH, SamplingMode};
|
||||
let clock = self.clock.native.source();
|
||||
if clock.uses_local_clock() {
|
||||
return Ok(());
|
||||
}
|
||||
// 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))?
|
||||
@@ -860,7 +864,6 @@ impl Agent {
|
||||
self.binding.as_ref(),
|
||||
self.helper_lane.clone(),
|
||||
)? };
|
||||
let clock = self.clock.native.source();
|
||||
let stop = Arc::new(AtomicBool::new(false));
|
||||
let mut tasks = Vec::new();
|
||||
let own_clock = clock.clone();
|
||||
@@ -3072,10 +3075,17 @@ async fn run_service_binding(path: &Path, stop: &'static AtomicBool, release_gua
|
||||
let clock=JobClock::new(config.enable_jobs);
|
||||
#[cfg(feature = "system-helper")]
|
||||
let clock = if let Some(policy) = &config.localservice_time_policy {
|
||||
let binding = binding.clone().context("JOB_BINDING_REQUIRED")?;
|
||||
JobClock { enabled: true, native: rmm_agent_windows::signed_clock::RuntimeClock::enrolled_local_service(
|
||||
binding, policy.clone(), installed_tenant.context("INSTALLED_TENANT_REQUIRED")?
|
||||
).for_generation(0) }
|
||||
use rmm_agent_windows::signed_clock::RuntimeClock;
|
||||
let source = if config.windows_update_helper {
|
||||
RuntimeClock::enrolled_local_service(
|
||||
binding.clone().context("JOB_BINDING_REQUIRED")?,
|
||||
policy.clone(),
|
||||
installed_tenant.context("INSTALLED_TENANT_REQUIRED")?,
|
||||
)
|
||||
} else {
|
||||
RuntimeClock::local(rmm_time_attestation::Role::Agent)
|
||||
};
|
||||
JobClock { enabled: true, native: source.for_generation(0) }
|
||||
} else { clock };
|
||||
let mut config=config;
|
||||
if config.enable_jobs {
|
||||
|
||||
Reference in New Issue
Block a user