Provision the release-bound Windows maintenance helper on enrolled development devices
This commit is contained in:
@@ -957,16 +957,24 @@ mod installed {
|
||||
failure_fence.armed = false;
|
||||
Ok(value)
|
||||
}
|
||||
/// An enrolled LocalService never supplies time evidence for a helper.
|
||||
/// Its public broker pins and job binding are installed by the HTTPS
|
||||
/// bootstrap; every usable reading still needs a current signed challenge.
|
||||
/// Each enrolled process obtains its own signed challenge. The SYSTEM
|
||||
/// helper additionally authenticates its exact running SCM peer/image.
|
||||
async fn open_local_service(
|
||||
generation: u64,
|
||||
binding: &rmm_agent_core::auth::Binding,
|
||||
policy_file: &Path,
|
||||
helper: Option<&ipc::PeerPin>,
|
||||
) -> Result<Self> {
|
||||
let mut failure_fence = ConstructorFailureFence { armed: true };
|
||||
crate::native::require_local_service()?;
|
||||
let (owner, role) = if let Some(pin) = helper {
|
||||
pin.validate(true)?;
|
||||
ipc::require_self(pin)?;
|
||||
let proof = PeerProof::for_service(pin, unsafe { windows_sys::Win32::System::Threading::GetCurrentProcessId() })?;
|
||||
(ClockOwner::Service(Box::new(proof)), Role::SystemHelper)
|
||||
} else {
|
||||
crate::native::require_local_service()?;
|
||||
(ClockOwner::EnrolledLocalService, Role::Agent)
|
||||
};
|
||||
let readers = [crate::native::service_sid()?];
|
||||
let parent = PinnedFile::open(
|
||||
policy_file.parent().context("TIME_POLICY_PARENT")?,
|
||||
@@ -1009,15 +1017,15 @@ mod installed {
|
||||
connection_generation: generation,
|
||||
windows_boot_id: boot_id,
|
||||
verifier_incarnation: *INCARNATION.get_or_init(Uuid::new_v4),
|
||||
role: Role::Agent,
|
||||
role,
|
||||
binding_schema: 1,
|
||||
helper_image_sha256: None,
|
||||
helper_image_sha256: helper.map(|pin| pin.binary_sha256.clone()),
|
||||
updater_image_sha256: None,
|
||||
};
|
||||
let hash = hash(&raw);
|
||||
let mut clock = Self {
|
||||
verifier: Verifier::new(context, pins)?,
|
||||
owner: ClockOwner::EnrolledLocalService,
|
||||
owner,
|
||||
files: vec![parent, config_file],
|
||||
config_sha256: hash.clone(),
|
||||
boot_id,
|
||||
@@ -1385,6 +1393,7 @@ mod installed {
|
||||
#[derive(Clone)]
|
||||
pub struct RuntimeClock {
|
||||
role: Role,
|
||||
enrolled_helper: Option<ipc::PeerPin>,
|
||||
local_policy: Option<(rmm_agent_core::auth::Binding, std::path::PathBuf)>,
|
||||
state: Arc<Mutex<Option<(u64, SignedClock)>>>,
|
||||
}
|
||||
@@ -1397,6 +1406,7 @@ mod installed {
|
||||
pub fn new(role: Role) -> Self {
|
||||
Self {
|
||||
role,
|
||||
enrolled_helper: None,
|
||||
local_policy: None,
|
||||
state: Arc::new(Mutex::new(None)),
|
||||
}
|
||||
@@ -1409,6 +1419,12 @@ mod installed {
|
||||
value.local_policy = Some((binding, policy));
|
||||
value
|
||||
}
|
||||
pub fn enrolled_windows_update_helper(binding: rmm_agent_core::auth::Binding, helper: ipc::PeerPin) -> Self {
|
||||
let mut value = Self::new(Role::SystemHelper);
|
||||
value.local_policy = Some((binding, std::path::PathBuf::from(r"C:\ProgramData\RustDiscovery\job-time.json")));
|
||||
value.enrolled_helper = Some(helper);
|
||||
value
|
||||
}
|
||||
pub fn for_generation(&self, generation: u64) -> BoundClock {
|
||||
BoundClock {
|
||||
source: self.clone(),
|
||||
@@ -1425,7 +1441,7 @@ mod installed {
|
||||
self.close()?;
|
||||
let clock = match &self.local_policy {
|
||||
Some((binding, policy)) => {
|
||||
SignedClock::open_local_service(generation, binding, policy).await?
|
||||
SignedClock::open_local_service(generation, binding, policy, self.enrolled_helper.as_ref()).await?
|
||||
}
|
||||
None => SignedClock::open(self.role, generation).await?,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user