The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.
Rust agent-orchestrationai-agentsai-assistantdesktopllmlocal-firstmcppersonal-aiprivacyrustsecond-braintauri
refactor(storage): enforce record type in state decoding
Steven Enamakel4119e7e761e1
diff --git a/crates/openhuman-core/src/storage/import_state.rs b/crates/openhuman-core/src/storage/import_state.rsindex dc4fcbb1d5..db28f7fdca 100644--- a/crates/openhuman-core/src/storage/import_state.rs+++ b/crates/openhuman-core/src/storage/import_state.rs@@ -90,12 +90,20 @@ struct Claim {fn decode<T: for<'de> Deserialize<'de>>(row: Versioned<serde_json::Value>,+ expected_type: &str,expected_owner: &str,expected_step: &str,) -> Result<T, StorageError> {+ let record_type = row+ .doc+ .get("record_type")+ .and_then(serde_json::Value::as_str);let owner = row.doc.get("owner").and_then(serde_json::Value::as_str);let step = row.doc.get("step").and_then(serde_json::Value::as_str);- if owner != Some(expected_owner) || step != Some(expected_step) {+ if record_type != Some(expected_type)+ || owner != Some(expected_owner)+ || step != Some(expected_step)+ {return Err(StorageError::serialization("import state key does not match its owner and step",));@@ -111,7 +119,7 @@ pub async fn done(scoped: &Storage, owner: &str, step: &str) -> Result<bool, Stolet Some(row) = scoped.get(COLLECTION, &id).await? else {return Ok(false);};- let _: Completion = decode(row, owner, step)?;+ let _: Completion = decode(row, "completion", owner, step)?;Ok(true)}@@ -137,7 +145,7 @@ async fn mark_done_at(.map_err(|error| StorageError::serialization(error.to_string()))?;for _ in 0..CAS_RETRIES {if let Some(current) = scoped.get(COLLECTION, &id).await? {- let _: Completion = decode(current, owner, step)?;+ let _: Completion = decode(current, "completion", owner, step)?;return Ok(());}match scoped@@ -262,7 +270,7 @@ fn acquire(let current = docs.get(COLLECTION, &id).await?;let (expected, precondition, epoch) = match current {Some(row) => {- let claim: Claim = decode(row.clone(), &owner_owned, &step_owned)?;+ let claim: Claim = decode(row.clone(), "claim", &owner_owned, &step_owned)?;if claim.holder.is_some() && claim.valid_until_ms > now_ms {return Ok(None);}@@ -352,7 +360,7 @@ fn renew(repo: &Repo, token: &ClaimToken, now_ms: i64) -> Result<bool> {let Some(row) = docs.get(COLLECTION, &id).await? else {return Ok(false);};- let mut claim: Claim = decode(row.clone(), &token.owner, &token.step)?;+ let mut claim: Claim = decode(row.clone(), "claim", &token.owner, &token.step)?;if claim.holder.as_deref() != Some(&token.holder)|| claim.epoch != token.epoch|| claim.valid_until_ms <= now_ms@@ -390,7 +398,7 @@ fn release(repo: &Repo, token: &ClaimToken) -> Result<()> {let Some(row) = docs.get(COLLECTION, &id).await? else {return Ok(());};- let mut claim: Claim = decode(row.clone(), &token.owner, &token.step)?;+ let mut claim: Claim = decode(row.clone(), "claim", &token.owner, &token.step)?;if claim.holder.as_deref() != Some(&token.holder) || claim.epoch != token.epoch {return Ok(());}diff --git a/crates/openhuman-core/src/storage/import_state_tests.rs b/crates/openhuman-core/src/storage/import_state_tests.rsindex 514efd7787..f48e991896 100644--- a/crates/openhuman-core/src/storage/import_state_tests.rs+++ b/crates/openhuman-core/src/storage/import_state_tests.rs@@ -15,6 +15,15 @@ fn repo() -> Repo {Repo::on(&backend, &Scope::local(), "claim-test", spec).unwrap()}+#[test]+fn state_keys_keep_owner_and_step_boundaries_unambiguous() {+ assert_ne!(+ record_key("a/b", "c", "done"),+ record_key("a", "b/c", "done")+ );+ assert_eq!(collection_specs()[0].name, "storage.import_state");+}+fn load_claim(repo: &Repo, owner: &str, step: &str) -> Option<Claim> {let scoped = repo.scoped().clone();let (owner, step) = (owner.to_owned(), step.to_owned());@@ -22,7 +31,7 @@ fn load_claim(repo: &Repo, owner: &str, step: &str) -> Option<Claim> {ensure(&scoped).await?;let id = record_key(&owner, &step, "claim");match docs.get(COLLECTION, &id).await? {- Some(row) => decode(row, &owner, &step).map(Some),+ Some(row) => decode(row, "claim", &owner, &step).map(Some),None => Ok(None),}})