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:
@@ -15,6 +15,20 @@ struct Observation {
|
||||
data: Value,
|
||||
}
|
||||
pub fn validate(bytes: &[u8], now: DateTime<Utc>) -> Result<Value, &'static str> {
|
||||
validate_for_scope(bytes, now, "linux.base")
|
||||
}
|
||||
/// Snapshot scope is supplied by the authenticated ingestion path, never inferred
|
||||
/// from an arbitrary observation's label. Windows does not manufacture inodes.
|
||||
pub fn validate_for_scope(
|
||||
bytes: &[u8],
|
||||
now: DateTime<Utc>,
|
||||
scope: &str,
|
||||
) -> Result<Value, &'static str> {
|
||||
let prefix = match scope {
|
||||
"linux.base" => "linux.",
|
||||
"windows.base" => "windows.",
|
||||
_ => return Err("UNSUPPORTED_INVENTORY_SCOPE"),
|
||||
};
|
||||
if bytes.len() > 512 * 1024 {
|
||||
return Err("INVENTORY_SIZE");
|
||||
}
|
||||
@@ -23,10 +37,36 @@ pub fn validate(bytes: &[u8], now: DateTime<Utc>) -> Result<Value, &'static str>
|
||||
let observations = base.remove("observations");
|
||||
let started = base.remove("collection_started_at");
|
||||
let completed = base.remove("collection_completed_at");
|
||||
let inventory: crate::Inventory =
|
||||
serde_json::from_value(Value::Object(base)).map_err(|_| "INVALID_BASE_INVENTORY")?;
|
||||
if !inventory.validate() {
|
||||
return Err("INVALID_BASE_INVENTORY");
|
||||
if scope == "windows.base" {
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct WindowsInventory {
|
||||
os: String,
|
||||
hostname: String,
|
||||
architecture: String,
|
||||
root_total_bytes: u64,
|
||||
root_available_bytes: u64,
|
||||
root_available_inodes: Option<u64>,
|
||||
}
|
||||
let inventory: WindowsInventory =
|
||||
serde_json::from_value(Value::Object(base)).map_err(|_| "INVALID_BASE_INVENTORY")?;
|
||||
if !inventory.os.starts_with("Windows")
|
||||
|| inventory.os.len() > 4096
|
||||
|| inventory.hostname.is_empty()
|
||||
|| inventory.hostname.len() > 255
|
||||
|| inventory.architecture != "x86_64"
|
||||
|| inventory.root_total_bytes == 0
|
||||
|| inventory.root_available_bytes > inventory.root_total_bytes
|
||||
|| inventory.root_available_inodes.is_some()
|
||||
{
|
||||
return Err("INVALID_WINDOWS_BASE_INVENTORY");
|
||||
}
|
||||
} else {
|
||||
let inventory: crate::Inventory =
|
||||
serde_json::from_value(Value::Object(base)).map_err(|_| "INVALID_BASE_INVENTORY")?;
|
||||
if !inventory.validate() {
|
||||
return Err("INVALID_BASE_INVENTORY");
|
||||
}
|
||||
}
|
||||
if let Some(observations) = observations {
|
||||
let started: DateTime<Utc> =
|
||||
@@ -57,7 +97,7 @@ pub fn validate(bytes: &[u8], now: DateTime<Utc>) -> Result<Value, &'static str>
|
||||
}
|
||||
let o: Observation =
|
||||
serde_json::from_value(item.clone()).map_err(|_| "INVALID_OBSERVATION")?;
|
||||
if !o.scope.starts_with("linux.")
|
||||
if !o.scope.starts_with(prefix)
|
||||
|| o.scope.len() > 64
|
||||
|| !o
|
||||
.scope
|
||||
@@ -114,4 +154,27 @@ mod tests {
|
||||
unknown["tenant_id"] = json!("forged");
|
||||
assert!(validate(&serde_json::to_vec(&unknown).unwrap(), now).is_err());
|
||||
}
|
||||
#[test]
|
||||
fn windows_scope_does_not_weaken_linux_or_accept_platform_spoofing() {
|
||||
let now = Utc::now();
|
||||
let mut v = base();
|
||||
v["os"] = json!("Windows 11 Pro");
|
||||
v["root_available_inodes"] = Value::Null;
|
||||
let bytes = serde_json::to_vec(&v).unwrap();
|
||||
assert!(validate(&bytes, now).is_err());
|
||||
assert!(validate_for_scope(&bytes, now, "windows.base").is_ok());
|
||||
assert!(validate_for_scope(&bytes, now, "arbitrary.base").is_err());
|
||||
v["root_available_inodes"] = json!(0);
|
||||
assert!(validate_for_scope(&serde_json::to_vec(&v).unwrap(), now, "windows.base").is_err());
|
||||
v["root_available_inodes"] = Value::Null;
|
||||
v["collection_started_at"] = json!(now);
|
||||
v["collection_completed_at"] = json!(now);
|
||||
v["observations"] = json!([{"scope":"linux.os","source_id":"windows.native","observed_at":now,"quality":"valid","completeness":"partial","truncated":false,"error_code":null,"data":{}}]);
|
||||
assert_eq!(
|
||||
validate_for_scope(&serde_json::to_vec(&v).unwrap(), now, "windows.base").unwrap_err(),
|
||||
"INVALID_OBSERVATION_SCOPE"
|
||||
);
|
||||
v["observations"][0]["scope"] = json!("windows.os");
|
||||
assert!(validate_for_scope(&serde_json::to_vec(&v).unwrap(), now, "windows.base").is_ok());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)?)
|
||||
|
||||
@@ -128,7 +128,7 @@ async fn device_list(
|
||||
.map_err(|e| e.0)?;
|
||||
let mut page =
|
||||
crate::pagination::Cursor::parse(state, &principal, "devices:agent_id:asc", query)?;
|
||||
let rows = sqlx::query("SELECT a.agent_id,a.asset_id,a.revoked_at,a.last_contact_at,a.certificate_sha256,a.last_authenticated_certificate_sha256,a.last_authenticated_at,a.capabilities,a.enrollment_generation,a.assignment_version,o.observed_at,o.received_at,o.data FROM agent_installations a LEFT JOIN LATERAL (SELECT observed_at,received_at,data FROM observations WHERE tenant_id=a.tenant_id AND agent_id=a.agent_id AND received_at<=$2 ORDER BY observed_at DESC, received_at DESC LIMIT 1) o ON true WHERE ($1::uuid IS NULL OR a.asset_id=$1) AND a.agent_id>$3 AND a.created_at<=$2 ORDER BY a.agent_id LIMIT $4")
|
||||
let rows = sqlx::query("SELECT a.agent_id,a.asset_id,a.revoked_at,a.last_contact_at,a.certificate_sha256,a.last_authenticated_certificate_sha256,a.last_authenticated_at,a.capabilities,a.enrollment_generation,a.assignment_version,o.observed_at,o.received_at,o.data,o.source_id FROM agent_installations a LEFT JOIN LATERAL (SELECT observed_at,received_at,data,source_id FROM observations WHERE tenant_id=a.tenant_id AND agent_id=a.agent_id AND received_at<=$2 ORDER BY observed_at DESC, received_at DESC LIMIT 1) o ON true WHERE ($1::uuid IS NULL OR a.asset_id=$1) AND a.agent_id>$3 AND a.created_at<=$2 ORDER BY a.agent_id LIMIT $4")
|
||||
.bind(asset)
|
||||
.bind(page.as_of).bind(page.last).bind(i64::from(page.limit)+1)
|
||||
.fetch_all(&mut *tx).await.map_err(|_| StatusCode::SERVICE_UNAVAILABLE)?;
|
||||
@@ -141,7 +141,7 @@ async fn device_list(
|
||||
let revoked: Option<chrono::DateTime<Utc>> = r.get("revoked_at");
|
||||
let age = last.map(|t| (Utc::now()-t).num_seconds());
|
||||
let presence = if revoked.is_some() { "revoked" } else { match age { None=>"never_seen",Some(n) if n<90=>"online",Some(n) if n<180=>"stale",_=>"unreachable" } };
|
||||
json!({"agent_id":r.get::<Uuid,_>("agent_id"),"asset_id":r.get::<Uuid,_>("asset_id"),"certificate_sha256":r.get::<String,_>("certificate_sha256"),"last_authenticated_certificate_sha256":r.get::<Option<String>,_>("last_authenticated_certificate_sha256"),"last_authenticated_at":r.get::<Option<chrono::DateTime<Utc>>,_>("last_authenticated_at"),"capabilities":r.get::<Value,_>("capabilities"),"enrollment_generation":r.get::<i64,_>("enrollment_generation"),"assignment_version":r.get::<i64,_>("assignment_version"),"presence":presence,"last_contact_at":last,"inventory":r.get::<Option<Value>,_>("data"),"observed_at":r.get::<Option<chrono::DateTime<Utc>>,_>("observed_at"),"received_at":r.get::<Option<chrono::DateTime<Utc>>,_>("received_at"),"source_id":"linux.base","quality":if r.get::<Option<Value>,_>("data").is_some(){"valid"}else{"unknown"},"completeness":"partial","health":"unknown"})
|
||||
json!({"agent_id":r.get::<Uuid,_>("agent_id"),"asset_id":r.get::<Uuid,_>("asset_id"),"certificate_sha256":r.get::<String,_>("certificate_sha256"),"last_authenticated_certificate_sha256":r.get::<Option<String>,_>("last_authenticated_certificate_sha256"),"last_authenticated_at":r.get::<Option<chrono::DateTime<Utc>>,_>("last_authenticated_at"),"capabilities":r.get::<Value,_>("capabilities"),"enrollment_generation":r.get::<i64,_>("enrollment_generation"),"assignment_version":r.get::<i64,_>("assignment_version"),"presence":presence,"last_contact_at":last,"inventory":r.get::<Option<Value>,_>("data"),"observed_at":r.get::<Option<chrono::DateTime<Utc>>,_>("observed_at"),"received_at":r.get::<Option<chrono::DateTime<Utc>>,_>("received_at"),"source_id":r.get::<Option<String>,_>("source_id"),"quality":if r.get::<Option<Value>,_>("data").is_some(){"valid"}else{"unknown"},"completeness":"partial","health":"unknown"})
|
||||
}).collect::<Vec<_>>();
|
||||
let next = if truncated {
|
||||
Some(page.next(state, rows[usize::from(page.limit) - 1].get("agent_id"))?)
|
||||
|
||||
Reference in New Issue
Block a user