dguiducci
178a38357e
Two changes developed together in one session; they share the same module
structure (db/mod.rs, the core lib root) and only compile together, so they
land as one commit.
## UserManager + per-user encryption (§9/§11)
New `users::UserManager`: owns the system.db pool plus a map
`userid -> SqlitePool` of unlocked databases. The pool *is* the unlock token —
its connect options carry the DEK as SQLCipher's raw key, so an open pool means
the key is in RAM until restart and dropping it re-locks (§9). Knows nothing
about cookies.
New `crypto` module: envelope encryption. A random 256-bit DEK encrypts
`{userid}.db`; `users.database_password` holds it sealed with AES-256-GCM under
`Argon2id(password, salt)`. The AEAD tag is the password verifier — one
derivation both authenticates and yields the key, so encrypted users store no
second hash. Cleartext users store the Argon2id output directly, compared in
constant time. Argon2 runs in spawn_blocking behind a 2-permit semaphore
(256 MiB per derivation).
- SQLCipher via `libsqlite3-sys` `bundled-sqlcipher-vendored-openssl`, pinned
<0.38 so it unifies with the one sqlx-sqlite links (a newer copy would apply
the feature to a SQLite sqlx never uses). OpenSSL is vendored and static, so
the binary stays self-contained.
- Schema split into `create_registry_tables` (instance-wide, no user key) and
`create_owner_tables` (one owner's content, identical in every file). No FK in
the owner bucket may reach the registry — enforced by a standalone test.
Dropped `chat_history.model_db_id` (write-only, and the only registry-crossing
key); moved `projects`/`project_tickets` into the owner bucket.
- Provisioning invariant: the file is written before the row, deleted after it,
so a crash leaves an orphan file, never a user without a database. `open_db`
never creates: a missing file is an error, not a silent empty database.
Not consumed yet: no login, call sites still use the shared system.db pool.
## Extract crates/skald-core
The headless core moves out of `src/` into its own crate; `skald` (server) and
the coming `skald-setup` are shells around it. Two dependencies on the shell
were inverted rather than dragged along, so the core names neither Tauri nor any
concrete plugin:
- `Plugin::tools(self: Arc<Self>)` — plugins contribute tools through this hook
(sibling of `http_router`), so the core no longer downcasts to
`MobileConnectorPlugin`.
- `tools::restart::set_restart_handler` — the desktop shell installs its
teardown-and-respawn; the core defaults to the supervisor exit code. The core
loses its `desktop` feature.
- `boot`'s stdout formatter moves to the binary (`src/boot_format.rs`); the core
only emits tracing events.
All 79 core tests pass; the binary boots and serves in a clean directory, and
the mobile-connector tools still register through the new hook.
67 lines
2.2 KiB
Rust
67 lines
2.2 KiB
Rust
use std::sync::Arc;
|
|
|
|
use anyhow::Result;
|
|
use serde_json::{Value, json};
|
|
|
|
use crate::secrets::{SecretsApi, SecretsStore};
|
|
use crate::tools::{Tool, ToolDescriptionLength};
|
|
|
|
pub struct SetSecret(pub Arc<SecretsStore>);
|
|
|
|
impl Tool for SetSecret {
|
|
fn name(&self) -> &str { "set_secret" }
|
|
fn category(&self) -> crate::tools::ToolCategory { crate::tools::ToolCategory::Config }
|
|
|
|
fn description(&self) -> &str {
|
|
"Store a secret value by key (e.g. HUGGINGFACE_TOKEN). \
|
|
If value is an empty string or null the key is deleted. \
|
|
Secrets are never returned by any tool — use list_secrets to check presence. \
|
|
Keys are uppercase by convention (e.g. HUGGINGFACE_TOKEN, GMAPS_API_KEY)."
|
|
}
|
|
|
|
fn parameters_schema(&self) -> Value {
|
|
json!({
|
|
"type": "object",
|
|
"properties": {
|
|
"key": {
|
|
"type": "string",
|
|
"description": "Secret key name, uppercase (e.g. HUGGINGFACE_TOKEN)."
|
|
},
|
|
"value": {
|
|
"type": ["string", "null"],
|
|
"description": "Secret value. Empty string or null deletes the key."
|
|
}
|
|
},
|
|
"required": ["key"]
|
|
})
|
|
}
|
|
|
|
fn describe(&self, args: &Value, _length: ToolDescriptionLength) -> String {
|
|
let key = args["key"].as_str().unwrap_or("?");
|
|
format!("set secret {key}")
|
|
}
|
|
|
|
fn execute(&self, args: Value) -> Result<String> {
|
|
let key = args["key"]
|
|
.as_str()
|
|
.ok_or_else(|| anyhow::anyhow!("set_secret: missing required argument `key`"))?;
|
|
|
|
let value = args["value"].as_str();
|
|
|
|
tokio::task::block_in_place(|| {
|
|
tokio::runtime::Handle::current().block_on(async {
|
|
match value {
|
|
Some(v) if !v.is_empty() => {
|
|
self.0.set(key, v).await?;
|
|
Ok(format!("Secret '{key}' set."))
|
|
}
|
|
_ => {
|
|
self.0.delete(key).await?;
|
|
Ok(format!("Secret '{key}' deleted."))
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|