Qualify tenant-scoped bootstrap rotation and fresh Windows scripting
This commit is contained in:
@@ -1,8 +1,16 @@
|
||||
//! Local verification for the separately distributed stable bootstrap updater.
|
||||
use crate::{ArtifactRole, Platform, SignedRelease, TrustedContext, TrustedUpdateKey, UpdateKeyring, VerifiedRelease};
|
||||
use crate::{
|
||||
ArtifactRole, Platform, SignedRelease, TrustedContext, TrustedUpdateKey, UpdateKeyring,
|
||||
VerifiedRelease,
|
||||
};
|
||||
use anyhow::{Context, Result, ensure};
|
||||
use rmm_domain::agent_update::{Platform as WirePlatform, ReleaseEnvelope, UpdateKeyringFile};
|
||||
use std::{ffi::OsString, fs::File, io::Read, time::{SystemTime, UNIX_EPOCH}};
|
||||
use std::{
|
||||
ffi::OsString,
|
||||
fs::File,
|
||||
io::Read,
|
||||
time::{SystemTime, UNIX_EPOCH},
|
||||
};
|
||||
|
||||
fn bounded(path: &OsString, limit: u64) -> Result<Vec<u8>> {
|
||||
let mut bytes = Vec::new();
|
||||
@@ -19,26 +27,53 @@ pub fn verify_bootstrap_files(platform: Platform, args: &[OsString]) -> Result<V
|
||||
};
|
||||
let config: UpdateKeyringFile = serde_json::from_slice(&bounded(keyring, 16384)?)?;
|
||||
ensure!(config.validate(), "invalid bootstrap keyring");
|
||||
let keys = config.keys.into_iter().map(|key| {
|
||||
let platform = match key.platform {
|
||||
WirePlatform::LinuxX64 => Platform::LinuxX64,
|
||||
WirePlatform::WindowsX64 => Platform::WindowsX64,
|
||||
WirePlatform::WindowsGnuX64 => Platform::WindowsGnuX64,
|
||||
};
|
||||
let raw = hex::decode(key.public_key_hex)?.try_into().ok().context("Ed25519 public key length")?;
|
||||
TrustedUpdateKey::new(raw, platform, key.first_sequence, key.last_sequence, key.revoked)
|
||||
}).collect::<Result<Vec<_>>>()?;
|
||||
let keys = config
|
||||
.keys
|
||||
.into_iter()
|
||||
.map(|key| {
|
||||
let platform = match key.platform {
|
||||
WirePlatform::LinuxX64 => Platform::LinuxX64,
|
||||
WirePlatform::WindowsX64 => Platform::WindowsX64,
|
||||
WirePlatform::WindowsGnuX64 => Platform::WindowsGnuX64,
|
||||
};
|
||||
let raw = hex::decode(key.public_key_hex)?
|
||||
.try_into()
|
||||
.ok()
|
||||
.context("Ed25519 public key length")?;
|
||||
TrustedUpdateKey::new(
|
||||
raw,
|
||||
platform,
|
||||
key.first_sequence,
|
||||
key.last_sequence,
|
||||
key.revoked,
|
||||
)
|
||||
})
|
||||
.collect::<Result<Vec<_>>>()?;
|
||||
let ring = UpdateKeyring::new(config.generation, keys)?;
|
||||
let envelope: ReleaseEnvelope = serde_json::from_slice(&bounded(envelope, 32768)?)?;
|
||||
let decoded = envelope.decode().map_err(|_| anyhow::anyhow!("invalid release envelope"))?;
|
||||
let decoded = envelope
|
||||
.decode()
|
||||
.map_err(|_| anyhow::anyhow!("invalid release envelope"))?;
|
||||
let context = TrustedContext {
|
||||
platform, now_utc_seconds: SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs(),
|
||||
keyring_generation: config.generation, protocol_major: 1, state_schema: 1,
|
||||
updater_version: 1, minimum_release_sequence: 0, active_release: None,
|
||||
platform,
|
||||
now_utc_seconds: SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs(),
|
||||
keyring_generation: config.generation,
|
||||
protocol_major: 1,
|
||||
state_schema: 1,
|
||||
updater_version: if platform == Platform::WindowsGnuX64 { 2 } else { 1 },
|
||||
minimum_release_sequence: 0,
|
||||
active_release: None,
|
||||
};
|
||||
let release = crate::verify_release(SignedRelease {schema_version: envelope.schema_version,
|
||||
key_id: &envelope.key_id, payload_bytes: &decoded.payload_bytes,
|
||||
signature: &decoded.signature}, &ring, &context)?;
|
||||
let release = crate::verify_release(
|
||||
SignedRelease {
|
||||
schema_version: envelope.schema_version,
|
||||
key_id: &envelope.key_id,
|
||||
payload_bytes: &decoded.payload_bytes,
|
||||
signature: &decoded.signature,
|
||||
},
|
||||
&ring,
|
||||
&context,
|
||||
)?;
|
||||
release.verify_artifact(ArtifactRole::Agent, File::open(agent)?)?;
|
||||
release.verify_artifact(ArtifactRole::Helper, File::open(helper)?)?;
|
||||
Ok(release)
|
||||
|
||||
Reference in New Issue
Block a user