dotlock-bin 1.2.0

Encrypted project-local environment variables manager
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
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
use std::{collections::HashMap, path::Path};

use uuid::Uuid;

use crate::{
    crypto::{
        AccessMode, AuthorizedSigner, VaultKeyMetadata, VaultRecipient,
        dek::generate_dek,
        integrity::seal_vault_metadata,
        share::{
            RECIPIENT_ALG_X25519, encode_public_key_b64, fingerprint_public_key,
            recipient_alg_for_public_key, sign_recipient_grant, verify_recipient_grant,
            wrap_dek_for_public_key, wrap_dek_for_public_key_b64,
        },
        update_master_password_metadata,
    },
    domain::{error::DotLockError, keys::ProjectKey, model::DotLockResult},
    storage::{
        identity::LocalIdentity,
        vault_file::{
            RatchetSummary, load_vault_metadata, record_vault_write, rotate_project_key_wrapping,
        },
        vault_txn::{VaultPairWrite, commit_vault_pair},
    },
};

/// Metadata-only write funnel for shared-access mutations: records the write,
/// reseals the metadata MAC/epoch under `dek` (M2+M3), and commits through
/// the same transactional path as every other vault mutation.
fn seal_and_commit_metadata(
    vault_path: &str,
    metadata: &mut VaultKeyMetadata,
    dek: &ProjectKey,
) -> DotLockResult<()> {
    record_vault_write(metadata);
    seal_vault_metadata(metadata, dek)?;
    let vault = Path::new(vault_path);
    let secrets = vault
        .parent()
        .filter(|parent| !parent.as_os_str().is_empty())
        .map(|parent| parent.join("secrets.lock"))
        .unwrap_or_else(|| std::path::PathBuf::from("secrets.lock"));
    commit_vault_pair(
        vault,
        &secrets,
        VaultPairWrite {
            metadata,
            secrets_lock_bytes: None,
        },
    )
}

/// Canonical payload signed by an authorized signer to authorize a recipient
/// grant (H3): binds the recipient's identity to this project and to the
/// granting authority. Wrapped key material is intentionally excluded — it is
/// rewrapped on every rotation without changing WHO is authorized.
/// Length-prefixed encoding, so no field combination is ambiguous.
pub fn recipient_grant_payload(
    project_uuid: &str,
    public_key_fingerprint: &str,
    public_key_b64: &str,
    signer_fingerprint: &str,
) -> Vec<u8> {
    const DOMAIN: &[u8] = b"dotlock/recipient-grant/v1";
    let mut payload = Vec::new();
    for part in [
        DOMAIN,
        project_uuid.as_bytes(),
        public_key_fingerprint.as_bytes(),
        public_key_b64.as_bytes(),
        signer_fingerprint.as_bytes(),
    ] {
        payload.extend_from_slice(&(part.len() as u64).to_le_bytes());
        payload.extend_from_slice(part);
    }
    payload
}

/// True when `recipient` carries a grant signature that verifies against one
/// of the vault's authorized signers. Unsigned recipients (legacy or
/// injected) never validate.
pub fn recipient_grant_is_valid(
    project_uuid: &str,
    signers: &[AuthorizedSigner],
    recipient: &VaultRecipient,
) -> bool {
    if recipient.grant_signature_b64.is_empty() || recipient.grant_signer_fingerprint.is_empty() {
        return false;
    }
    let Some(signer) = signers
        .iter()
        .find(|signer| signer.fingerprint == recipient.grant_signer_fingerprint)
    else {
        return false;
    };
    let payload = recipient_grant_payload(
        project_uuid,
        &recipient.public_key_fingerprint,
        &recipient.public_key_b64,
        &signer.fingerprint,
    );
    verify_recipient_grant(
        &payload,
        &recipient.grant_signature_b64,
        &signer.public_key_b64,
    )
    .is_ok()
}

/// Registers `signer` as an authorized grant signer. Only reachable from code
/// paths that already proved master-password/full-project-key authority.
fn ensure_authorized_signer(
    metadata: &mut VaultKeyMetadata,
    signer: &LocalIdentity,
) -> DotLockResult<()> {
    if metadata
        .authorized_signers
        .iter()
        .any(|existing| existing.fingerprint == signer.fingerprint)
    {
        return Ok(());
    }
    metadata.authorized_signers.push(AuthorizedSigner {
        fingerprint: signer.fingerprint.clone(),
        public_key_b64: encode_public_key_b64(&signer.public_key_pem)?,
        label: String::new(),
    });
    Ok(())
}

