Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

refactor(storage): improve queue spec validation

Steven Enamakel5e4516699837
diff --git a/crates/openhuman-core/src/modules/storage_grants.rs b/crates/openhuman-core/src/modules/storage_grants.rs
index 9b2fbe030a..ad0f5172fa 100644
--- a/crates/openhuman-core/src/modules/storage_grants.rs
+++ b/crates/openhuman-core/src/modules/storage_grants.rs
@@ -509,7 +509,10 @@ fn queues(grant: &StorageGrant, selector: &str, request: &Value) -> Result<Plan,
.cloned()
.and_then(|value| serde_json::from_value::<tinystoragedrivers::QueueSpec>(value).ok())
.ok_or(Denied::Malformed)?;
- if spec != declaration.spec() {
+ let declared = declaration.spec();
+ if spec.max_attempts != declared.max_attempts
+ || spec.dedupe_window_ms != declared.dedupe_window_ms
+ {
return Err(Denied::QueueSpec);
}
}
diff --git a/crates/openhuman-core/src/modules/storage_queue_manifest.rs b/crates/openhuman-core/src/modules/storage_queue_manifest.rs
index ff3c4ed188..a2faf4e77c 100644
--- a/crates/openhuman-core/src/modules/storage_queue_manifest.rs
+++ b/crates/openhuman-core/src/modules/storage_queue_manifest.rs
@@ -5,7 +5,7 @@
use std::collections::BTreeMap;
use serde::{Deserialize, Serialize};
-use tinystoragedrivers::queue::{QueueSpec, validate_queue_name};
+use tinystoragedrivers_types::QueueSpec;
/// A validated version-1 queue manifest supplied by the host.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -67,11 +67,13 @@ impl QueueManifest {
}
let mut names = BTreeMap::new();
for queue in &self.queues {
- validate_queue_name(&queue.name).map_err(|error| error.to_string())?;
+ validate_name(&queue.name)?;
if queue.owner.as_ref().is_some_and(|owner| owner.trim().is_empty()) {
return Err(format!("queue {:?} owner must not be empty", queue.name));
}
- queue.spec().validate().map_err(|error| error.to_string())?;
+ if queue.max_attempts == 0 {
+ return Err(format!("queue {:?} must allow at least one attempt", queue.name));
+ }
if queue.visibility_ms == Some(0) {
return Err(format!("queue {:?} visibility_ms must be positive", queue.name));
}
@@ -93,6 +95,18 @@ impl QueueManifest {
}
}
+fn validate_name(name: &str) -> Result<(), String> {
+ if name.is_empty()
+ || name.len() > 64
+ || !name
+ .bytes()
+ .all(|byte| byte.is_ascii_lowercase() || byte.is_ascii_digit() || b"._-".contains(&byte))
+ {
+ return Err(format!("invalid queue name {name:?}"));
+ }
+ Ok(())
+}
+
#[cfg(test)]
#[path = "storage_queue_manifest_tests.rs"]
mod tests;