From a226269224ff07a808636b8db53cb6003659b830 Mon Sep 17 00:00:00 2001 From: Nikolay Solovyov Date: Sun, 8 Nov 2026 08:54:10 +0900 Subject: [PATCH] fix: allow reading vaults without a display name --- pkg/enpass/vault.go | 4 +- pkg/enpass/vault_name_test.go | 88 +++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 pkg/enpass/vault_name_test.go diff --git a/pkg/enpass/vault.go b/pkg/enpass/vault.go index 5a8a9e7..e621774 100644 --- a/pkg/enpass/vault.go +++ b/pkg/enpass/vault.go @@ -217,7 +217,7 @@ func (v *Vault) Close() { // login, incoming server, outgoing server fields). This function deduplicates // by UUID, preferring the sensitive field (typically the password). func (v *Vault) GetEntries(cardType string, filters []string) ([]Card, error) { - if v.db == nil || v.vaultInfo.VaultName == "" { + if v.db == nil { return nil, errors.New("vault is not initialized") } @@ -275,7 +275,7 @@ func (v *Vault) GetEntries(cardType string, filters []string) ([]Card, error) { // caller wants to display or operate on multiple fields per entry; use // GetEntries when the caller wants one Card per entry. func (v *Vault) GetAllFields(cardType string, filters []string) ([]Card, error) { - if v.db == nil || v.vaultInfo.VaultName == "" { + if v.db == nil { return nil, errors.New("vault is not initialized") } diff --git a/pkg/enpass/vault_name_test.go b/pkg/enpass/vault_name_test.go new file mode 100644 index 0000000..ebfc7a1 --- /dev/null +++ b/pkg/enpass/vault_name_test.go @@ -0,0 +1,88 @@ +package enpass + +import ( + "encoding/json" + "os" + "path/filepath" + "testing" + + "github.com/sirupsen/logrus" +) + +// Enpass 6 vaults may have an empty or absent vault_name in vault.json. +// This display metadata must not prevent reads after a successful unlock. +func TestVaultReadWithoutName(t *testing.T) { + for _, name := range []string{"empty", "absent"} { + t.Run(name, func(t *testing.T) { + dir := t.TempDir() + data, err := os.ReadFile(filepath.Join(vaultPath, vaultFileName)) + if err != nil { + t.Fatal(err) + } + if err := os.WriteFile(filepath.Join(dir, vaultFileName), data, 0600); err != nil { + t.Fatal(err) + } + info, err := os.ReadFile(filepath.Join(vaultPath, vaultInfoFileName)) + if err != nil { + t.Fatal(err) + } + var metadata map[string]interface{} + if err := json.Unmarshal(info, &metadata); err != nil { + t.Fatal(err) + } + if name == "empty" { + metadata["vault_name"] = "" + } else { + delete(metadata, "vault_name") + } + info, err = json.Marshal(metadata) + if err != nil { + t.Fatal(err) + } + if err := os.WriteFile(filepath.Join(dir, vaultInfoFileName), info, 0600); err != nil { + t.Fatal(err) + } + + vault, err := NewVault(dir, logrus.ErrorLevel) + if err != nil { + t.Fatal(err) + } + defer vault.Close() + if err := vault.Open(&VaultCredentials{Password: testPassword}); err != nil { + t.Fatal(err) + } + for _, read := range []struct { + name string + get func(string, []string) ([]Card, error) + }{ + {"entries", vault.GetEntries}, + {"fields", vault.GetAllFields}, + } { + cards, err := read.get("password", nil) + if err != nil { + t.Fatalf("read %s after unlock: %v", read.name, err) + } + if len(cards) == 0 { + t.Fatalf("read %s returned no cards", read.name) + } + if _, err := cards[0].Decrypt(); err != nil { + t.Fatalf("decrypt %s: %v", read.name, err) + } + } + }) + } +} + +func TestVaultReadBeforeOpen(t *testing.T) { + vault, err := NewVault(vaultPath, logrus.ErrorLevel) + if err != nil { + t.Fatal(err) + } + defer vault.Close() + if _, err := vault.GetEntries("password", nil); err == nil { + t.Fatal("GetEntries accepted an unopened vault") + } + if _, err := vault.GetAllFields("password", nil); err == nil { + t.Fatal("GetAllFields accepted an unopened vault") + } +}