/// Migration/bless path: re-signs every recipient whose grant does not verify
/// (vaults that predate signed grants) under `signer`, registering `signer`
/// as an authorized signer. Callers must have proven master-password/full-key
/// authority. Returns how many recipients were blessed.
pub fn bless_recipient_grants(
    metadata: &mut VaultKeyMetadata,
    signer: &LocalIdentity,
) -> DotLockResult<usize> {
    ensure_authorized_signer(metadata, signer)?;
    let project_uuid = metadata.project_uuid.clone();
    let signers = metadata.authorized_signers.clone();
    let mut blessed = 0usize;
    for recipient in &mut metadata.recipients {
        if recipient_grant_is_valid(&project_uuid, &signers, recipient) {
            continue;
        }
        let payload = recipient_grant_payload(
            &project_uuid,
            &recipient.public_key_fingerprint,
            &recipient.public_key_b64,
            &signer.fingerprint,
        );
        recipient.grant_signature_b64 = sign_recipient_grant(&payload, &signer.private_key_pem)?;
        recipient.grant_signer_fingerprint = signer.fingerprint.clone();
        blessed += 1;
    }
    Ok(blessed)
}

/// RSA-exit migration (ADR 0001): rewrites the recipient entry identified by
/// `old_fingerprint` to the caller's NEW (Ed25519) identity — new
/// public key/fingerprint/alg, project key rewrapped as an X25519 sealed box,
/// per-secret SDKs rewrapped, and the grant re-signed by the new identity —
/// then reseals the metadata MAC and commits transactionally. Only reachable
/// with a proven project key (`dek`), i.e. full-access authority: the same
/// authority every `authorized_signers` mutation already requires. Other
/// recipients are untouched, so mixed RSA/X25519 vaults keep working during a
/// team's transition window.
pub fn migrate_recipient_identity(
    vault_path: &str,
    metadata: &mut VaultKeyMetadata,
    old_fingerprint: &str,
    new_identity: &LocalIdentity,
    dek: &ProjectKey,
) -> DotLockResult<VaultRecipient> {
    let position = metadata
        .recipients
        .iter()
        .position(|recipient| recipient.public_key_fingerprint == old_fingerprint)
        .ok_or_else(|| DotLockError::RecipientNotFound {
            query: old_fingerprint.to_string(),
        })?;

    let new_fingerprint = fingerprint_public_key(&new_identity.public_key_pem)?;
    let public_key_b64 = encode_public_key_b64(&new_identity.public_key_pem)?;
    let wrapped_dek_b64 = if metadata.recipients[position].wrapped_dek_b64.is_empty() {
        String::new()
    } else {
        wrap_dek_for_public_key(dek.as_bytes(), &new_identity.public_key_pem)?
    };
    // Rewrap this recipient's per-secret SDKs under the new key (sourced from
    // the canonical DEK wrappings, which the caller just proved they hold).
    let allowed_ids: Vec<String> = metadata.recipients[position]
        .wrapped_sdks
        .keys()
        .cloned()
        .collect();
    let wrapped_sdks = wrap_allowed_sdks(
        metadata,
        &new_identity.public_key_pem,
        dek,
        Some(&allowed_ids),
    )?;

    // The migrating user proved full-key authority, so they become an
    // authorized signer (exactly like a granting owner) and re-sign their own
    // grant under the new key.
    ensure_authorized_signer(metadata, new_identity)?;
    let payload = recipient_grant_payload(
        &metadata.project_uuid,
        &new_fingerprint,
        &public_key_b64,
        &new_identity.fingerprint,
    );
    let grant_signature_b64 = sign_recipient_grant(&payload, &new_identity.private_key_pem)?;

    let recipient = &mut metadata.recipients[position];
    recipient.public_key_fingerprint = new_fingerprint;
    recipient.public_key_b64 = public_key_b64;
    recipient.alg = RECIPIENT_ALG_X25519.to_string();
    recipient.wrapped_dek_b64 = wrapped_dek_b64;
    recipient.wrapped_sdks = wrapped_sdks;
    recipient.grant_signature_b64 = grant_signature_b64;
    recipient.grant_signer_fingerprint = new_identity.fingerprint.clone();
    let migrated = recipient.clone();

    metadata.version = metadata.version.max(8);
    seal_and_commit_metadata(vault_path, metadata, dek)?;
    Ok(migrated)
}

/// Flips the vault into shared mode. `access_mode` is covered by the metadata
/// MAC (M2), so this now requires a proven project key: callers must unlock
/// with full access first.
pub fn enable_shared_access(
    vault_path: &str,
    metadata: &mut VaultKeyMetadata,
    dek: &ProjectKey,
) -> DotLockResult<bool> {
    let changed = metadata.access_mode != AccessMode::Shared;
    metadata.access_mode = AccessMode::Shared;
    seal_and_commit_metadata(vault_path, metadata, dek)?;
    Ok(changed)
}

pub fn list_recipients(vault_path: &str) -> DotLockResult<Vec<VaultRecipient>> {
    let metadata = load_vault_metadata(vault_path)?;
    Ok(metadata.recipients)
}

