feat: qualify bound configure-only recovery runtime on cloud VM
Rust development slice / linux (push) Failing after 6s
Rust development slice / linux (push) Failing after 6s
This commit is contained in:
+62
-5
@@ -41,6 +41,14 @@ fn status(binding: &Binding) -> Result<readiness::Response> {
|
||||
std::env::var_os("RMM_APT_HELPER_SOCKET").context("APT_HELPER_SOCKET_NOT_CONFIGURED")?;
|
||||
readiness::probe(Path::new(&socket), binding, &pin)
|
||||
}
|
||||
fn recovery_status(binding: &Binding) -> Result<readiness::Response> {
|
||||
let path =
|
||||
std::env::var_os("RMM_APT_HELPER_PROOF_FILE").context("APT_RECOVERY_PIN_REQUIRED")?;
|
||||
let pin = readiness::Pin::read(Path::new(&path), binding)?;
|
||||
let socket =
|
||||
std::env::var_os("RMM_APT_HELPER_SOCKET").context("APT_RECOVERY_SOCKET_REQUIRED")?;
|
||||
readiness::planning_for_recovery(Path::new(&socket), binding, &pin)
|
||||
}
|
||||
pub fn capabilities_from(response: &readiness::Response) -> Vec<String> {
|
||||
if response.profile != "apt_only" {
|
||||
return vec![];
|
||||
@@ -62,7 +70,7 @@ pub fn capabilities_from(response: &readiness::Response) -> Vec<String> {
|
||||
result
|
||||
}
|
||||
pub fn capabilities(binding: &Binding) -> Vec<String> {
|
||||
status(binding)
|
||||
let normal = status(binding)
|
||||
.map(|s| {
|
||||
let mut caps = capabilities_from(&s);
|
||||
if !caps.is_empty() {
|
||||
@@ -82,6 +90,21 @@ pub fn capabilities(binding: &Binding) -> Vec<String> {
|
||||
}
|
||||
caps
|
||||
})
|
||||
.unwrap_or_default();
|
||||
if !normal.is_empty() {
|
||||
return normal;
|
||||
}
|
||||
recovery_status(binding)
|
||||
.map(|s| {
|
||||
vec![
|
||||
"apt_native_acceptance".into(),
|
||||
"root:apt_native_acceptance".into(),
|
||||
"helper.root.v1".into(),
|
||||
format!("helper.policy.sha256:{}", s.provider_stack_sha256),
|
||||
"apt.manifest.v2".into(),
|
||||
"apt.native-acceptance.v1".into(),
|
||||
]
|
||||
})
|
||||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
@@ -95,13 +118,15 @@ pub fn planning_observation(binding: Option<&Binding>) -> serde_json::Value {
|
||||
let pin = readiness::Pin::read(Path::new(&path), binding)?;
|
||||
let socket =
|
||||
std::env::var_os("RMM_APT_HELPER_SOCKET").context("APT_PLANNING_NOT_CONFIGURED")?;
|
||||
readiness::planning(Path::new(&socket), binding, &pin)?
|
||||
readiness::planning(Path::new(&socket), binding, &pin)
|
||||
.or_else(|_| readiness::planning_for_recovery(Path::new(&socket), binding, &pin))?
|
||||
.planning
|
||||
.context("APT_PLANNING_UNAVAILABLE")
|
||||
})();
|
||||
match result {
|
||||
Ok(planning) => {
|
||||
serde_json::json!({"scope":"linux.apt.planning", "source_id":"root-helper:apt_planning_v1",
|
||||
let recovery = planning.native_recovery.is_some();
|
||||
serde_json::json!({"scope":if recovery{"linux.apt.recovery-planning"}else{"linux.apt.planning"}, "source_id":if recovery{"root-helper:apt_recovery_planning_v1"}else{"root-helper:apt_planning_v1"},
|
||||
"observed_at":planning.observed_at, "quality":"valid", "completeness":"complete", "truncated":false, "data":planning})
|
||||
}
|
||||
Err(_) => {
|
||||
@@ -125,6 +150,28 @@ fn recipe_ready(job: &JobPayload, response: &readiness::Response) -> Result<()>
|
||||
)?;
|
||||
manifest.resolved_apt_transaction.validate_fixture()?;
|
||||
let recipe = &manifest.resolved_apt_transaction.recipe_id;
|
||||
if let Some(reference) = &manifest.native_recovery {
|
||||
let planning = response
|
||||
.planning
|
||||
.as_ref()
|
||||
.context("APT_RECOVERY_PLANNING_REQUIRED")?;
|
||||
planning.validate(chrono::Utc::now())?;
|
||||
ensure!(
|
||||
job.action.name() == "apt_native_acceptance"
|
||||
&& manifest.schema_version == 4
|
||||
&& manifest.action == "apt-native-acceptance"
|
||||
&& planning.native_recovery.as_ref() == Some(reference)
|
||||
&& planning.baseline_sha256 == manifest.resolved_apt_transaction.baseline_sha256
|
||||
&& planning.status_fingerprint
|
||||
== manifest.resolved_apt_transaction.status_fingerprint
|
||||
&& planning.runtime_sha256 == manifest.runtime_sha256
|
||||
&& planning.provider_sha256 == manifest.provider_sha256
|
||||
&& planning.hook_sha256 == manifest.hook_sha256
|
||||
&& planning.apt_config_sha256 == manifest.apt_config_sha256,
|
||||
"APT_RECOVERY_FRESH_PLAN_BINDING"
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
if job.action.name() == "apt_native_acceptance" {
|
||||
ensure!(
|
||||
manifest.action == "apt-native-acceptance"
|
||||
@@ -145,7 +192,17 @@ fn recipe_ready(job: &JobPayload, response: &readiness::Response) -> Result<()>
|
||||
Ok(())
|
||||
}
|
||||
pub fn supported(binding: &Binding, job: &JobPayload) -> bool {
|
||||
status(binding).and_then(|s| recipe_ready(job, &s)).is_ok()
|
||||
job_status(binding, job)
|
||||
.and_then(|s| recipe_ready(job, &s))
|
||||
.is_ok()
|
||||
}
|
||||
fn job_status(binding: &Binding, job: &JobPayload) -> Result<readiness::Response> {
|
||||
if matches!(&job.action,rmm_domain::jobs::Action::AptNativeAcceptance{apt_manifest,..}if apt_manifest.native_recovery.is_some())
|
||||
{
|
||||
recovery_status(binding)
|
||||
} else {
|
||||
status(binding)
|
||||
}
|
||||
}
|
||||
pub fn invoke(binding: &Binding, job: &JobPayload, request: &Request) -> Result<Outcome> {
|
||||
let socket = socket_for(
|
||||
@@ -154,7 +211,7 @@ pub fn invoke(binding: &Binding, job: &JobPayload, request: &Request) -> Result<
|
||||
std::env::var_os("RMM_APT_HELPER_SOCKET"),
|
||||
)?;
|
||||
if provider::is_apt_action(job) {
|
||||
recipe_ready(job, &status(binding)?)?;
|
||||
recipe_ready(job, &job_status(binding, job)?)?;
|
||||
}
|
||||
rmm_privileged_helper::invoke(&socket, request, job.max_runtime_seconds)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user