Verify health against exact retained original sync timestamps
Rust development slice / linux (push) Failing after 6s
Rust development slice / linux (push) Failing after 6s
This commit is contained in:
@@ -335,38 +335,15 @@ impl<'a> FullUpdateGuard<'a> {
|
||||
"UPDATE_HEALTH_CURRENT_LOCAL_CHANNEL_REQUIRED"
|
||||
);
|
||||
self.verify_current_services(&receipt.service_processes)?;
|
||||
let applied = update_handoff::read_applied_sync(
|
||||
let span = rmm_agent_core::update_health_sync::verified_span(
|
||||
db,
|
||||
self.executor,
|
||||
self.original.permit().grant_id,
|
||||
receipt.signed_sync_decision_id,
|
||||
self.binding,
|
||||
self.original.handoff(),
|
||||
&receipt,
|
||||
self.trust.health_public_key(),
|
||||
)?;
|
||||
ensure!(
|
||||
applied.request_sha256 == receipt.signed_sync_request_sha256
|
||||
&& applied.response_protobuf_sha256 == receipt.signed_sync_response_sha256
|
||||
&& receipt.inventory_ack_sha256 == applied.response_protobuf_sha256,
|
||||
"UPDATE_LOCAL_APPLIED_RAW_BINDING"
|
||||
);
|
||||
let response_raw: Vec<u8> = db.query_row(
|
||||
"SELECT response FROM helper_sync_decisions WHERE decision_id=?1",
|
||||
[receipt.signed_sync_decision_id.to_string()],
|
||||
|r| r.get(0),
|
||||
)?;
|
||||
let response: rmm_agent_core::helper_reconcile::SignedResponse =
|
||||
serde_json::from_slice(&response_raw)?;
|
||||
let decision: rmm_domain::reconciliation::ReconcileDecisionPayload =
|
||||
serde_json::from_slice(&response.decision_bytes)?;
|
||||
let applied_seconds = u64::try_from(applied.applied_at.timestamp())?;
|
||||
ensure!(
|
||||
applied_seconds >= u64::try_from(decision.issued_at.timestamp())?
|
||||
&& applied_seconds <= receipt.signed_sync_applied_at
|
||||
&& !decision.ready
|
||||
&& !decision.helper_ready
|
||||
&& decision
|
||||
.acknowledged_message_ids
|
||||
.contains(&receipt.inventory_message_id),
|
||||
"UPDATE_ACTUAL_LOCAL_APPLY_OR_INVENTORY_ACK"
|
||||
);
|
||||
let applied = span.applied().clone();
|
||||
verify_local_inventory(&self.witnesses, &self.original, &receipt)?;
|
||||
Ok(VerifiedHealth {
|
||||
signed_sha256: hash(&serde_json::to_vec(signed)?),
|
||||
|
||||
Reference in New Issue
Block a user