/// Legacy unsigned grant, kept for tests exercising pre-signed-grant vaults;
/// the CLI always grants through `grant_recipient_with_secret_ids` with a
/// signing identity (H3).
#[cfg(test)]
pub fn grant_recipient(
    vault_path: &str,
    public_key_pem: &str,
    label: &str,
    dek: &ProjectKey,
) -> DotLockResult<VaultRecipient> {
    let mut metadata = load_vault_metadata(vault_path)?;
    grant_recipient_with_secret_ids(
        vault_path,
        &mut metadata,
        public_key_pem,
        label,
        dek,
        None,
        None,
    )
}

pub fn grant_recipient_with_secret_ids(
    vault_path: &str,
    metadata: &mut VaultKeyMetadata,
    public_key_pem: &str,
    label: &str,
    dek: &ProjectKey,
    allowed_secret_ids: Option<&[String]>,
    signer: Option<&LocalIdentity>,
) -> DotLockResult<VaultRecipient> {
    metadata.access_mode = AccessMode::Shared;

    let fingerprint = fingerprint_public_key(public_key_pem)?;
    let public_key_b64 = encode_public_key_b64(public_key_pem)?;
    // Wrapping algorithm follows the recipient's key type: X25519 sealed box
    // for modern Ed25519 keys, RSA-OAEP only for legacy RSA keys.
    let recipient_alg = recipient_alg_for_public_key(public_key_pem)?;
    if recipient_alg == RECIPIENT_ALG_X25519 {
        metadata.version = metadata.version.max(8);
    }
    let full_access = allowed_secret_ids.is_none();
    let wrapped_dek_b64 = if full_access {
        wrap_dek_for_public_key(dek.as_bytes(), public_key_pem)?
    } else {
        String::new()
    };
    let wrapped_sdks = wrap_allowed_sdks(metadata, public_key_pem, dek, allowed_secret_ids)?;

    // Signed-grant path (H3): the granting identity — which just proved
    // master-password authority to obtain `dek` — becomes an authorized
    // signer, signs this grant, and blesses any legacy unsigned recipients so
    // pre-signed-grant vaults migrate on their first grant.
    let (grant_signature_b64, grant_signer_fingerprint) = match signer {
        Some(signer) => {
            ensure_authorized_signer(metadata, signer)?;
            metadata.version = metadata.version.max(6);
            let payload = recipient_grant_payload(
                &metadata.project_uuid,
                &fingerprint,
                &public_key_b64,
                &signer.fingerprint,
            );
            (
                sign_recipient_grant(&payload, &signer.private_key_pem)?,
                signer.fingerprint.clone(),
            )
        }
        None => (String::new(), String::new()),
    };

    if let Some(existing) = metadata
        .recipients
        .iter_mut()
        .find(|recipient| recipient.public_key_fingerprint == fingerprint)
    {
        existing.label = label.to_string();
        existing.public_key_b64 = public_key_b64;
        existing.wrapped_dek_b64 = wrapped_dek_b64;
        existing.wrapped_sdks = wrapped_sdks;
        existing.full_access = full_access;
        existing.alg = recipient_alg.to_string();
        existing.grant_signature_b64 = grant_signature_b64;
        existing.grant_signer_fingerprint = grant_signer_fingerprint;
        let recipient = existing.clone();
        if let Some(signer) = signer {
            bless_recipient_grants(metadata, signer)?;
        }
        seal_and_commit_metadata(vault_path, metadata, dek)?;
        return Ok(recipient);
    }

    let recipient = VaultRecipient {
        id: Uuid::new_v4().to_string(),
        label: label.to_string(),
        alg: recipient_alg.to_string(),
        public_key_fingerprint: fingerprint,
        public_key_b64,
        wrapped_dek_b64,
        wrapped_sdks,
        full_access,
        grant_signature_b64,
        grant_signer_fingerprint,
    };
    metadata.recipients.push(recipient.clone());
    if let Some(signer) = signer {
        bless_recipient_grants(metadata, signer)?;
    }
    seal_and_commit_metadata(vault_path, metadata, dek)?;

    Ok(recipient)
}

fn wrap_allowed_sdks(
    metadata: &VaultKeyMetadata,
    public_key_pem: &str,
    dek: &ProjectKey,
    allowed_secret_ids: Option<&[String]>,
) -> DotLockResult<HashMap<String, String>> {
    let ids: Vec<String> = match allowed_secret_ids {
        Some(ids) => ids.to_vec(),
        None => metadata.wrapped_sdks_under_dek.keys().cloned().collect(),
    };
    let mut wrapped = HashMap::new();
    for secret_id in ids {
        let Some(project_wrapped_sdk) = metadata.wrapped_sdks_under_dek.get(&secret_id) else {
            continue;
        };
        let sdk = crate::crypto::sdk::unwrap_sdk_with_project_key(project_wrapped_sdk, dek)?;
        wrapped.insert(
            secret_id,
            wrap_dek_for_public_key(sdk.as_bytes(), public_key_pem)?,
        );
    }
    Ok(wrapped)
}

