Files
optimclaw/src/secrets/types.rs
T
cf96a3253c fix(tests): replace hardcoded /tmp paths with tempdir + add 300 unit tests (#659)
* test: add unit tests across 20 modules for coverage push

Add 300+ unit tests covering config, context, evaluation, extensions,
LLM, secrets, tools/builder, and tools/mcp modules. All tests are
pure unit tests (no mocks) exercising serde roundtrips, edge cases,
error paths, and business logic.

Co-Authored-By: Claude Opus 4.6 <[email protected]>

* fix(tests): replace hardcoded /tmp paths with tempfile::tempdir

The e2e_metrics_test::test_metrics_collected_from_tool_trace test was
failing because setup_test_dir() created /tmp/ironclaw_metrics_test but
the fixture referenced /tmp/ironclaw_e2e_test/hello.txt (path mismatch).

Added LlmTrace::replace_paths() to substitute fixture paths at runtime,
then converted all 12 test files from hardcoded /tmp/ironclaw_* paths to
tempfile::tempdir(). Tests are now isolated, parallel-safe, and leave no
debris on disk.

Regression test: test_metrics_collected_from_tool_trace now passes
consistently regardless of prior /tmp state.

Co-Authored-By: Claude Opus 4.6 <[email protected]>

---------

Co-authored-by: Claude Opus 4.6 <[email protected]>
2026-03-07 08:24:24 +00:00

507 lines
16 KiB
Rust

//! Secret types for credential management.
//!
//! WASM tools NEVER see plaintext secrets. This module provides types
//! for secure storage and reference without exposing actual values.
use std::fmt;
use chrono::{DateTime, Utc};
use secrecy::{ExposeSecret, SecretString};
use serde::{Deserialize, Serialize};
use uuid::Uuid;
/// A stored secret with encrypted value.
///
/// The plaintext is never stored; only the encrypted form exists in the database.
#[derive(Clone)]
pub struct Secret {
pub id: Uuid,
pub user_id: String,
pub name: String,
/// AES-256-GCM encrypted value (nonce || ciphertext || tag).
pub encrypted_value: Vec<u8>,
/// Per-secret salt for key derivation.
pub key_salt: Vec<u8>,
/// Optional provider hint (e.g., "openai", "stripe").
pub provider: Option<String>,
/// When this secret expires (None = never).
pub expires_at: Option<DateTime<Utc>>,
/// Last time this secret was used for injection.
pub last_used_at: Option<DateTime<Utc>>,
/// Total number of times this secret has been used.
pub usage_count: i64,
pub created_at: DateTime<Utc>,
pub updated_at: DateTime<Utc>,
}
impl fmt::Debug for Secret {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Secret")
.field("id", &self.id)
.field("user_id", &self.user_id)
.field("name", &self.name)
.field("encrypted_value", &"[REDACTED]")
.field("key_salt", &"[REDACTED]")
.field("provider", &self.provider)
.field("expires_at", &self.expires_at)
.field("last_used_at", &self.last_used_at)
.field("usage_count", &self.usage_count)
.finish()
}
}
/// A reference to a secret by name, without exposing the value.
///
/// WASM tools receive these references and can check if secrets exist,
/// but they cannot read the actual values.
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct SecretRef {
pub name: String,
pub provider: Option<String>,
}
impl SecretRef {
pub fn new(name: impl Into<String>) -> Self {
Self {
name: name.into(),
provider: None,
}
}
pub fn with_provider(mut self, provider: impl Into<String>) -> Self {
self.provider = Some(provider.into());
self
}
}
/// A decrypted secret value, held in secure memory.
///
/// This type:
/// - Zeros memory on drop
/// - Never appears in Debug output
/// - Only exists briefly during credential injection
pub struct DecryptedSecret {
value: SecretString,
}
impl DecryptedSecret {
/// Create a new decrypted secret from raw bytes.
///
/// The bytes are converted to a UTF-8 string. For binary secrets,
/// consider base64 encoding before storage.
pub fn from_bytes(bytes: Vec<u8>) -> Result<Self, SecretError> {
// Convert to string, then wrap in SecretString
let s = String::from_utf8(bytes).map_err(|_| SecretError::InvalidUtf8)?;
Ok(Self {
value: SecretString::from(s),
})
}
/// Expose the secret value for injection.
///
/// This is the ONLY way to access the plaintext. Use sparingly
/// and ensure the exposed value isn't logged or persisted.
pub fn expose(&self) -> &str {
self.value.expose_secret()
}
/// Get the length of the secret without exposing it.
pub fn len(&self) -> usize {
self.value.expose_secret().len()
}
/// Check if the secret is empty.
pub fn is_empty(&self) -> bool {
self.len() == 0
}
}
impl fmt::Debug for DecryptedSecret {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "DecryptedSecret([REDACTED, {} bytes])", self.len())
}
}
impl Clone for DecryptedSecret {
fn clone(&self) -> Self {
Self {
value: SecretString::from(self.value.expose_secret().to_string()),
}
}
}
/// Errors that can occur during secret operations.
#[derive(Debug, Clone, thiserror::Error)]
pub enum SecretError {
#[error("Secret not found: {0}")]
NotFound(String),
#[error("Secret has expired")]
Expired,
#[error("Decryption failed: {0}")]
DecryptionFailed(String),
#[error("Encryption failed: {0}")]
EncryptionFailed(String),
#[error("Invalid master key")]
InvalidMasterKey,
#[error("Secret value is not valid UTF-8")]
InvalidUtf8,
#[error("Database error: {0}")]
Database(String),
#[error("Secret access denied for tool")]
AccessDenied,
#[error("Keychain error: {0}")]
KeychainError(String),
}
/// Parameters for creating a new secret.
#[derive(Debug)]
pub struct CreateSecretParams {
pub name: String,
pub value: SecretString,
pub provider: Option<String>,
pub expires_at: Option<DateTime<Utc>>,
}
impl CreateSecretParams {
/// Create new secret params. The name is normalized to lowercase for
/// case-insensitive matching (capabilities.json uses lowercase names
/// like `slack_bot_token`, but UIs may store `SLACK_BOT_TOKEN`).
pub fn new(name: impl Into<String>, value: impl Into<String>) -> Self {
Self {
name: name.into().to_lowercase(),
value: SecretString::from(value.into()),
provider: None,
expires_at: None,
}
}
pub fn with_provider(mut self, provider: impl Into<String>) -> Self {
self.provider = Some(provider.into());
self
}
pub fn with_expiry(mut self, expires_at: DateTime<Utc>) -> Self {
self.expires_at = Some(expires_at);
self
}
}
/// Where a credential should be injected in an HTTP request.
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
pub enum CredentialLocation {
/// Inject as Authorization header (e.g., "Bearer {secret}")
#[default]
AuthorizationBearer,
/// Inject as Authorization header with Basic auth
AuthorizationBasic { username: String },
/// Inject as a custom header
Header {
name: String,
prefix: Option<String>,
},
/// Inject as a query parameter
QueryParam { name: String },
/// Inject by replacing a placeholder in URL or body templates
UrlPath { placeholder: String },
}
/// Mapping from a secret name to where it should be injected.
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct CredentialMapping {
/// Name of the secret to use.
pub secret_name: String,
/// Where to inject the credential.
pub location: CredentialLocation,
/// Host patterns this credential applies to (glob syntax).
pub host_patterns: Vec<String>,
}
impl CredentialMapping {
pub fn bearer(secret_name: impl Into<String>, host_pattern: impl Into<String>) -> Self {
Self {
secret_name: secret_name.into(),
location: CredentialLocation::AuthorizationBearer,
host_patterns: vec![host_pattern.into()],
}
}
pub fn header(
secret_name: impl Into<String>,
header_name: impl Into<String>,
host_pattern: impl Into<String>,
) -> Self {
Self {
secret_name: secret_name.into(),
location: CredentialLocation::Header {
name: header_name.into(),
prefix: None,
},
host_patterns: vec![host_pattern.into()],
}
}
}
#[cfg(test)]
mod tests {
use crate::secrets::types::{CreateSecretParams, DecryptedSecret, SecretRef};
#[test]
fn test_secret_ref_creation() {
let r = SecretRef::new("my_api_key").with_provider("openai");
assert_eq!(r.name, "my_api_key");
assert_eq!(r.provider, Some("openai".to_string()));
}
#[test]
fn test_decrypted_secret_redaction() {
let secret = DecryptedSecret::from_bytes(b"super_secret_value".to_vec()).unwrap();
let debug_str = format!("{:?}", secret);
assert!(!debug_str.contains("super_secret_value"));
assert!(debug_str.contains("REDACTED"));
}
#[test]
fn test_decrypted_secret_expose() {
let secret = DecryptedSecret::from_bytes(b"test_value".to_vec()).unwrap();
assert_eq!(secret.expose(), "test_value");
assert_eq!(secret.len(), 10);
}
#[test]
fn test_create_params() {
let params = CreateSecretParams::new("key", "value").with_provider("stripe");
assert_eq!(params.name, "key");
assert_eq!(params.provider, Some("stripe".to_string()));
}
#[test]
fn test_create_params_name_lowercased() {
let params = CreateSecretParams::new("SLACK_BOT_TOKEN", "val");
assert_eq!(params.name, "slack_bot_token");
}
#[test]
fn test_create_params_with_expiry() {
use chrono::Utc;
let expiry = Utc::now();
let params = CreateSecretParams::new("key", "val").with_expiry(expiry);
assert_eq!(params.expires_at, Some(expiry));
}
#[test]
fn test_secret_ref_without_provider() {
let r = SecretRef::new("token");
assert_eq!(r.name, "token");
assert!(r.provider.is_none());
}
#[test]
fn test_secret_ref_serde_roundtrip() {
let original = SecretRef::new("api_key").with_provider("openai");
let json = serde_json::to_string(&original).unwrap();
let deserialized: SecretRef = serde_json::from_str(&json).unwrap();
assert_eq!(deserialized.name, original.name);
assert_eq!(deserialized.provider, original.provider);
}
#[test]
fn test_secret_ref_serde_without_provider() {
let original = SecretRef::new("bare_token");
let json = serde_json::to_string(&original).unwrap();
assert!(json.contains("\"provider\":null"));
let deserialized: SecretRef = serde_json::from_str(&json).unwrap();
assert!(deserialized.provider.is_none());
}
#[test]
fn test_credential_location_serde_roundtrip_bearer() {
use crate::secrets::types::CredentialLocation;
let loc = CredentialLocation::AuthorizationBearer;
let json = serde_json::to_string(&loc).unwrap();
let back: CredentialLocation = serde_json::from_str(&json).unwrap();
assert!(matches!(back, CredentialLocation::AuthorizationBearer));
}
#[test]
fn test_credential_location_serde_roundtrip_basic() {
use crate::secrets::types::CredentialLocation;
let loc = CredentialLocation::AuthorizationBasic {
username: "admin".to_string(),
};
let json = serde_json::to_string(&loc).unwrap();
let back: CredentialLocation = serde_json::from_str(&json).unwrap();
match back {
CredentialLocation::AuthorizationBasic { username } => {
assert_eq!(username, "admin");
}
_ => panic!("expected AuthorizationBasic"),
}
}
#[test]
fn test_credential_location_serde_roundtrip_header() {
use crate::secrets::types::CredentialLocation;
let loc = CredentialLocation::Header {
name: "X-Api-Key".to_string(),
prefix: Some("Token".to_string()),
};
let json = serde_json::to_string(&loc).unwrap();
let back: CredentialLocation = serde_json::from_str(&json).unwrap();
match back {
CredentialLocation::Header { name, prefix } => {
assert_eq!(name, "X-Api-Key");
assert_eq!(prefix, Some("Token".to_string()));
}
_ => panic!("expected Header"),
}
}
#[test]
fn test_credential_location_serde_roundtrip_query_param() {
use crate::secrets::types::CredentialLocation;
let loc = CredentialLocation::QueryParam {
name: "access_token".to_string(),
};
let json = serde_json::to_string(&loc).unwrap();
let back: CredentialLocation = serde_json::from_str(&json).unwrap();
match back {
CredentialLocation::QueryParam { name } => assert_eq!(name, "access_token"),
_ => panic!("expected QueryParam"),
}
}
#[test]
fn test_credential_location_serde_roundtrip_url_path() {
use crate::secrets::types::CredentialLocation;
let loc = CredentialLocation::UrlPath {
placeholder: "{api_key}".to_string(),
};
let json = serde_json::to_string(&loc).unwrap();
let back: CredentialLocation = serde_json::from_str(&json).unwrap();
match back {
CredentialLocation::UrlPath { placeholder } => assert_eq!(placeholder, "{api_key}"),
_ => panic!("expected UrlPath"),
}
}
#[test]
fn test_credential_location_default_is_bearer() {
use crate::secrets::types::CredentialLocation;
let loc = CredentialLocation::default();
assert!(matches!(loc, CredentialLocation::AuthorizationBearer));
}
#[test]
fn test_credential_mapping_bearer_constructor() {
use crate::secrets::types::CredentialMapping;
let m = CredentialMapping::bearer("my_token", "*.example.com");
assert_eq!(m.secret_name, "my_token");
assert!(matches!(
m.location,
crate::secrets::types::CredentialLocation::AuthorizationBearer
));
assert_eq!(m.host_patterns, vec!["*.example.com".to_string()]);
}
#[test]
fn test_credential_mapping_header_constructor() {
use crate::secrets::types::CredentialMapping;
let m = CredentialMapping::header("key", "X-Custom", "api.host.com");
assert_eq!(m.secret_name, "key");
match &m.location {
crate::secrets::types::CredentialLocation::Header { name, prefix } => {
assert_eq!(name, "X-Custom");
assert!(prefix.is_none());
}
_ => panic!("expected Header"),
}
assert_eq!(m.host_patterns, vec!["api.host.com".to_string()]);
}
#[test]
fn test_credential_mapping_serde_roundtrip() {
use crate::secrets::types::CredentialMapping;
let original = CredentialMapping::bearer("tok", "*.api.com");
let json = serde_json::to_string(&original).unwrap();
let back: CredentialMapping = serde_json::from_str(&json).unwrap();
assert_eq!(back.secret_name, "tok");
assert_eq!(back.host_patterns, vec!["*.api.com".to_string()]);
}
#[test]
fn test_decrypted_secret_invalid_utf8() {
let result = DecryptedSecret::from_bytes(vec![0xFF, 0xFE, 0x00]);
assert!(result.is_err());
}
#[test]
fn test_decrypted_secret_empty() {
let secret = DecryptedSecret::from_bytes(Vec::new()).unwrap();
assert!(secret.is_empty());
assert_eq!(secret.len(), 0);
assert_eq!(secret.expose(), "");
}
#[test]
fn test_decrypted_secret_clone() {
let original = DecryptedSecret::from_bytes(b"cloneable".to_vec()).unwrap();
let cloned = original.clone();
assert_eq!(cloned.expose(), "cloneable");
assert_eq!(cloned.len(), original.len());
}
#[test]
fn test_secret_debug_redacts_fields() {
use chrono::Utc;
use uuid::Uuid;
let secret = crate::secrets::types::Secret {
id: Uuid::nil(),
user_id: "user1".to_string(),
name: "test_key".to_string(),
encrypted_value: vec![1, 2, 3],
key_salt: vec![4, 5, 6],
provider: Some("aws".to_string()),
expires_at: None,
last_used_at: None,
usage_count: 5,
created_at: Utc::now(),
updated_at: Utc::now(),
};
let debug = format!("{:?}", secret);
assert!(debug.contains("REDACTED"));
assert!(!debug.contains("[1, 2, 3]"));
assert!(!debug.contains("[4, 5, 6]"));
assert!(debug.contains("test_key"));
}
#[test]
fn test_secret_error_display() {
use crate::secrets::types::SecretError;
assert_eq!(
SecretError::NotFound("foo".into()).to_string(),
"Secret not found: foo"
);
assert_eq!(SecretError::Expired.to_string(), "Secret has expired");
assert_eq!(
SecretError::InvalidMasterKey.to_string(),
"Invalid master key"
);
assert_eq!(
SecretError::InvalidUtf8.to_string(),
"Secret value is not valid UTF-8"
);
assert_eq!(
SecretError::AccessDenied.to_string(),
"Secret access denied for tool"
);
}
}