kleos-cred 1.7.2

Credential management CLI with encrypted vault and YubiKey support
Documentation
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
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
//! File-backed agent-key store for the bootstrap-bearer endpoint.
//!
//! These tokens are NOT the DB-backed `cred_agent_keys` rows used by the
//! three-tier resolve handlers; they live in a JSON file (default
//! `$XDG_CONFIG_HOME/cred/agent-keys.json`, mode 0600) so a fresh shell can
//! read them at login before any process has unlocked the cred DB.
//!
//! Each token grants a list of scopes. Bootstrap-bearer scope strings look
//! like `bootstrap/<agent-slot>`; only tokens with the matching scope can
//! call `/bootstrap/kleos-bearer?agent=<slot>`.
//!
//! Path is overridable via `CREDD_AGENT_KEYS_FILE` env (used by tests and
//! atypical installations).

use std::collections::HashMap;
use std::path::PathBuf;

use anyhow::{Context, Result};
use chrono::{DateTime, Utc};
use rand::rngs::OsRng;
use rand::TryRngCore;
use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};
use subtle::ConstantTimeEq;
use tracing::{debug, info, warn};

/// One scoped bootstrap-agent token. On-disk form stores only a SHA-256
/// hash of the bearer token -- the plaintext is returned exactly once at
/// generation time and never persisted.
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct FileAgentKey {
    /// Stable agent identifier (e.g. `<agent-name>-<host>`).
    pub id: String,
    /// SHA-256 hex digest of the bearer token. Legacy files may still carry
    /// a plaintext value under the `"key"` JSON name; auto-migration on
    /// load hashes those and flips `key_hashed` to true.
    #[serde(alias = "key")]
    pub key_hash: String,
    pub created_at: DateTime<Utc>,
    pub last_used: Option<DateTime<Utc>>,
    pub revoked: bool,
    #[serde(default)]
    pub description: String,
    /// Scopes the token grants. Each string is `service/key` (e.g.
    /// `bootstrap/<agent-id>`), `service/*`, or `*` for full access.
    #[serde(default)]
    pub scopes: Vec<String>,
    /// Whether `key_hash` is a SHA-256 digest (true) or a legacy plaintext
    /// token (false). Defaults to false for backward compat; auto-migration
    /// on load hashes any un-migrated keys.
    #[serde(default)]
    pub key_hashed: bool,
}

/// On-disk JSON shape: `{ "keys": { "<agent-id>": FileAgentKey, ... } }`.
#[derive(Debug, Default, Serialize, Deserialize)]
pub struct FileAgentKeyStore {
    #[serde(default)]
    pub keys: HashMap<String, FileAgentKey>,
    #[serde(skip)]
    path: PathBuf,
}

impl FileAgentKeyStore {
    /// Load from the resolved default path (env override, then XDG default).
    pub fn load() -> Result<Self> {
        Self::load_from(default_path())
    }

    /// Load from an explicit path. Empty store if the file is absent.
    /// A corrupted JSON file logs a warning and returns an empty store --
    /// credd starts cleanly so the operator can `cred agent-key generate`
    /// fresh tokens, rather than refusing to boot.
    pub fn load_from(path: PathBuf) -> Result<Self> {
        if !path.exists() {
            info!(
                "no agent-keys.json at {} -- starting with empty store",
                path.display()
            );
            return Ok(Self {
                keys: HashMap::new(),
                path,
            });
        }
        let content = std::fs::read_to_string(&path)
            .with_context(|| format!("failed to read {}", path.display()))?;
        match serde_json::from_str::<FileAgentKeyStore>(&content) {
            Ok(mut store) => {
                store.path = path;
                // Auto-migrate legacy plaintext tokens to SHA-256 hashes.
                let mut migrated = 0usize;
                for entry in store.keys.values_mut() {
                    if !entry.key_hashed {
                        let hash = Sha256::digest(entry.key_hash.as_bytes());
                        entry.key_hash = hex::encode(hash);
                        entry.key_hashed = true;
                        migrated += 1;
                    }
                }
                if migrated > 0 {
                    info!("migrated {} plaintext agent key(s) to hash-only", migrated);
                    if let Err(e) = store.save() {
                        warn!("failed to persist hash migration: {}", e);
                    }
                }
                info!("loaded {} bootstrap-agent key(s)", store.keys.len());
                Ok(store)
            }
            Err(e) => {
                warn!(
                    "agent-keys.json at {} is corrupted ({}); starting with empty store",
                    path.display(),
                    e
                );
                Ok(Self {
                    keys: HashMap::new(),
                    path,
                })
            }
        }
    }