pub fn revoke_recipient_in_memory(
    metadata: &mut VaultKeyMetadata,
    query: &str,
) -> DotLockResult<VaultRecipient> {
    let index = metadata
        .recipients
        .iter()
        .position(|recipient| {
            recipient.id == query
                || recipient.label == query
                || recipient.public_key_fingerprint == query
        })
        .ok_or_else(|| DotLockError::RecipientNotFound {
            query: query.to_string(),
        })?;
    Ok(metadata.recipients.remove(index))
}

/// Outcome of [`revoke_recipient_and_rotate`].
pub struct RevokeOutcome {
    pub removed: VaultRecipient,
    /// The freshly rotated project key. The CLI invalidates the session cache
    /// instead of reusing it; tests use it to verify the vault stays readable.
    #[allow(dead_code)]
    pub new_dek: ProjectKey,
    pub summary: RatchetSummary,
}

/// Revokes a recipient and rotates the project key (DEK) in one transaction.
///
/// The ciphertexts in `secrets.lock` stay under their per-secret SDKs and are
/// untouched; what changes ownership is the *wrapping*: every SDK is unwrapped
/// under the old DEK and rewrapped under a fresh one, the remaining full-access
/// recipients get the fresh DEK wrapped for their public keys, the master
/// password wrapping is refreshed, and the integrity hash is re-encrypted
/// under the fresh DEK — all committed atomically via `commit_vault_pair`.
///
/// Note: revocation cannot remove access to ciphertexts the revoked identity
/// already obtained (e.g. from git history); rotating sensitive values is the
/// only remedy for that.
pub fn revoke_recipient_and_rotate(
    vault_path: &str,
    secrets_path: &str,
    metadata: &mut VaultKeyMetadata,
    query: &str,
    current_dek: &ProjectKey,
    passphrase: &str,
) -> DotLockResult<RevokeOutcome> {
    let removed = revoke_recipient_in_memory(metadata, query)?;

    let new_dek = generate_dek()?;
    // Rewraps every per-secret SDK and every remaining recipient's DEK under
    // the new project key, and re-encrypts `secrets_hash_*` under it, in the
    // same metadata object.
    let summary = rotate_project_key_wrapping(metadata, current_dek, &new_dek)?;
    update_master_password_metadata(metadata, &new_dek, passphrase)?;
    // Reseal under the NEW project key so the MAC and the bumped epoch land
    // in the same transactional commit as the rewrap (M2+M3).
    seal_vault_metadata(metadata, &new_dek)?;

    commit_vault_pair(
        Path::new(vault_path),
        Path::new(secrets_path),
        VaultPairWrite {
            metadata,
            secrets_lock_bytes: None,
        },
    )?;

    Ok(RevokeOutcome {
        removed,
        new_dek,
        summary,
    })
}

pub fn list_recipient_acl(vault_path: &str, query: &str) -> DotLockResult<Vec<String>> {
    let metadata = load_vault_metadata(vault_path)?;
    let recipient = metadata
        .recipients
        .iter()
        .find(|recipient| {
            recipient.id == query
                || recipient.label == query
                || recipient.public_key_fingerprint == query
        })
        .ok_or_else(|| DotLockError::RecipientNotFound {
            query: query.to_string(),
        })?;
    let mut ids = recipient.wrapped_sdks.keys().cloned().collect::<Vec<_>>();
    ids.sort();
    Ok(ids)
}

pub fn add_recipient_secret_ids(
    vault_path: &str,
    metadata: &mut VaultKeyMetadata,
    query: &str,
    secret_ids: &[String],
    dek: &ProjectKey,
) -> DotLockResult<usize> {
    let recipient = metadata
        .recipients
        .iter_mut()
        .find(|recipient| {
            recipient.id == query
                || recipient.label == query
                || recipient.public_key_fingerprint == query
        })
        .ok_or_else(|| DotLockError::RecipientNotFound {
            query: query.to_string(),
        })?;

    let mut added = 0usize;
    for secret_id in secret_ids {
        if recipient.wrapped_sdks.contains_key(secret_id) {
            continue;
        }
        let Some(project_wrapped_sdk) = metadata.wrapped_sdks_under_dek.get(secret_id) else {
            continue;
        };
        let sdk = crate::crypto::sdk::unwrap_sdk_with_project_key(project_wrapped_sdk, dek)?;
        recipient.wrapped_sdks.insert(
            secret_id.clone(),
            wrap_dek_for_public_key_b64(sdk.as_bytes(), &recipient.public_key_b64)?,
        );
        added += 1;
    }
    recipient.full_access = false;
    seal_and_commit_metadata(vault_path, metadata, dek)?;
    Ok(added)
}

