Skip to content

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

refactor(storage): adjust queue authorization logic

Steven Enamakel8271657b9cda
diff --git a/crates/openhuman-core/src/modules/storage_grants.rs b/crates/openhuman-core/src/modules/storage_grants.rs
index ad0f5172fa..cfb0b0de9c 100644
--- a/crates/openhuman-core/src/modules/storage_grants.rs
+++ b/crates/openhuman-core/src/modules/storage_grants.rs
@@ -263,9 +263,8 @@ pub(crate) fn authorize(
"ttl": false,
"max_key_len": 0,
}))),
- Object::Streams | Object::Secrets | Object::Queues | Object::Kv => {
- Err(Denied::Object)
- }
+ Object::Streams | Object::Secrets | Object::Queues => Err(Denied::Object),
+ Object::Kv => Ok(Plan::Answer(serde_json::json!({ "capabilities": [] }))),
};
}
// `BusStorage::connect` asks every module's host for queue features, so a
@@ -496,7 +495,7 @@ fn queues(grant: &StorageGrant, selector: &str, request: &Value) -> Result<Plan,
match selector {
"Features" => Ok(forward("")),
"EnsureQueue" | "Enqueue" | "Receive" | "Ack" | "Nack" | "Extend" | "Stats"
- | "ListDead" | "Redrive" | "Purge" => {
+ | "DeadLetters" | "Redrive" | "Purge" => {
let name = text(request, "queue")?;
let declaration = grant
.queues
diff --git a/crates/openhuman-core/src/modules/storage_host.rs b/crates/openhuman-core/src/modules/storage_host.rs
index ff6d32b3cd..291fc9513f 100644
--- a/crates/openhuman-core/src/modules/storage_host.rs
+++ b/crates/openhuman-core/src/modules/storage_host.rs
@@ -248,7 +248,13 @@ impl StorageHost {
Ok(plan) => plan,
Err(denied) => {
call.record("", denied.label());
- return Err(HostError::Denied(denied.label()));
+ return Err(match denied {
+ super::storage_grants::Denied::QueueNotGranted => {
+ failure(StorageKind::NotFound)
+ }
+ super::storage_grants::Denied::QueueSpec => failure(StorageKind::Conflict),
+ _ => HostError::Denied(denied.label()),
+ });
}
};
Ok(Admitted {
diff --git a/crates/openhuman-core/src/modules/storage_queue_manifest_tests.rs b/crates/openhuman-core/src/modules/storage_queue_manifest_tests.rs
new file mode 100644
index 0000000000..b1018fb0f3
--- /dev/null
+++ b/crates/openhuman-core/src/modules/storage_queue_manifest_tests.rs
@@ -0,0 +1,38 @@
+use super::*;
+
+#[test]
+fn parses_supported_manifest_and_preserves_queue_policy() {
+ let manifest = QueueManifest::from_json(
+ r#"{"$schema":"https://example.test/queues.schema.json","version":1,"queues":[{"name":"inbox","description":"inbound work","owner":"worker","max_attempts":3,"dedupe_window_ms":60000,"visibility_ms":30000}]}"#,
+ )
+ .unwrap();
+ let declaration = manifest.get("inbox").unwrap();
+ assert_eq!(declaration.spec().max_attempts, 3);
+ assert_eq!(declaration.spec().dedupe_window_ms, 60_000);
+ assert_eq!(declaration.visibility_ms, Some(30_000));
+}
+
+#[test]
+fn rejects_unknown_fields_duplicate_names_and_invalid_future_versions() {
+ for text in [
+ r#"{"version":1,"queues":[],"fallback":"memory"}"#,
+ r#"{"version":2,"queues":[]}"#,
+ r#"{"version":1,"queues":[{"name":"q","max_attempts":2},{"name":"q","max_attempts":3}]}"#,
+ r#"{"version":1,"queues":[{"name":"Bad Name"}]}"#,
+ ] {
+ assert!(QueueManifest::from_json(text).is_err(), "{text}");
+ }
+}
+
+#[test]
+fn allows_old_manifest_defaults_but_rejects_zero_attempts_or_visibility() {
+ let manifest = QueueManifest::from_json(r#"{"version":1,"queues":[{"name":"legacy"}]}"#)
+ .unwrap();
+ assert_eq!(manifest.get("legacy").unwrap().spec().max_attempts, 8);
+ for text in [
+ r#"{"version":1,"queues":[{"name":"q","max_attempts":0}]}"#,
+ r#"{"version":1,"queues":[{"name":"q","visibility_ms":0}]}"#,
+ ] {
+ assert!(QueueManifest::from_json(text).is_err(), "{text}");
+ }
+}