    /// Atomic save: write to `<path>.tmp.<pid>` then rename. Mode 0600.
    pub fn save(&self) -> Result<()> {
        let dir = self
            .path
            .parent()
            .context("agent-keys path has no parent directory")?;
        std::fs::create_dir_all(dir)
            .with_context(|| format!("failed to create {}", dir.display()))?;

        let tmp = self
            .path
            .with_extension(format!("tmp.{}", std::process::id()));
        let json = serde_json::to_string_pretty(&self)?;
        std::fs::write(&tmp, json).with_context(|| format!("failed to write {}", tmp.display()))?;

        #[cfg(unix)]
        {
            use std::os::unix::fs::PermissionsExt;
            std::fs::set_permissions(&tmp, std::fs::Permissions::from_mode(0o600))
                .with_context(|| format!("failed to chmod 600 {}", tmp.display()))?;
        }

        std::fs::rename(&tmp, &self.path).with_context(|| {
            format!(
                "failed to rename {} -> {}",
                tmp.display(),
                self.path.display()
            )
        })?;

        debug!(
            "saved {} bootstrap-agent key(s) to {}",
            self.keys.len(),
            self.path.display()
        );
        Ok(())
    }

    /// Mint a new token. Returns the bare 64-char hex string (only chance
    /// to capture it; we store it for validation but don't surface it again).
    pub fn generate(
        &mut self,
        agent_id: &str,
        description: &str,
        scopes: Vec<String>,
    ) -> Result<String> {
        validate_agent_id(agent_id)?;
        for s in &scopes {
            validate_scope(s)?;
        }

        if let Some(existing) = self.keys.get(agent_id) {
            if !existing.revoked {
                anyhow::bail!(
                    "agent key '{}' already exists and is active; revoke it first",
                    agent_id
                );
            }
            warn!("replacing revoked key for '{}'", agent_id);
        }

        let mut bytes = [0u8; 32];
        OsRng
            .try_fill_bytes(&mut bytes)
            .expect("OS CSPRNG must be available");
        let key_hex = hex::encode(bytes);

        // Store only the SHA-256 hash; the plaintext is returned to the
        // caller exactly once and never persisted.
        let hash = Sha256::digest(key_hex.as_bytes());
        let key_hash = hex::encode(hash);

        let entry = FileAgentKey {
            id: agent_id.to_string(),
            key_hash,
            created_at: Utc::now(),
            last_used: None,
            revoked: false,
            description: description.to_string(),
            scopes,
            key_hashed: true,
        };
        self.keys.insert(agent_id.to_string(), entry);
        self.save()?;
        info!("minted bootstrap-agent key for '{}'", agent_id);
        Ok(key_hex)
    }

    /// Constant-time validation. Hashes the incoming bearer with SHA-256
    /// and compares against stored key_hash. Returns the agent id on match.
    pub fn validate(&self, bearer: &str) -> Option<String> {
        let token = bearer.trim();
        if token.is_empty() {
            return None;
        }
        let token_hash = hex::encode(Sha256::digest(token.as_bytes()));
        for (id, entry) in &self.keys {
            if entry.revoked {
                continue;
            }
            if token_hash
                .as_bytes()
                .ct_eq(entry.key_hash.as_bytes())
                .unwrap_u8()
                == 1
            {
                return Some(id.clone());
            }
        }
        None
    }

    /// Update the `last_used` timestamp. Best-effort save.
    pub fn touch(&mut self, agent_id: &str) {
        if let Some(entry) = self.keys.get_mut(agent_id) {
            entry.last_used = Some(Utc::now());
            if let Err(e) = self.save() {
                warn!("failed to persist last_used for '{}': {}", agent_id, e);
            }
        }
    }

    /// Mark a key revoked. Future validate() calls reject it.
    pub fn revoke(&mut self, agent_id: &str) -> Result<()> {
        let entry = self
            .keys
            .get_mut(agent_id)
            .ok_or_else(|| anyhow::anyhow!("agent key '{}' not found", agent_id))?;
        if entry.revoked {
            anyhow::bail!("agent key '{}' is already revoked", agent_id);
        }
        entry.revoked = true;
        self.save()?;
        info!("revoked bootstrap-agent key for '{}'", agent_id);
        Ok(())
    }

    /// Check whether the given agent has a scope covering `service/key`.
    /// Wildcard rules: exact match, `service/*`, or `*`.
    pub fn has_scope(&self, agent_id: &str, service: &str, key: &str) -> bool {
        let entry = match self.keys.get(agent_id) {
            Some(e) if !e.revoked => e,
            _ => return false,
        };
        let exact = format!("{}/{}", service, key);
        let wildcard = format!("{}/*", service);
        entry
            .scopes
            .iter()
            .any(|s| s == &exact || s == &wildcard || s == "*")
    }

