feat: harden secret unlock and deletion

This commit is contained in:
2026-06-29 21:42:10 +08:00
parent 63c2c1314f
commit 4bb9e84c35
7 changed files with 180 additions and 43 deletions
+31
View File
@@ -25,6 +25,7 @@ const (
masterPBKDF2Iterations = 200000
masterVerifierPlaintext = "verstak-secret-store:v1"
masterMetadataVersion = 1
minMasterPasswordLength = 8
recordsDirName = "records"
masterMetadataFileName = "metadata.json"
ScopeGlobal = "global"
@@ -184,6 +185,18 @@ func (s *Store) ReadRecord(id string) (SecretRecord, error) {
return decoded, nil
}
func (s *Store) Delete(id string) error {
if err := validateID(id); err != nil {
return err
}
s.mu.Lock()
defer s.mu.Unlock()
if err := os.Remove(s.pathForID(id)); err != nil && !os.IsNotExist(err) {
return fmt.Errorf("delete secret %q: %w", id, err)
}
return nil
}
func (s *Store) ListRecords() ([]SecretRecord, error) {
s.mu.RLock()
entries, err := os.ReadDir(s.root)
@@ -350,6 +363,14 @@ func (s *VaultSession) Store() (*Store, error) {
return s.store, nil
}
func (s *VaultSession) Initialized() (bool, error) {
metadata, err := readMasterMetadata(s.root)
if err != nil {
return false, err
}
return metadata != nil, nil
}
func (s *VaultSession) Unlock(masterPassword string) (*Store, error) {
if strings.TrimSpace(masterPassword) == "" {
return nil, fmt.Errorf("master password is empty")
@@ -366,6 +387,9 @@ func (s *VaultSession) Unlock(masterPassword string) (*Store, error) {
return nil, err
}
if metadata == nil {
if err := validateInitialMasterPassword(masterPassword); err != nil {
return nil, err
}
created, key, err := createMasterMetadata(masterPassword)
if err != nil {
return nil, err
@@ -393,6 +417,13 @@ func (s *VaultSession) Unlock(masterPassword string) (*Store, error) {
return store, nil
}
func validateInitialMasterPassword(masterPassword string) error {
if len([]rune(masterPassword)) < minMasterPasswordLength {
return fmt.Errorf("master password must be at least %d characters", minMasterPasswordLength)
}
return nil
}
func readMasterMetadata(root string) (*masterMetadata, error) {
data, err := os.ReadFile(filepath.Join(root, masterMetadataFileName))
if err != nil {
+51
View File
@@ -106,6 +106,30 @@ func TestStoreRejectsUnsafeIDs(t *testing.T) {
}
}
func TestStoreDeletesSecretRecord(t *testing.T) {
store, err := NewStore(t.TempDir(), testKey(0x11))
if err != nil {
t.Fatalf("NewStore: %v", err)
}
if err := store.Write("server.password", "s3cr3t-value"); err != nil {
t.Fatalf("Write: %v", err)
}
if err := store.Delete("server.password"); err != nil {
t.Fatalf("Delete: %v", err)
}
if _, err := store.Read("server.password"); err == nil {
t.Fatal("Read after Delete succeeded")
}
list, err := store.ListRecords()
if err != nil {
t.Fatalf("ListRecords: %v", err)
}
if len(list) != 0 {
t.Fatalf("ListRecords after Delete = %+v, want empty", list)
}
}
func TestStoreListsScopedRecordsWithoutPlaintextOnDisk(t *testing.T) {
root := t.TempDir()
store, err := NewStore(root, testKey(0x11))
@@ -224,3 +248,30 @@ func TestVaultSessionUnlocksWithMasterPasswordOnce(t *testing.T) {
}
}
}
func TestVaultSessionReportsInitializationAndRejectsWeakInitialPassword(t *testing.T) {
root := t.TempDir()
session := NewVaultSession(root)
initialized, err := session.Initialized()
if err != nil {
t.Fatalf("Initialized: %v", err)
}
if initialized {
t.Fatal("new secret session is initialized")
}
if _, err := session.Unlock("123123"); err == nil || !strings.Contains(err.Error(), "at least 8 characters") {
t.Fatalf("weak initial Unlock err = %v, want minimum length error", err)
}
if _, err := session.Unlock("strong password"); err != nil {
t.Fatalf("Unlock strong initial password: %v", err)
}
initialized, err = session.Initialized()
if err != nil {
t.Fatalf("Initialized after unlock: %v", err)
}
if !initialized {
t.Fatal("secret session was not initialized")
}
}