pub fn load_public_key_from_file(path: &Path) -> DotLockResult<String> {
    // M5: symlink-safe (O_NOFOLLOW) read; a grant must never be tricked into
    // reading an attacker-chosen key through a planted symlink.
    crate::storage::secure_fs::read_to_string(path)
}

#[cfg(test)]
mod tests {
    use std::{
        fs,
        time::{SystemTime, UNIX_EPOCH},
    };

    use crate::{
        crypto::{
            AccessMode, VaultConfig, VaultKeyMetadata,
            share::{IdentityProtection, generate_identity},
        },
        domain::keys::ProjectKey,
        storage::vault_file::{load_vault_metadata, save_vault_metadata},
    };

    use super::{
        grant_recipient, grant_recipient_with_secret_ids, list_recipients,
        revoke_recipient_and_rotate, revoke_recipient_in_memory,
    };

    fn temp_file(name: &str) -> std::path::PathBuf {
        let unique = SystemTime::now()
            .duration_since(UNIX_EPOCH)
            .expect("time")
            .as_nanos();
        std::env::temp_dir().join(format!("dotlock-{name}-{unique}.toml"))
    }

    fn metadata() -> VaultKeyMetadata {
        VaultKeyMetadata {
            version: 1,
            project_uuid: "project".to_string(),
            project: "dotlock".to_string(),
            environment: "dev".to_string(),
            kdf: "argon2id".to_string(),
            salt_b64: "salt".to_string(),
            memory_kib: 1,
            iterations: 1,
            parallelism: 1,
            kek_version: 1,
            kek_writes_since_rotate: 0,
            wrapped_dek_nonce_b64: "nonce".to_string(),
            wrapped_dek_b64: "wrapped".to_string(),
            wrapped_sdks_under_dek: std::collections::HashMap::new(),
            access_mode: AccessMode::MasterPassword,
            recipients: Vec::new(),
            authorized_signers: Vec::new(),
            config: VaultConfig::default(),
            secrets_hash_nonce_b64: "hash_nonce".to_string(),
            secrets_hash_b64: "hash".to_string(),
            secrets_hash_sha256_b64: "hash_plain".to_string(),
            last_rotated_at: 0,
            vault_epoch: 0,
            metadata_mac_b64: String::new(),
        }
    }

    #[test]
    fn grant_and_revoke_update_recipients() {
        let path = temp_file("shared-access");
        save_vault_metadata(&path, &metadata()).expect("save metadata");
        let identity =
            generate_identity(IdentityProtection::Encrypted("hunter2")).expect("identity");

        let granted = grant_recipient(
            path.to_str().expect("path"),
            &identity.public_key_pem,
            "alice",
            &ProjectKey::new([3u8; 32]),
        )
        .expect("grant");
        let listed = list_recipients(path.to_str().expect("path")).expect("list");

        assert_eq!(listed.len(), 1);
        assert_eq!(listed[0].label, "alice");
        assert_eq!(
            listed[0].public_key_fingerprint,
            granted.public_key_fingerprint
        );

        let mut metadata = load_vault_metadata(path.to_str().expect("path")).expect("load vault");
        let removed = revoke_recipient_in_memory(&mut metadata, "alice").expect("revoke");
        save_vault_metadata(path.to_str().expect("path"), &metadata).expect("save after revoke");
        let listed = list_recipients(path.to_str().expect("path")).expect("list after revoke");

        assert_eq!(
            removed.public_key_fingerprint,
            granted.public_key_fingerprint
        );
        assert!(listed.is_empty());

        let _ = fs::remove_file(path);
    }