    /// Get scopes for an agent (used to enrich AuthInfo::BootstrapAgent).
    pub fn scopes_for(&self, agent_id: &str) -> Vec<String> {
        self.keys
            .get(agent_id)
            .map(|k| k.scopes.clone())
            .unwrap_or_default()
    }

    pub fn list(&self) -> Vec<&FileAgentKey> {
        let mut keys: Vec<&FileAgentKey> = self.keys.values().collect();
        keys.sort_by_key(|a| a.created_at);
        keys
    }
}

/// Resolve the agent-keys.json path. `CREDD_AGENT_KEYS_FILE` env wins;
/// otherwise `$XDG_CONFIG_HOME/cred/agent-keys.json` (XDG-resolved).
pub fn default_path() -> PathBuf {
    if let Ok(p) = std::env::var("CREDD_AGENT_KEYS_FILE") {
        return PathBuf::from(p);
    }
    let base = std::env::var("XDG_CONFIG_HOME")
        .map(PathBuf::from)
        .unwrap_or_else(|_| {
            std::env::var("HOME")
                .map(|h| PathBuf::from(h).join(".config"))
                .unwrap_or_else(|_| PathBuf::from("."))
        });
    base.join("cred").join("agent-keys.json")
}

fn validate_agent_id(agent_id: &str) -> Result<()> {
    if agent_id.is_empty() {
        anyhow::bail!("agent_id cannot be empty");
    }
    if !agent_id
        .chars()
        .all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_')
    {
        anyhow::bail!(
            "agent_id '{}' must be ascii alphanumeric, hyphens, or underscores only",
            agent_id
        );
    }
    Ok(())
}

fn validate_scope(scope: &str) -> Result<()> {
    if scope == "*" {
        return Ok(());
    }
    let parts: Vec<&str> = scope.splitn(2, '/').collect();
    if parts.len() != 2 || parts[0].is_empty() || parts[1].is_empty() {
        anyhow::bail!(
            "invalid scope '{}': must be '*', 'service/*', or 'service/key'",
            scope
        );
    }
    let valid_byte = |b: u8| b.is_ascii_alphanumeric() || b == b'-' || b == b'_' || b == b'.';
    if !parts[0].bytes().all(valid_byte) {
        anyhow::bail!(
            "invalid scope '{}': service name has invalid characters",
            scope
        );
    }
    if parts[1] != "*" && !parts[1].bytes().all(valid_byte) {
        anyhow::bail!("invalid scope '{}': key name has invalid characters", scope);
    }
    Ok(())
}

#[cfg(test)]
mod tests {
    use super::*;
    use std::sync::Mutex;

    static ENV_GUARD: Mutex<()> = Mutex::new(());

    #[test]
    fn generate_validate_roundtrip() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let mut store = FileAgentKeyStore::load_from(path.clone()).unwrap();

        let token = store
            .generate(
                "test-agent-1",
                "test",
                vec!["bootstrap/test-agent-1".into()],
            )
            .unwrap();
        assert_eq!(token.len(), 64);

        let validated = store.validate(&token).expect("must validate");
        assert_eq!(validated, "test-agent-1");

