1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
//! Credential types, traits, and error types for tool authentication.
//!
//! Tools declare authentication requirements via [`AuthConfig`]; the framework
//! resolves credentials from a pluggable [`CredentialStore`] and delivers the
//! resolved secret to `execute()` as an [`Option<ResolvedCredential>`].
use std::future::Future;
use std::pin::Pin;
use serde::{Deserialize, Serialize};
// ─── Credential ─────────────────────────────────────────────────────────────
/// A secret value with type information for tool authentication.
#[derive(Clone, Serialize, Deserialize)]
#[serde(tag = "type")]
pub enum Credential {
/// A single secret API key string.
ApiKey {
/// The API key value.
key: String,
},
/// A bearer token with optional expiry.
Bearer {
/// The bearer token value.
token: String,
/// When the token expires (if known).
#[serde(default)]
expires_at: Option<chrono::DateTime<chrono::Utc>>,
},
/// A full `OAuth2` token set with refresh capability.
OAuth2 {
/// The current access token.
access_token: String,
/// Optional refresh token for automatic renewal.
refresh_token: Option<String>,
/// When the access token expires (if known).
expires_at: Option<chrono::DateTime<chrono::Utc>>,
/// Token endpoint URL for refresh requests.
token_url: String,
/// `OAuth2` client identifier.
client_id: String,
/// `OAuth2` client secret (optional for public clients).
client_secret: Option<String>,
/// Requested scopes.
#[serde(default)]
scopes: Vec<String>,
},
}
impl std::fmt::Debug for Credential {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Self::ApiKey { .. } => f
.debug_struct("Credential::ApiKey")
.field("key", &"[REDACTED]")
.finish(),
Self::Bearer { expires_at, .. } => f
.debug_struct("Credential::Bearer")
.field("token", &"[REDACTED]")
.field("expires_at", expires_at)
.finish(),
Self::OAuth2 {
expires_at,
token_url,
client_id,
scopes,
..
} => f
.debug_struct("Credential::OAuth2")
.field("access_token", &"[REDACTED]")
.field("refresh_token", &"[REDACTED]")
.field("expires_at", expires_at)
.field("token_url", token_url)
.field("client_id", client_id)
.field("client_secret", &"[REDACTED]")
.field("scopes", scopes)
.finish(),
}
}
}
impl Credential {
/// Returns the [`CredentialType`] discriminant for this credential.
#[must_use]
pub const fn credential_type(&self) -> CredentialType {
match self {
Self::ApiKey { .. } => CredentialType::ApiKey,
Self::Bearer { .. } => CredentialType::Bearer,
Self::OAuth2 { .. } => CredentialType::OAuth2,
}
}
}
// ─── ResolvedCredential ─────────────────────────────────────────────────────
/// Minimal secret value delivered to a tool after credential resolution.
///
/// Does NOT contain refresh tokens, client secrets, or token endpoints.
/// Tools receive only the secret they need for the authenticated request.
#[derive(Clone)]
pub enum ResolvedCredential {
/// A resolved API key.
ApiKey(String),
/// A resolved bearer token.
Bearer(String),
/// A resolved (possibly refreshed) `OAuth2` access token.
OAuth2AccessToken(String),
}
impl std::fmt::Debug for ResolvedCredential {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Self::ApiKey(_) => f
.debug_tuple("ResolvedCredential::ApiKey")
.field(&"[REDACTED]")
.finish(),
Self::Bearer(_) => f
.debug_tuple("ResolvedCredential::Bearer")
.field(&"[REDACTED]")
.finish(),
Self::OAuth2AccessToken(_) => f
.debug_tuple("ResolvedCredential::OAuth2AccessToken")
.field(&"[REDACTED]")
.finish(),
}
}
}
// ─── AuthConfig ─────────────────────────────────────────────────────────────
/// Per-tool declaration of authentication requirements.
///
/// Returned by [`AgentTool::auth_config()`](crate::AgentTool::auth_config) to
/// declare that a tool needs credentials resolved before execution.
#[derive(Debug, Clone)]
pub struct AuthConfig {
/// Key to look up in the credential store.
pub credential_key: String,
/// How to attach the credential to the outbound request.
pub auth_scheme: AuthScheme,
/// Expected credential type (for mismatch checking).
pub credential_type: CredentialType,
}
// ─── AuthScheme ─────────────────────────────────────────────────────────────
/// How a resolved credential is attached to the outbound request.
#[derive(Debug, Clone)]
pub enum AuthScheme {
/// `Authorization: Bearer {token}`
BearerHeader,
/// `{header_name}: {key}`
ApiKeyHeader(String),
/// `?{param_name}={key}`
ApiKeyQuery(String),
}
// ─── CredentialType ─────────────────────────────────────────────────────────
/// Credential type discriminant for mismatch checking (FR-018).
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum CredentialType {
/// Expects an API key credential.
ApiKey,
/// Expects a bearer token.
Bearer,
/// Expects an `OAuth2` token set.
OAuth2,
}
// ─── CredentialError ────────────────────────────────────────────────────────
/// Errors from credential resolution.
///
/// All variants include the credential key for diagnostics but NEVER include
/// secret values (FR-016).
#[derive(Debug, thiserror::Error)]
pub enum CredentialError {
/// Credential not found in the store.
#[error("credential not found: {key}")]
NotFound {
/// The credential key that was looked up.
key: String,
},
/// Credential has expired and cannot be refreshed.
#[error("credential expired: {key}")]
Expired {
/// The credential key that expired.
key: String,
},
/// `OAuth2` token refresh failed.
#[error("credential refresh failed for {key}: {reason}")]
RefreshFailed {
/// The credential key whose refresh failed.
key: String,
/// Human-readable reason (no secrets).
reason: String,
},
/// Credential type doesn't match what the tool expects.
#[error("credential type mismatch for {key}: expected {expected:?}, got {actual:?}")]
TypeMismatch {
/// The credential key.
key: String,
/// The type the tool declared.
expected: CredentialType,
/// The type found in the store.
actual: CredentialType,
},
/// Generic credential store error.
#[error("credential store error: {0}")]
StoreError(Box<dyn std::error::Error + Send + Sync>),
/// Credential resolution timed out.
#[error("credential resolution timed out for {key}")]
Timeout {
/// The credential key.
key: String,
},
}
impl Clone for CredentialError {
fn clone(&self) -> Self {
match self {
Self::NotFound { key } => Self::NotFound { key: key.clone() },
Self::Expired { key } => Self::Expired { key: key.clone() },
Self::RefreshFailed { key, reason } => Self::RefreshFailed {
key: key.clone(),
reason: reason.clone(),
},
Self::TypeMismatch {
key,
expected,
actual,
} => Self::TypeMismatch {
key: key.clone(),
expected: *expected,
actual: *actual,
},
Self::StoreError(error) => {
Self::StoreError(Box::new(std::io::Error::other(error.to_string())))
}
Self::Timeout { key } => Self::Timeout { key: key.clone() },
}
}
}
/// Boxed async result used by credential traits.
pub type CredentialFuture<'a, T> =
Pin<Box<dyn Future<Output = Result<T, CredentialError>> + Send + 'a>>;
// ─── CredentialStore trait ──────────────────────────────────────────────────
/// Pluggable credential storage abstraction.
///
/// Thread-safe for concurrent tool executions. Implementations must be
/// `Send + Sync` to allow sharing across `tokio::spawn` boundaries.
pub trait CredentialStore: Send + Sync {
/// Retrieve a credential by key.
fn get(&self, key: &str) -> CredentialFuture<'_, Option<Credential>>;
/// Store or update a credential by key.
fn set(&self, key: &str, credential: Credential) -> CredentialFuture<'_, ()>;
/// Delete a credential by key.
fn delete(&self, key: &str) -> CredentialFuture<'_, ()>;
}
// ─── CredentialResolver trait ───────────────────────────────────────────────
/// Orchestrator for credential resolution — checks validity, triggers
/// refresh, deduplicates concurrent requests.
pub trait CredentialResolver: Send + Sync {
/// Resolve a credential by key. Returns the minimal secret value
/// needed for the authenticated request.
fn resolve(&self, key: &str) -> CredentialFuture<'_, ResolvedCredential>;
}
// ─── Tests ──────────────────────────────────────────────────────────────────
#[cfg(test)]
mod tests {
use super::*;
// T023: Credential serde roundtrip
#[test]
fn credential_serde_roundtrip_api_key() {
let cred = Credential::ApiKey {
key: "sk-test-123".into(),
};
let json = serde_json::to_string(&cred).unwrap();
let decoded: Credential = serde_json::from_str(&json).unwrap();
match decoded {
Credential::ApiKey { key } => assert_eq!(key, "sk-test-123"),
other => panic!("expected ApiKey, got {other:?}"),
}
}
#[test]
fn credential_serde_roundtrip_bearer() {
let cred = Credential::Bearer {
token: "tok-abc".into(),
expires_at: Some(chrono::Utc::now()),
};
let json = serde_json::to_string(&cred).unwrap();
let decoded: Credential = serde_json::from_str(&json).unwrap();
match decoded {
Credential::Bearer { token, expires_at } => {
assert_eq!(token, "tok-abc");
assert!(expires_at.is_some());
}
other => panic!("expected Bearer, got {other:?}"),
}
}
#[test]
fn credential_serde_roundtrip_oauth2() {
let cred = Credential::OAuth2 {
access_token: "access-123".into(),
refresh_token: Some("refresh-456".into()),
expires_at: None,
token_url: "https://auth.example.com/token".into(),
client_id: "client-1".into(),
client_secret: Some("secret".into()),
scopes: vec!["read".into(), "write".into()],
};
let json = serde_json::to_string(&cred).unwrap();
let decoded: Credential = serde_json::from_str(&json).unwrap();
match decoded {
Credential::OAuth2 {
access_token,
refresh_token,
client_id,
scopes,
..
} => {
assert_eq!(access_token, "access-123");
assert_eq!(refresh_token.as_deref(), Some("refresh-456"));
assert_eq!(client_id, "client-1");
assert_eq!(scopes, vec!["read", "write"]);
}
other => panic!("expected OAuth2, got {other:?}"),
}
}
// T024: CredentialError Display contains no secrets
#[test]
fn credential_error_display_no_secrets() {
let errors = vec![
CredentialError::NotFound {
key: "my-key".into(),
},
CredentialError::Expired {
key: "my-key".into(),
},
CredentialError::RefreshFailed {
key: "my-key".into(),
reason: "bad response".into(),
},
CredentialError::TypeMismatch {
key: "my-key".into(),
expected: CredentialType::Bearer,
actual: CredentialType::ApiKey,
},
CredentialError::Timeout {
key: "my-key".into(),
},
];
let secret_values = [
"sk-test-123",
"tok-abc",
"access-123",
"refresh-456",
"secret",
];
for err in &errors {
let display = format!("{err}");
for secret in &secret_values {
assert!(
!display.contains(secret),
"Display of {err:?} leaks secret {secret}"
);
}
// Should contain the key name for diagnostics
assert!(
display.contains("my-key"),
"Display of {err:?} should contain key name"
);
}
}
// T011: credential_type helper
#[test]
fn credential_type_helper() {
let api_key = Credential::ApiKey { key: "k".into() };
assert_eq!(api_key.credential_type(), CredentialType::ApiKey);
let bearer = Credential::Bearer {
token: "t".into(),
expires_at: None,
};
assert_eq!(bearer.credential_type(), CredentialType::Bearer);
let oauth2 = Credential::OAuth2 {
access_token: "a".into(),
refresh_token: None,
expires_at: None,
token_url: "https://example.com/token".into(),
client_id: "c".into(),
client_secret: None,
scopes: vec![],
};
assert_eq!(oauth2.credential_type(), CredentialType::OAuth2);
}
// T023 additional: Debug impl redacts secrets
#[test]
fn debug_impl_redacts_secrets() {
let cred = Credential::ApiKey {
key: "super-secret".into(),
};
let debug = format!("{cred:?}");
assert!(!debug.contains("super-secret"), "Debug leaks secret");
assert!(debug.contains("[REDACTED]"));
let resolved = ResolvedCredential::ApiKey("my-secret".into());
let debug = format!("{resolved:?}");
assert!(!debug.contains("my-secret"), "Debug leaks secret");
assert!(debug.contains("[REDACTED]"));
}
}