    #[test]
    fn revoke_rotates_project_key_without_bricking_envelope_vaults() {
        use base64::{Engine, engine::general_purpose};

        use crate::{
            crypto::{
                dek::{WrappedDek, unwrap_dek},
                integrity::verify_secrets_integrity,
                kdf::{KdfParams, derive_master_key},
                kek::derive_kek,
                sdk, update_master_password_metadata,
            },
            domain::{error::DotLockError, model::Alg},
            storage::secrets_lock::{load_secrets_file, upsert_plain_secret},
        };

        let unique = std::time::SystemTime::now()
            .duration_since(std::time::UNIX_EPOCH)
            .expect("time")
            .as_nanos();
        let dir = std::env::temp_dir().join(format!("dotlock-revoke-rotate-{unique}"));
        fs::create_dir_all(&dir).expect("create dir");
        let vault_path = dir.join("vault.toml");
        let secrets_path = dir.join("secrets.lock");
        let vault_str = vault_path.to_str().expect("vault path");
        let secrets_str = secrets_path.to_str().expect("secrets path");

        let old_dek = ProjectKey::new([8u8; 32]);
        let passphrase = "test-passphrase";
        let mut metadata = metadata();
        update_master_password_metadata(&mut metadata, &old_dek, passphrase).expect("wrap dek");
        save_vault_metadata(&vault_path, &metadata).expect("save vault");

        // Secrets set through the normal envelope path (v5, per-secret SDKs).
        upsert_plain_secret(
            &secrets_path,
            "A".to_string(),
            "1".to_string(),
            Alg::XChaCha20Poly1305,
            &old_dek,
            vault_str,
            &mut load_vault_metadata(&vault_path).expect("load vault metadata"),
        )
        .expect("set A");
        upsert_plain_secret(
            &secrets_path,
            "B".to_string(),
            "2".to_string(),
            Alg::XChaCha20Poly1305,
            &old_dek,
            vault_str,
            &mut load_vault_metadata(&vault_path).expect("load vault metadata"),
        )
        .expect("set B");

        // A second identity granted full access.
        let bob = crate::crypto::share::generate_identity(
            crate::crypto::share::IdentityProtection::Plain,
        )
        .expect("identity");
        let granted =
            grant_recipient(vault_str, &bob.public_key_pem, "bob", &old_dek).expect("grant");
        assert!(!granted.wrapped_dek_b64.is_empty());

        // (1) revoke succeeds (the old flow aborted with an AEAD error here).
        let outcome = revoke_recipient_and_rotate(
            vault_str,
            secrets_str,
            &mut load_vault_metadata(&vault_path).expect("load vault metadata"),
            "bob",
            &old_dek,
            passphrase,
        )
        .expect("revoke succeeds for envelope vaults");
        assert_eq!(
            outcome.removed.public_key_fingerprint,
            granted.public_key_fingerprint
        );

        // (2) the revoked recipient's wrapped material is gone from vault.toml.
        let metadata = load_vault_metadata(vault_str).expect("reload vault");
        assert!(metadata.recipients.is_empty());
        let raw = fs::read_to_string(&vault_path).expect("read vault.toml");
        assert!(!raw.contains(&granted.wrapped_dek_b64));
        assert!(!raw.contains(&granted.public_key_fingerprint));

        // (3) the owner can still read A under the new DEK (vault not bricked)
        //     and the ciphertexts were NOT re-encrypted (SDK envelope intact).
        let file = load_secrets_file(&secrets_path).expect("load secrets");
        let record_a = file
            .secrets
            .iter()
            .find(|secret| secret.name == "A")
            .expect("record A");
        let wrapped_sdk = metadata
            .wrapped_sdks_under_dek
            .get(&record_a.id)
            .expect("SDK wrapping for A");
        let sdk_a = sdk::unwrap_sdk_with_project_key(wrapped_sdk, &outcome.new_dek)
            .expect("unwrap SDK under new DEK");
        assert_eq!(
            crate::storage::secrets_lock::decrypt_record_with_key(record_a, &sdk_a)
                .expect("decrypt A")
                .as_str(),
            "1"
        );

        // (4) unlock with the revoked/old key material fails: the old DEK can
        //     no longer unwrap any SDK, and no recipient entry remains for bob.
        assert!(sdk::unwrap_sdk_with_project_key(wrapped_sdk, &old_dek).is_err());

        // Owner master-password unlock still works end to end.
        let salt = general_purpose::STANDARD
            .decode(&metadata.salt_b64)
            .expect("salt");
        let master_key = derive_master_key(
            passphrase,
            &salt,
            KdfParams {
                memory_kib: metadata.memory_kib,
                iterations: metadata.iterations,
                parallelism: metadata.parallelism,
            },
        )
        .expect("master key");
        let kek = derive_kek(
            &master_key,
            &metadata.project,
            &metadata.environment,
            metadata.kek_version,
        )
        .expect("kek");
        let nonce: [u8; 24] = general_purpose::STANDARD
            .decode(&metadata.wrapped_dek_nonce_b64)
            .expect("nonce b64")
            .try_into()
            .expect("nonce len");
        let wrapped = WrappedDek {
            nonce,
            ciphertext: general_purpose::STANDARD
                .decode(&metadata.wrapped_dek_b64)
                .expect("wrapped dek b64"),
        };
        let unlocked_dek = unwrap_dek(
            &kek,
            &wrapped,
            &metadata.project,
            &metadata.environment,
            metadata.kek_version,
        )
        .expect("owner password unlock");
        assert_eq!(unlocked_dek.as_bytes(), outcome.new_dek.as_bytes());

        // (5) integrity verifies under the new DEK and rejects the old one.
        verify_secrets_integrity(&secrets_path, &metadata, &outcome.new_dek)
            .expect("integrity under new DEK");
        assert!(matches!(
            verify_secrets_integrity(&secrets_path, &metadata, &old_dek),
            Err(DotLockError::TamperedSecretsFile)
        ));

        let _ = fs::remove_dir_all(dir);
    }