        // Reload from disk -- atomic write should produce a parseable file.
        let reloaded = FileAgentKeyStore::load_from(path).unwrap();
        assert!(reloaded.has_scope("test-agent-1", "bootstrap", "test-agent-1"));
    }

    #[test]
    fn revoked_token_rejected() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let mut store = FileAgentKeyStore::load_from(path).unwrap();
        let token = store
            .generate("agent-x", "", vec!["bootstrap/agent-x".into()])
            .unwrap();
        store.revoke("agent-x").unwrap();
        assert_eq!(store.validate(&token), None);
    }

    #[test]
    fn scope_wildcards() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let mut store = FileAgentKeyStore::load_from(path).unwrap();
        store
            .generate(
                "agent-y",
                "",
                vec!["bootstrap/*".into(), "engram-rust/foo".into()],
            )
            .unwrap();
        assert!(store.has_scope("agent-y", "bootstrap", "anything"));
        assert!(store.has_scope("agent-y", "engram-rust", "foo"));
        assert!(!store.has_scope("agent-y", "engram-rust", "bar"));
    }

    #[test]
    fn invalid_scope_rejected() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let mut store = FileAgentKeyStore::load_from(path).unwrap();
        let r = store.generate("z", "", vec!["bad scope with spaces".into()]);
        assert!(r.is_err());
    }

    #[cfg(unix)]
    #[test]
    fn save_sets_mode_0600() {
        use std::os::unix::fs::PermissionsExt;
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let mut store = FileAgentKeyStore::load_from(path.clone()).unwrap();
        store
            .generate(
                "perm-test-agent",
                "perm test",
                vec!["bootstrap/perm-test-agent".into()],
            )
            .unwrap();
        let metadata = std::fs::metadata(&path).unwrap();
        let mode = metadata.permissions().mode() & 0o777;
        assert_eq!(
            mode, 0o600,
            "agent-keys.json must be mode 0600, got {:#o}",
            mode
        );
    }

    #[test]
    fn load_from_missing_path_returns_empty_store() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("nonexistent-keys.json");
        let store = FileAgentKeyStore::load_from(path).unwrap();
        assert!(store.keys.is_empty());
    }

    #[test]
    fn load_from_corrupted_json_returns_empty_store() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("corrupt.json");
        std::fs::write(&path, b"this is not valid json {{{{").unwrap();
        let store = FileAgentKeyStore::load_from(path).unwrap();
        assert!(store.keys.is_empty());
    }

    #[test]
    fn duplicate_active_key_rejected() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let mut store = FileAgentKeyStore::load_from(path).unwrap();
        store
            .generate("dup-agent", "first", vec!["bootstrap/dup-agent".into()])
            .unwrap();
        let r = store.generate("dup-agent", "second", vec!["bootstrap/dup-agent".into()]);
        assert!(
            r.is_err(),
            "generating a second active key for the same id must fail"
        );
    }

    #[test]
    fn revoke_nonexistent_key_errors() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let mut store = FileAgentKeyStore::load_from(path).unwrap();
        let r = store.revoke("ghost-agent");
        assert!(r.is_err());
    }

    #[test]
    fn validate_empty_bearer_returns_none() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let store = FileAgentKeyStore::load_from(path).unwrap();
        assert_eq!(store.validate(""), None);
        assert_eq!(store.validate("   "), None);
    }

    #[test]
    fn invalid_agent_id_rejected() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let mut store = FileAgentKeyStore::load_from(path).unwrap();
        // Spaces not allowed in agent_id
        let r = store.generate("bad agent id", "desc", vec!["bootstrap/bad".into()]);
        assert!(r.is_err());
        // Empty agent_id not allowed
        let r2 = store.generate("", "desc", vec!["bootstrap/x".into()]);
        assert!(r2.is_err());
    }

    #[test]
    fn on_disk_file_contains_no_plaintext_token() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let mut store = FileAgentKeyStore::load_from(path.clone()).unwrap();

        let token = store
            .generate("disk-check", "test", vec!["bootstrap/disk-check".into()])
            .unwrap();

        let on_disk = std::fs::read_to_string(&path).unwrap();
        assert!(
            !on_disk.contains(&token),
            "on-disk file must NOT contain the plaintext token"
        );
        assert!(
            on_disk.contains("key_hashed"),
            "on-disk file must contain key_hashed flag"
        );
    }

    #[test]
    fn legacy_plaintext_auto_migrated() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");

        // Write a legacy-format file with plaintext key and no key_hashed flag.
        let legacy_token = "a".repeat(64);
        let legacy_json = serde_json::json!({
            "keys": {
                "legacy-agent": {
                    "id": "legacy-agent",
                    "key": legacy_token,
                    "created_at": "2025-01-01T00:00:00Z",
                    "last_used": null,
                    "revoked": false,
                    "description": "legacy",
                    "scopes": ["bootstrap/legacy-agent"]
                }
            }
        });
        std::fs::write(&path, serde_json::to_string_pretty(&legacy_json).unwrap()).unwrap();

        // Load triggers auto-migration.
        let store = FileAgentKeyStore::load_from(path.clone()).unwrap();
        let entry = store.keys.get("legacy-agent").unwrap();
        assert!(entry.key_hashed, "legacy key must be auto-migrated");
        assert_ne!(
            entry.key_hash, legacy_token,
            "hash must differ from plaintext"
        );

        // The original plaintext token must still validate (hashed on both sides).
        assert_eq!(
            store.validate(&legacy_token),
            Some("legacy-agent".to_string()),
            "legacy token must validate after migration"
        );

        // On-disk file must not contain the plaintext.
        let on_disk = std::fs::read_to_string(&path).unwrap();
        assert!(
            !on_disk.contains(&legacy_token),
            "migrated file must not contain plaintext"
        );
    }

    #[test]
    fn global_wildcard_scope_grants_all() {
        let _g = ENV_GUARD.lock().unwrap_or_else(|p| p.into_inner());
        let dir = tempfile::tempdir().unwrap();
        let path = dir.path().join("agent-keys.json");
        let mut store = FileAgentKeyStore::load_from(path).unwrap();
        store
            .generate("superuser-agent", "admin", vec!["*".into()])
            .unwrap();
        assert!(store.has_scope("superuser-agent", "any-service", "any-key"));
        assert!(store.has_scope("superuser-agent", "bootstrap", "something"));
    }
}