feat: deploy platform inventory and signed APT retry client compatibility
Rust development slice / linux (push) Failing after 6s
Rust development slice / linux (push) Failing after 6s
This commit is contained in:
@@ -99,7 +99,7 @@ pub async fn ingest(
|
||||
);
|
||||
let mut tx = rmm_persistence::tenant_tx(&state.pool, tenant).await?;
|
||||
control_lock(&mut tx, tenant, agent).await?;
|
||||
let row=sqlx::query("SELECT revoked_at,connection_generation,transport,connection_boot_id,last_sequence FROM agent_installations WHERE agent_id=$1 FOR UPDATE").bind(agent).fetch_one(&mut *tx).await?;
|
||||
let row=sqlx::query("SELECT revoked_at,connection_generation,transport,connection_boot_id,last_sequence,capabilities FROM agent_installations WHERE agent_id=$1 FOR UPDATE").bind(agent).fetch_one(&mut *tx).await?;
|
||||
let active = row.get::<Option<DateTime<Utc>>, _>("revoked_at").is_none()
|
||||
&& row.get::<i64, _>("connection_generation") == i64::try_from(e.connection_generation)?
|
||||
&& row.get::<String, _>("transport") == transport;
|
||||
@@ -145,7 +145,7 @@ pub async fn ingest(
|
||||
}
|
||||
Some(Payload::InventorySnapshot(s)) => {
|
||||
ensure!(
|
||||
s.scope == "linux.base"
|
||||
matches!(s.scope.as_str(), "linux.base" | "windows.base")
|
||||
&& s.schema_version == 1
|
||||
&& s.chunk_count == 1
|
||||
&& s.chunk_index == 0
|
||||
@@ -157,12 +157,18 @@ pub async fn ingest(
|
||||
s.sha256 == Sha256::digest(&s.data).as_slice(),
|
||||
"snapshot hash mismatch"
|
||||
);
|
||||
let inventory = rmm_domain::inventory_document::validate(&s.data, Utc::now())
|
||||
.map_err(anyhow::Error::msg)?;
|
||||
let capabilities: Vec<String> = serde_json::from_value(row.get("capabilities"))?;
|
||||
ensure!(
|
||||
capabilities.contains(&format!("{}/1", s.scope)),
|
||||
"snapshot capability mismatch"
|
||||
);
|
||||
let inventory =
|
||||
rmm_domain::inventory_document::validate_for_scope(&s.data, Utc::now(), &s.scope)
|
||||
.map_err(anyhow::Error::msg)?;
|
||||
let mut identity = e.clone();
|
||||
identity.connection_generation = 0;
|
||||
let hash = hex::encode(Sha256::digest(identity.encode_to_vec()));
|
||||
sqlx::query("INSERT INTO observations(tenant_id,agent_id,message_id,boot_id,sequence,observed_at,source_id,quality,completeness,snapshot_id,data,payload_sha256) VALUES($1,$2,$3,$4,$5,$6,'linux.base','valid','partial',$7,$8,$9) ON CONFLICT(tenant_id,message_id) DO NOTHING").bind(tenant).bind(agent).bind(Uuid::parse_str(&e.message_id)?).bind(Uuid::parse_str(&e.boot_id)?).bind(i64::try_from(e.sequence)?).bind(observed).bind(Uuid::parse_str(&s.snapshot_id)?).bind(serde_json::to_value(inventory)?).bind(&hash).execute(&mut *tx).await?;
|
||||
sqlx::query("INSERT INTO observations(tenant_id,agent_id,message_id,boot_id,sequence,observed_at,source_id,quality,completeness,snapshot_id,data,payload_sha256) VALUES($1,$2,$3,$4,$5,$6,$10,'valid','partial',$7,$8,$9) ON CONFLICT(tenant_id,message_id) DO NOTHING").bind(tenant).bind(agent).bind(Uuid::parse_str(&e.message_id)?).bind(Uuid::parse_str(&e.boot_id)?).bind(i64::try_from(e.sequence)?).bind(observed).bind(Uuid::parse_str(&s.snapshot_id)?).bind(serde_json::to_value(inventory)?).bind(&hash).bind(&s.scope).execute(&mut *tx).await?;
|
||||
let stored: String =
|
||||
sqlx::query_scalar("SELECT payload_sha256 FROM observations WHERE message_id=$1")
|
||||
.bind(Uuid::parse_str(&e.message_id)?)
|
||||
|
||||
Reference in New Issue
Block a user