Skip to content

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

refactor(storage): update secret storage to use explicit scope in operations

Steven Enamakel2b4c73ae3dac
diff --git a/crates/openhuman-core/src/security/secret_storage/ops_adoption_tests.rs b/crates/openhuman-core/src/security/secret_storage/ops_adoption_tests.rs
index 1505ed51a3..d5d5647f01 100644
--- a/crates/openhuman-core/src/security/secret_storage/ops_adoption_tests.rs
+++ b/crates/openhuman-core/src/security/secret_storage/ops_adoption_tests.rs
@@ -36,8 +36,10 @@ fn storage_secrets_in(
storage: &MemoryStorage,
scope: &str,
) -> tinystoragedrivers::secrets::DocumentSecrets {
+ let owner_scope = Scope::new(scope).unwrap();
crate::storage::secrets::over(
- &storage.for_scope(&Scope::new(scope).unwrap()).unwrap(),
+ &storage.for_scope(&owner_scope).unwrap(),
+ owner_scope,
Arc::new(DerivedKeys::new(Zeroizing::new([5; 32]))),
)
}
diff --git a/crates/openhuman-core/src/storage/layout/credentials.rs b/crates/openhuman-core/src/storage/layout/credentials.rs
index 32f7fc2316..e9acb87b96 100644
--- a/crates/openhuman-core/src/storage/layout/credentials.rs
+++ b/crates/openhuman-core/src/storage/layout/credentials.rs
@@ -122,10 +122,11 @@ pub async fn import(target: &Target) -> Result<Vec<String>, LayoutError> {
let keys = storage::secrets::keys()
.map_err(|e| LayoutError::Other(anyhow::anyhow!("master key for credentials: {e}")))?;
let backend = super::legacy::open_v1(target).await?;
+ let scope = storage::tenant_scope(None);
let scoped = backend
- .for_scope(&storage::tenant_scope(None))
+ .for_scope(&scope)
.map_err(|e| LayoutError::Other(anyhow::anyhow!("open the local scope: {e}")))?;
- let secrets = storage::secrets::over(&scoped, keys);
+ let secrets = storage::secrets::over(&scoped, scope, keys);
let mut imported = Vec::new();
for (file, secret, bytes) in files {
let stored = secrets.get(secret).await.map_err(|e| {
diff --git a/crates/openhuman-core/src/storage/layout/credentials_tests.rs b/crates/openhuman-core/src/storage/layout/credentials_tests.rs
index 07fa12a0aa..e4e8499d88 100644
--- a/crates/openhuman-core/src/storage/layout/credentials_tests.rs
+++ b/crates/openhuman-core/src/storage/layout/credentials_tests.rs
@@ -37,8 +37,9 @@ async fn run(fx: &Fixture) -> Result<Outcome, LayoutError> {
async fn stored(fx: &Fixture, secret: &str) -> Option<Vec<u8>> {
let url = format!("sqlite:{}", fx.target.storage_db().display());
let backend = storage::open(&url).await.unwrap();
- let scoped = backend.for_scope(&storage::tenant_scope(None)).unwrap();
- let secrets = storage::secrets::over(&scoped, storage::secrets::keys().unwrap());
+ let scope = storage::tenant_scope(None);
+ let scoped = backend.for_scope(&scope).unwrap();
+ let secrets = storage::secrets::over(&scoped, scope, storage::secrets::keys().unwrap());
secrets.get(secret).await.unwrap().map(|b| b.to_vec())
}
@@ -88,9 +89,10 @@ async fn a_stored_record_under_another_key_stops_the_migration_and_keeps_the_fil
let fx = with_credentials();
let url = super::super::legacy::v1_url(&fx.target);
let backend = storage::open(&url).await.unwrap();
- let scoped = backend.for_scope(&storage::tenant_scope(None)).unwrap();
+ let scope = storage::tenant_scope(None);
+ let scoped = backend.for_scope(&scope).unwrap();
let other = Arc::new(DerivedKeys::new(Zeroizing::new([0x99; 32])));
- storage::secrets::over(&scoped, other)
+ storage::secrets::over(&scoped, scope, other)
.set(PROFILES_SECRET_NAME, b"{}")
.await
.unwrap();
@@ -109,8 +111,9 @@ async fn a_record_already_on_the_backend_wins_over_a_stale_file() {
let fx = with_credentials();
let url = super::super::legacy::v1_url(&fx.target);
let backend = storage::open(&url).await.unwrap();
- let scoped = backend.for_scope(&storage::tenant_scope(None)).unwrap();
- storage::secrets::over(&scoped, storage::secrets::keys().unwrap())
+ let scope = storage::tenant_scope(None);
+ let scoped = backend.for_scope(&scope).unwrap();
+ storage::secrets::over(&scoped, scope, storage::secrets::keys().unwrap())
.set(PROFILES_SECRET_NAME, br#"{"newer":true}"#)
.await
.unwrap();
diff --git a/crates/openhuman-core/src/storage/secrets_tests.rs b/crates/openhuman-core/src/storage/secrets_tests.rs
index 57b295c901..6dcd5a2b14 100644
--- a/crates/openhuman-core/src/storage/secrets_tests.rs
+++ b/crates/openhuman-core/src/storage/secrets_tests.rs
@@ -6,8 +6,10 @@ fn keys(byte: u8) -> Arc<dyn KeyProvider> {
}
fn secrets_in(storage: &MemoryStorage, scope: &str, key: u8) -> DocumentSecrets {
+ let scope = Scope::new(scope).unwrap();
over(
- &storage.for_scope(&Scope::new(scope).unwrap()).unwrap(),
+ &storage.for_scope(&scope).unwrap(),
+ scope,
keys(key),
)
}