    #[test]
    fn grant_can_limit_recipient_to_allowed_secret_sdks() {
        let path = temp_file("shared-access-allow");
        let mut metadata = metadata();
        metadata.wrapped_sdks_under_dek.insert(
            "foo-id".to_string(),
            crate::crypto::sdk::wrap_sdk_for_project_key(
                &crate::domain::keys::SecretKey::new([1u8; 32]),
                &ProjectKey::new([3u8; 32]),
            )
            .expect("wrap foo"),
        );
        metadata.wrapped_sdks_under_dek.insert(
            "bar-id".to_string(),
            crate::crypto::sdk::wrap_sdk_for_project_key(
                &crate::domain::keys::SecretKey::new([2u8; 32]),
                &ProjectKey::new([3u8; 32]),
            )
            .expect("wrap bar"),
        );
        save_vault_metadata(&path, &metadata).expect("save metadata");
        let identity =
            generate_identity(IdentityProtection::Encrypted("hunter2")).expect("identity");

        let granted = grant_recipient_with_secret_ids(
            path.to_str().expect("path"),
            &mut load_vault_metadata(&path).expect("load vault metadata"),
            &identity.public_key_pem,
            "alice",
            &ProjectKey::new([3u8; 32]),
            Some(&["foo-id".to_string()]),
            None,
        )
        .expect("grant");

        assert!(!granted.full_access);
        assert!(granted.wrapped_sdks.contains_key("foo-id"));
        assert!(!granted.wrapped_sdks.contains_key("bar-id"));

        let _ = fs::remove_file(path);
    }

    /// RSA-exit migration (ADR 0001): a vault whose recipient entry is a
    /// legacy RSA wrap is rekeyed to an Ed25519/X25519 identity by
    /// `migrate_recipient_identity` — afterwards the modern key unwraps the
    /// project key, the grant verifies under Ed25519, the resealed MAC is
    /// valid, and the legacy RSA key is no longer referenced by the vault.
    #[test]
    fn migrate_recipient_identity_rekeys_from_rsa_to_ed25519() {
        use crate::{
            crypto::{
                integrity::verify_metadata_mac,
                share::{
                    RECIPIENT_ALG, RECIPIENT_ALG_X25519, encode_public_key_b64,
                    generate_legacy_rsa_identity, unwrap_dek_with_private_key,
                    wrap_dek_for_public_key,
                },
            },
            storage::{
                identity::LocalIdentity,
                shared_access::{migrate_recipient_identity, recipient_grant_is_valid},
            },
        };

        let path = temp_file("shared-access-migrate");
        let dek = ProjectKey::new([4u8; 32]);
        let legacy = generate_legacy_rsa_identity(IdentityProtection::Plain).expect("legacy");
        let mut metadata = metadata();
        metadata.access_mode = AccessMode::Shared;
        metadata.wrapped_sdks_under_dek.insert(
            "foo-id".to_string(),
            crate::crypto::sdk::wrap_sdk_for_project_key(
                &crate::domain::keys::SecretKey::new([6u8; 32]),
                &dek,
            )
            .expect("wrap sdk"),
        );
        metadata.recipients.push(crate::crypto::VaultRecipient {
            id: "me".to_string(),
            label: "me".to_string(),
            alg: RECIPIENT_ALG.to_string(),
            public_key_fingerprint: legacy.fingerprint.clone(),
            public_key_b64: encode_public_key_b64(&legacy.public_key_pem).expect("pub b64"),
            wrapped_dek_b64: wrap_dek_for_public_key(dek.as_bytes(), &legacy.public_key_pem)
                .expect("legacy wrap"),
            wrapped_sdks: std::collections::HashMap::from([(
                "foo-id".to_string(),
                wrap_dek_for_public_key(&[6u8; 32], &legacy.public_key_pem).expect("sdk wrap"),
            )]),
            full_access: true,
            grant_signature_b64: String::new(),
            grant_signer_fingerprint: String::new(),
        });
        save_vault_metadata(&path, &metadata).expect("save vault");

        // The legacy identity CAN unwrap before migration (one last time).
        let unwrapped = unwrap_dek_with_private_key(
            &metadata.recipients[0].wrapped_dek_b64,
            &legacy.private_key_pem,
        )
        .expect("legacy unwrap");
        assert_eq!(&unwrapped, dek.as_bytes());

        let modern = generate_identity(IdentityProtection::Plain).expect("modern identity");
        let new_identity = LocalIdentity {
            fingerprint: modern.fingerprint.clone(),
            private_key_pem: modern.private_key_pem.clone(),
            public_key_pem: modern.public_key_pem.clone(),
        };
        let migrated = migrate_recipient_identity(
            path.to_str().expect("path"),
            &mut load_vault_metadata(&path).expect("load vault"),
            &legacy.fingerprint,
            &new_identity,
            &dek,
        )
        .expect("migrate recipient");

        let reloaded = load_vault_metadata(&path).expect("reload vault");
        assert_eq!(reloaded.recipients.len(), 1);
        let recipient = &reloaded.recipients[0];
        // Rekeyed: modern alg + fingerprint; the RSA material is gone.
        assert_eq!(recipient.alg, RECIPIENT_ALG_X25519);
        assert_eq!(recipient.public_key_fingerprint, modern.fingerprint);
        assert_eq!(migrated.public_key_fingerprint, modern.fingerprint);
        let raw = fs::read_to_string(&path).expect("raw vault");
        assert!(!raw.contains(&legacy.fingerprint), "RSA fingerprint gone");
        // The NEW key unwraps the project key and the rewrapped SDK; the
        // legacy key no longer can.
        let unwrapped =
            unwrap_dek_with_private_key(&recipient.wrapped_dek_b64, &modern.private_key_pem)
                .expect("modern unwrap");
        assert_eq!(&unwrapped, dek.as_bytes());
        assert!(
            unwrap_dek_with_private_key(&recipient.wrapped_dek_b64, &legacy.private_key_pem)
                .is_err()
        );
        let sdk = unwrap_dek_with_private_key(
            recipient.wrapped_sdks.get("foo-id").expect("sdk rewrapped"),
            &modern.private_key_pem,
        )
        .expect("modern sdk unwrap");
        assert_eq!(sdk, [6u8; 32]);
        // The grant is re-signed under Ed25519 by the (now authorized) new
        // identity, the version was bumped, and the MAC reseals correctly.
        assert!(recipient_grant_is_valid(
            &reloaded.project_uuid,
            &reloaded.authorized_signers,
            recipient
        ));
        assert!(reloaded.version >= 8);
        verify_metadata_mac(&reloaded, &dek).expect("resealed MAC verifies");

        let _ = fs::remove_file(path);
    }

