Implement guarded Linux updater runtime and compatible baseline tooling
Rust development slice / linux (push) Failing after 8s
Rust development slice / linux (push) Failing after 8s
This commit is contained in:
@@ -7,7 +7,7 @@ use rmm_agent_core::{
|
||||
reconcile::SyncClock,
|
||||
update_handoff::{
|
||||
self as core, NativeControlOperation, NativeControlReply, NativeControlRequest,
|
||||
NativeEffect, NativeService,
|
||||
NativeEffect, NativeEffectStage, NativeService, UpdateParticipantGuard,
|
||||
},
|
||||
};
|
||||
use rmm_updater_handoff::{Evidence, Phase};
|
||||
@@ -21,7 +21,7 @@ pub fn active_grant(db: &Connection) -> Result<Option<Uuid>> {
|
||||
if !exists {
|
||||
return Ok(None);
|
||||
}
|
||||
let mut query=db.prepare("SELECT grant_id FROM agent_update_handoffs WHERE phase NOT IN ('unknown','outcome_persisted') ORDER BY grant_id LIMIT 2")?;
|
||||
let mut query=db.prepare("SELECT grant_id FROM agent_update_handoffs WHERE phase NOT IN ('unknown','outcome_persisted','rollback_outcome_persisted') ORDER BY grant_id LIMIT 2")?;
|
||||
let rows = query
|
||||
.query_map([], |r| r.get::<_, String>(0))?
|
||||
.collect::<rusqlite::Result<Vec<_>>>()?;
|
||||
@@ -90,7 +90,10 @@ pub fn handle(
|
||||
} => {
|
||||
let journal = core::read(db, &guard, request.grant_id)?;
|
||||
ensure!(
|
||||
journal.phase() == Phase::LedgerReturnIntent,
|
||||
matches!(
|
||||
journal.phase(),
|
||||
Phase::LedgerReturnIntent | Phase::RollbackLedgerReturnIntent
|
||||
),
|
||||
"UPDATE_START_ALREADY_OBSERVED_OR_PHASE"
|
||||
);
|
||||
let (actual, actual_hash) = guard.started()?;
|
||||
@@ -103,7 +106,11 @@ pub fn handle(
|
||||
NativeService::Full,
|
||||
NativeService::Agent,
|
||||
] {
|
||||
let effect = NativeEffect::StartService { service };
|
||||
let effect = if guard.restored() {
|
||||
NativeEffect::RollbackStartService { service }
|
||||
} else {
|
||||
NativeEffect::StartService { service }
|
||||
};
|
||||
let reserved = core::read_native_claim(db, &guard, request.grant_id, &effect)?;
|
||||
let already:bool=db.query_row("SELECT EXISTS(SELECT 1 FROM agent_update_native_observations WHERE grant_id=?1 AND claim_sha256=?2)",rusqlite::params![request.grant_id.to_string(),rmm_domain::jobs::hash(&serde_json::to_vec(&reserved)?)],|r|r.get(0))?;
|
||||
// One control request performs one sequence, never retries an
|
||||
@@ -119,28 +126,60 @@ pub fn handle(
|
||||
}
|
||||
let event = journal.prepare(
|
||||
u64::try_from(clock.now()?.timestamp())?,
|
||||
Evidence::ServicesStarted {
|
||||
services: actual,
|
||||
ledger_identity_sha256: header.ledger_identity_sha256.clone(),
|
||||
observation_sha256: actual_hash,
|
||||
if guard.restored() {
|
||||
Evidence::RollbackServicesStarted {
|
||||
services: actual,
|
||||
ledger_identity_sha256: header.ledger_identity_sha256.clone(),
|
||||
observation_sha256: actual_hash,
|
||||
}
|
||||
} else {
|
||||
Evidence::ServicesStarted {
|
||||
services: actual,
|
||||
ledger_identity_sha256: header.ledger_identity_sha256.clone(),
|
||||
observation_sha256: actual_hash,
|
||||
}
|
||||
},
|
||||
)?;
|
||||
core::append(db, &guard, request.grant_id, journal.head_sha256(), &event)?;
|
||||
if header.schema_version == 2 && !guard.restored() {
|
||||
let observation = guard.native_observation_sha256(
|
||||
&header,
|
||||
guard.original().delegation(),
|
||||
&NativeEffect::ConditionalRollbackStopGeneral,
|
||||
NativeEffectStage::ObserveNonstart,
|
||||
)?;
|
||||
core::deny_conditional_stop(
|
||||
db,
|
||||
&guard,
|
||||
request.grant_id,
|
||||
&observation,
|
||||
clock.now()?,
|
||||
)?;
|
||||
}
|
||||
}
|
||||
NativeControlOperation::Health { receipt } => {
|
||||
guard.qualify_health(db, receipt)?;
|
||||
let journal = core::read(db, &guard, request.grant_id)?;
|
||||
let event = journal.prepare(
|
||||
u64::try_from(clock.now()?.timestamp())?,
|
||||
Evidence::HealthVerified {
|
||||
receipt: receipt.clone(),
|
||||
if guard.restored() {
|
||||
Evidence::RollbackHealthVerified {
|
||||
receipt: receipt.clone(),
|
||||
}
|
||||
} else {
|
||||
Evidence::HealthVerified {
|
||||
receipt: receipt.clone(),
|
||||
}
|
||||
},
|
||||
)?;
|
||||
core::append(db, &guard, request.grant_id, journal.head_sha256(), &event)?;
|
||||
}
|
||||
NativeControlOperation::Finalize => {
|
||||
original_outcome_base64url =
|
||||
Some(URL_SAFE_NO_PAD.encode(guard.publish_record_and_finalize(db)?));
|
||||
original_outcome_base64url = Some(URL_SAFE_NO_PAD.encode(if guard.restored() {
|
||||
guard.finalize_restored(db)?
|
||||
} else {
|
||||
guard.publish_record_and_finalize(db)?
|
||||
}));
|
||||
}
|
||||
}
|
||||
let proof = if original_outcome_base64url.is_some() {
|
||||
@@ -151,6 +190,18 @@ pub fn handle(
|
||||
.context("UPDATE_ACTIVE_PROOF_REQUIRED")?,
|
||||
)
|
||||
};
|
||||
let pre_stop = if matches!(request.method, NativeControlOperation::ReadOriginal) {
|
||||
guard.pre_stop_signed_sync(db)?
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let (pre_stop_sync_request_base64url, pre_stop_sync_response_base64url) = match pre_stop {
|
||||
Some((request, response)) => (
|
||||
Some(URL_SAFE_NO_PAD.encode(request)),
|
||||
Some(URL_SAFE_NO_PAD.encode(response)),
|
||||
),
|
||||
None => (None, None),
|
||||
};
|
||||
Ok(NativeControlReply {
|
||||
schema_version: 1,
|
||||
challenge: request.challenge,
|
||||
@@ -167,5 +218,7 @@ pub fn handle(
|
||||
claim,
|
||||
original_start_base64url,
|
||||
original_outcome_base64url,
|
||||
pre_stop_sync_request_base64url,
|
||||
pre_stop_sync_response_base64url,
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user