Add fresh device trust, installer recovery and scoped patch runtime
This commit is contained in:
@@ -106,6 +106,37 @@ async fn token_tenant(s: &crate::State, h: &HeaderMap) -> Result<Uuid, Error> {
|
||||
.await?;
|
||||
t.ok_or_else(denied)
|
||||
}
|
||||
#[derive(serde::Deserialize, serde::Serialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct TimeTrust {
|
||||
key_generation: u64,
|
||||
server_instance: Uuid,
|
||||
public_keys_hex: std::collections::BTreeMap<String, String>,
|
||||
}
|
||||
fn device_trust_data(s: &crate::State) -> Result<Value, Error> {
|
||||
let job_public = hex::encode(s.job_signer.public_key()?);
|
||||
let path = std::env::var_os("RMM_AGENT_BOOTSTRAP_WINDOWS_FILE")
|
||||
.and_then(|slot| FsPath::new(&slot).parent().map(|p| p.join("windows-time-trust.json")));
|
||||
let trust = match path {
|
||||
Some(path) if path.try_exists().map_err(|_| fail("BOOTSTRAP_TIME_TRUST_INVALID"))? => {
|
||||
let trust: TimeTrust = serde_json::from_slice(&protected_file(&path, 8192)?)?;
|
||||
if trust.key_generation == 0 || trust.server_instance.is_nil()
|
||||
|| !(1..=8).contains(&trust.public_keys_hex.len())
|
||||
|| !trust.public_keys_hex.iter().all(|(id,key)| !id.is_empty() && id.len() <= 64
|
||||
&& id.bytes().all(|b| b.is_ascii_alphanumeric() || b"_-".contains(&b))
|
||||
&& rmm_domain::agent_update::digest(key) && key != &job_public) {
|
||||
return Err(fail("BOOTSTRAP_TIME_TRUST_INVALID"));
|
||||
}
|
||||
Some(trust)
|
||||
}
|
||||
_ => None
|
||||
};
|
||||
Ok(json!({"job_signing_public_key_hex":job_public,"windows_time_trust":trust}))
|
||||
}
|
||||
pub(super) async fn device_trust(State(s): State<crate::State>, Extension(peer): Extension<crate::Peer>, headers: HeaderMap) -> Result<Response, Error> {
|
||||
device(&s, peer, &headers).await?;
|
||||
Ok(private_json(device_trust_data(&s)?))
|
||||
}
|
||||
pub(super) async fn current(
|
||||
State(s): State<crate::State>,
|
||||
headers: HeaderMap,
|
||||
@@ -126,8 +157,9 @@ pub(super) async fn current(
|
||||
.ca
|
||||
.to_pem()
|
||||
.map_err(|_| invalid())?;
|
||||
let trust = device_trust_data(&s)?;
|
||||
Ok(private_json(
|
||||
json!({"schema_version":1,"tenant_id":t,"release_envelope":envelope,"manifest":manifest,
|
||||
json!({"job_signing_public_key_hex":trust["job_signing_public_key_hex"],"windows_time_trust":trust["windows_time_trust"],"schema_version":1,"tenant_id":t,"release_envelope":envelope,"manifest":manifest,
|
||||
"gateway_origin":c.gateway_origin,"ca_pem":String::from_utf8(ca).map_err(|_| invalid())?,
|
||||
"keyring":ring,"updater":{"sha256":c.updater_sha256,"bytes":c.updater_bytes}}),
|
||||
))
|
||||
|
||||
Reference in New Issue
Block a user