    /// H3 migration: a vault that predates signed grants (no authorized
    /// signers, recipients without grant fields) still loads/parses, and the
    /// first `dl share grant` executed with a signing identity blesses every
    /// existing recipient and records the signer.
    #[test]
    fn grant_with_signer_signs_new_recipient_and_blesses_legacy_ones() {
        use crate::storage::{
            identity::LocalIdentity,
            shared_access::{grant_recipient_with_secret_ids, recipient_grant_is_valid},
        };

        let path = temp_file("shared-access-bless");
        let mut legacy = metadata();
        legacy.access_mode = AccessMode::Shared;
        legacy.recipients.push(crate::crypto::VaultRecipient {
            id: "legacy-id".to_string(),
            label: "legacy".to_string(),
            alg: "rsa-oaep-sha256".to_string(),
            public_key_fingerprint: "legacy-fp".to_string(),
            public_key_b64: "bGVnYWN5".to_string(),
            wrapped_dek_b64: "wrapped".to_string(),
            wrapped_sdks: std::collections::HashMap::new(),
            full_access: true,
            grant_signature_b64: String::new(),
            grant_signer_fingerprint: String::new(),
        });
        save_vault_metadata(&path, &legacy).expect("save legacy vault");

        // The pre-signed-grant vault still loads (serde defaults).
        let loaded = load_vault_metadata(path.to_str().expect("path")).expect("legacy loads");
        assert!(loaded.authorized_signers.is_empty());

        let owner = generate_identity(IdentityProtection::Plain).expect("identity");
        let signer = LocalIdentity {
            fingerprint: owner.fingerprint.clone(),
            private_key_pem: owner.private_key_pem.clone(),
            public_key_pem: owner.public_key_pem.clone(),
        };
        let grantee = generate_identity(IdentityProtection::Plain).expect("grantee identity");

        let granted = grant_recipient_with_secret_ids(
            path.to_str().expect("path"),
            &mut load_vault_metadata(&path).expect("load vault metadata"),
            &grantee.public_key_pem,
            "bob",
            &ProjectKey::new([3u8; 32]),
            None,
            Some(&signer),
        )
        .expect("signed grant");
        assert!(!granted.grant_signature_b64.is_empty());
        assert_eq!(granted.grant_signer_fingerprint, owner.fingerprint);

        let metadata = load_vault_metadata(path.to_str().expect("path")).expect("reload");
        // The granting identity was recorded as an authorized signer and the
        // vault format was bumped.
        assert_eq!(metadata.authorized_signers.len(), 1);
        assert_eq!(
            metadata.authorized_signers[0].fingerprint,
            owner.fingerprint
        );
        assert!(metadata.version >= 6);
        // Every recipient — the new one AND the legacy unsigned one — now
        // carries a grant that verifies against the authorized signer.
        assert_eq!(metadata.recipients.len(), 2);
        for recipient in &metadata.recipients {
            assert!(
                recipient_grant_is_valid(
                    &metadata.project_uuid,
                    &metadata.authorized_signers,
                    recipient
                ),
                "recipient {} not blessed",
                recipient.label
            );
        }

        let _ = fs::remove_file(path);
    }
}