Compare commits
2
Commits
469f5a0662
...
dd08f6f51e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dd08f6f51e | ||
|
|
72cd6c30a1 |
No files matched your search
@@ -90,7 +90,8 @@ remove things pass `--force`.
|
|||||||
#### `secret init`
|
#### `secret init`
|
||||||
|
|
||||||
Initializes the secret manager with a default vault. Prompts for a BIP39
|
Initializes the secret manager with a default vault. Prompts for a BIP39
|
||||||
mnemonic phrase and creates the initial directory structure.
|
mnemonic phrase and creates the initial directory structure. When the vault
|
||||||
|
`default` already exists, it fails before asking for the mnemonic or passphrase.
|
||||||
|
|
||||||
**Environment Variables:**
|
**Environment Variables:**
|
||||||
|
|
||||||
@@ -105,7 +106,8 @@ Lists all available vaults. The current vault is marked.
|
|||||||
|
|
||||||
#### `secret vault create <name>`
|
#### `secret vault create <name>`
|
||||||
|
|
||||||
Creates a new vault with the specified name.
|
Creates a new vault with the specified name. When a vault of that name already
|
||||||
|
exists, it fails before asking for the mnemonic or passphrase.
|
||||||
|
|
||||||
**Vault Name Format:** only lowercase ASCII letters, digits, `.`, `-` and `_`
|
**Vault Name Format:** only lowercase ASCII letters, digits, `.`, `-` and `_`
|
||||||
are allowed, and a name must not be empty, `.` or `..`.
|
are allowed, and a name must not be empty, `.` or `..`.
|
||||||
|
|||||||
@@ -18,6 +18,23 @@ https://git.eeqj.de/sneak/secret/milestone/12
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
|
- 2026-10-14: `secret init` and `secret vault create` refuse a vault that
|
||||||
|
already exists before asking for the mnemonic or the unlocker passphrase
|
||||||
|
(https://git.eeqj.de/sneak/secret/issues/151). They used to ask for both and
|
||||||
|
only then refuse, and `secret init` printed "Initialized secrets manager at"
|
||||||
|
before the refusal. The new `vault.CheckNewVaultName`, which
|
||||||
|
`vault.CreateVault` also calls, checks the name while the command holds the
|
||||||
|
state directory lock, before the first prompt; `secret init` prints that line
|
||||||
|
only once the vault is created. `secret vault create` with an invalid name
|
||||||
|
also fails before asking.
|
||||||
|
- 2026-10-14: A wrong passphrase, from `SB_UNLOCK_PASSPHRASE` or typed at the
|
||||||
|
prompt, gives the error `wrong passphrase for unlocker <id>`
|
||||||
|
(https://git.eeqj.de/sneak/secret/issues/157). It used to be age's "no
|
||||||
|
identity matched any of the recipients", followed by advice to give the vault
|
||||||
|
a new unlocker from its mnemonic, which would have replaced an unlocker that
|
||||||
|
works. The error now wraps `secret.ErrWrongPassphrase` and carries no advice
|
||||||
|
to use the mnemonic. A `priv.age` that is not an age file still gets that
|
||||||
|
advice.
|
||||||
- 2026-10-14: The passphrase and mnemonic prompts ask on the controlling
|
- 2026-10-14: The passphrase and mnemonic prompts ask on the controlling
|
||||||
terminal (`/dev/tty`) instead of stdin, so `echo v | secret add s1 --force`,
|
terminal (`/dev/tty`) instead of stdin, so `echo v | secret add s1 --force`,
|
||||||
`cat file | secret encrypt key` and `cat file.age | secret decrypt key` ask
|
`cat file | secret encrypt key` and `cat file.age | secret decrypt key` ask
|
||||||
|
|||||||
@@ -222,12 +222,51 @@ func TestMnemonicNotReadNamesOnlyMnemonic(t *testing.T) {
|
|||||||
output, err := cmd.CombinedOutput()
|
output, err := cmd.CombinedOutput()
|
||||||
require.Error(t, err)
|
require.Error(t, err)
|
||||||
|
|
||||||
require.Equal(t, "Initialized secrets manager at: "+stateDir+"\n"+
|
require.Equal(t, "Error: failed to read mnemonic: there is no terminal to "+
|
||||||
"Error: failed to read mnemonic: there is no terminal to ask on. "+
|
"ask on. Please set the SB_SECRET_MNEMONIC environment variable or run "+
|
||||||
"Please set the SB_SECRET_MNEMONIC environment variable or run "+
|
|
||||||
"interactively\n", string(output))
|
"interactively\n", string(output))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestCreateExistingVaultAsksForNothing is a regression test for
|
||||||
|
// https://git.eeqj.de/sneak/secret/issues/151: `secret init` and `secret
|
||||||
|
// vault create` asked for the mnemonic and the unlocker passphrase before
|
||||||
|
// refusing a vault that already exists, and `secret init` printed
|
||||||
|
// "Initialized secrets manager at" first. Each runs here as the built binary,
|
||||||
|
// in a new session, which has no terminal, and with neither
|
||||||
|
// SB_SECRET_MNEMONIC nor SB_UNLOCK_PASSPHRASE set, so asking for either
|
||||||
|
// fails. Each must fail saying only that the vault exists.
|
||||||
|
func TestCreateExistingVaultAsksForNothing(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
stateDir := t.TempDir()
|
||||||
|
_, err := vault.CreateVault(afero.NewOsFs(), stateDir, "default", nil, nil)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// run runs the built binary with args, which must fail, and returns what
|
||||||
|
// it printed
|
||||||
|
run := func(args ...string) string {
|
||||||
|
//nolint:gosec // G204: test executes the freshly built secret binary
|
||||||
|
cmd := exec.CommandContext(t.Context(), secretBinaryPath(t), args...)
|
||||||
|
cmd.Env = []string{
|
||||||
|
secret.EnvStateDir + "=" + stateDir,
|
||||||
|
"PATH=" + os.Getenv("PATH"),
|
||||||
|
"HOME=" + os.Getenv("HOME"),
|
||||||
|
}
|
||||||
|
cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
|
||||||
|
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
require.Error(t, err, "secret %v", args)
|
||||||
|
|
||||||
|
return string(output)
|
||||||
|
}
|
||||||
|
|
||||||
|
require.Equal(t,
|
||||||
|
"Error: failed to create default vault: vault default already exists\n",
|
||||||
|
run("init"))
|
||||||
|
require.Equal(t, "Error: vault default already exists\n",
|
||||||
|
run("vault", "create", "default"))
|
||||||
|
}
|
||||||
|
|
||||||
// TestStopDuringCreateLeavesWholeVaultOrNone is a regression test for
|
// TestStopDuringCreateLeavesWholeVaultOrNone is a regression test for
|
||||||
// https://git.eeqj.de/sneak/secret/issues/105: `secret init` or `secret vault
|
// https://git.eeqj.de/sneak/secret/issues/105: `secret init` or `secret vault
|
||||||
// create` killed after the passphrase prompt but before the unlocker was
|
// create` killed after the passphrase prompt but before the unlocker was
|
||||||
|
|||||||
@@ -17,6 +17,9 @@ import (
|
|||||||
// errPassphraseMismatch is returned when passphrase confirmation fails
|
// errPassphraseMismatch is returned when passphrase confirmation fails
|
||||||
var errPassphraseMismatch = errors.New("passphrases do not match")
|
var errPassphraseMismatch = errors.New("passphrases do not match")
|
||||||
|
|
||||||
|
// defaultVaultName is the name of the vault `secret init` creates
|
||||||
|
const defaultVaultName = "default"
|
||||||
|
|
||||||
// NewInitCmd creates the init command
|
// NewInitCmd creates the init command
|
||||||
func NewInitCmd() *cobra.Command {
|
func NewInitCmd() *cobra.Command {
|
||||||
return &cobra.Command{
|
return &cobra.Command{
|
||||||
@@ -92,8 +95,10 @@ func (cli *Instance) initialize(cmd *cobra.Command) error {
|
|||||||
return fmt.Errorf("failed to create state directory: %w", err)
|
return fmt.Errorf("failed to create state directory: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if cmd != nil {
|
// Refuse an existing default vault before asking for anything
|
||||||
cmd.Printf("Initialized secrets manager at: %s\n", stateDir)
|
err = vault.CheckNewVaultName(cli.fs, cli.stateDir, defaultVaultName)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to create default vault: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prompt for mnemonic
|
// Prompt for mnemonic
|
||||||
@@ -133,7 +138,7 @@ func (cli *Instance) initialize(cmd *cobra.Command) error {
|
|||||||
// Create the default vault with its passphrase unlocker
|
// Create the default vault with its passphrase unlocker
|
||||||
secret.Debug("Creating default vault")
|
secret.Debug("Creating default vault")
|
||||||
|
|
||||||
vlt, err := vault.CreateVault(cli.fs, cli.stateDir, "default",
|
vlt, err := vault.CreateVault(cli.fs, cli.stateDir, defaultVaultName,
|
||||||
mnemonic, passphraseBuffer)
|
mnemonic, passphraseBuffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
secret.Debug("Failed to create default vault", "error", err)
|
secret.Debug("Failed to create default vault", "error", err)
|
||||||
@@ -152,6 +157,7 @@ func (cli *Instance) initialize(cmd *cobra.Command) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if cmd != nil {
|
if cmd != nil {
|
||||||
|
cmd.Printf("Initialized secrets manager at: %s\n", stateDir)
|
||||||
cmd.Printf("\nDefault vault created and configured\n")
|
cmd.Printf("\nDefault vault created and configured\n")
|
||||||
cmd.Printf("Long-term public key: %s\n", ltIdentity.Recipient().String())
|
cmd.Printf("Long-term public key: %s\n", ltIdentity.Recipient().String())
|
||||||
cmd.Printf("Unlocker ID: %s\n", unlocker.GetID())
|
cmd.Printf("Unlocker ID: %s\n", unlocker.GetID())
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
// Unlock Failure Tests
|
// Unlock Failure Tests
|
||||||
//
|
//
|
||||||
// When a vault cannot be opened through its current unlocker, because a
|
// When a vault cannot be opened through its current unlocker, because a
|
||||||
// file the unlocker needs is missing or the passphrase is wrong, the error
|
// file the unlocker needs is missing, the error keeps its cause and ends by
|
||||||
// keeps its cause and ends by saying that the mnemonic still opens that
|
// saying that the mnemonic still opens that vault, but only for a vault that
|
||||||
// vault, but only for a vault that the mnemonic does open, and not when the
|
// the mnemonic does open, and not when the passphrase could not be read at
|
||||||
// passphrase could not be read at all. When the current unlocker does not
|
// all. A wrong passphrase gives an error that says so, without that advice.
|
||||||
// exist and the vault has another that `secret unlocker select` accepts, the
|
// When the current unlocker does not exist and the vault has another that
|
||||||
// error says to select one instead.
|
// `secret unlocker select` accepts, the error says to select one instead.
|
||||||
// When a secret's current file is missing, the error says how to make a
|
// When a secret's current file is missing, the error says how to make a
|
||||||
// version current again. Each test that pins such advice also follows it.
|
// version current again. Each test that pins such advice also follows it.
|
||||||
|
|
||||||
@@ -21,7 +21,6 @@ import (
|
|||||||
"syscall"
|
"syscall"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"filippo.io/age"
|
|
||||||
"github.com/awnumar/memguard"
|
"github.com/awnumar/memguard"
|
||||||
"github.com/spf13/afero"
|
"github.com/spf13/afero"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
@@ -165,26 +164,48 @@ func TestUnlockFailureNamesMnemonic(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestWrongPassphraseNamesMnemonic checks the error of `secret get` given a
|
// TestWrongPassphraseNamesPassphrase checks the error of `secret get` given
|
||||||
// passphrase that does not decrypt the passphrase unlocker: it keeps age's
|
// a passphrase that does not decrypt the passphrase unlocker: it says that
|
||||||
// error and ends with the advice that the mnemonic still opens the vault.
|
// the passphrase is wrong, without the advice to use the mnemonic, since the
|
||||||
func TestWrongPassphraseNamesMnemonic(t *testing.T) {
|
// unlocker still opens the vault with the right passphrase. The test then
|
||||||
|
// gives the right passphrase.
|
||||||
|
func TestWrongPassphraseNamesPassphrase(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
_, c := newUnlockTestCLI(t, newTwoVaultFs(t))
|
unlockerDir, c := newUnlockTestCLI(t, newTwoVaultFs(t))
|
||||||
c.UnlockPassphrase = memguard.NewBufferFromBytes([]byte("wrong passphrase"))
|
c.UnlockPassphrase = memguard.NewBufferFromBytes([]byte("wrong passphrase"))
|
||||||
t.Cleanup(c.UnlockPassphrase.Destroy)
|
t.Cleanup(c.UnlockPassphrase.Destroy)
|
||||||
|
|
||||||
err := c.GetSecret(discardCmd(), "x")
|
err := c.GetSecret(discardCmd(), "x")
|
||||||
|
|
||||||
var noMatch *age.NoIdentityMatchError
|
require.ErrorIs(t, err, secret.ErrWrongPassphrase)
|
||||||
|
assert.NotContains(t, err.Error(), mnemonicAdvice)
|
||||||
require.ErrorAs(t, err, &noMatch)
|
|
||||||
|
|
||||||
require.EqualError(t, err, "failed to unlock vault: "+
|
require.EqualError(t, err, "failed to unlock vault: "+
|
||||||
"failed to get long-term key: failed to get unlocker identity: "+
|
"failed to get long-term key: failed to get unlocker identity: "+
|
||||||
"failed to decrypt unlocker private key: failed to create decryptor: "+
|
"wrong passphrase for unlocker "+filepath.Base(unlockerDir))
|
||||||
noMatch.Error()+mnemonicAdvice)
|
|
||||||
|
c.UnlockPassphrase = memguard.NewBufferFromBytes([]byte(testPassphrase))
|
||||||
|
t.Cleanup(c.UnlockPassphrase.Destroy)
|
||||||
|
assert.Equal(t, "value", getSecret(t, c, "x"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestDamagedUnlockerNamesMnemonic checks the error of `secret get` when the
|
||||||
|
// passphrase unlocker's priv.age is not an age file: the passphrase is not
|
||||||
|
// blamed, and the error ends with the advice that the mnemonic still opens
|
||||||
|
// the vault.
|
||||||
|
func TestDamagedUnlockerNamesMnemonic(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
fs := newTwoVaultFs(t)
|
||||||
|
unlockerDir, c := newUnlockTestCLI(t, fs)
|
||||||
|
|
||||||
|
require.NoError(t, afero.WriteFile(fs, filepath.Join(unlockerDir, "priv.age"),
|
||||||
|
[]byte("damaged"), secret.FilePerms))
|
||||||
|
|
||||||
|
err := c.GetSecret(discardCmd(), "x")
|
||||||
|
|
||||||
|
require.NotErrorIs(t, err, secret.ErrWrongPassphrase)
|
||||||
|
require.ErrorContains(t, err, mnemonicAdvice)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestMoveUnlockFailureNamesVault checks the error of `secret move` into
|
// TestMoveUnlockFailureNamesVault checks the error of `secret move` into
|
||||||
|
|||||||
@@ -267,6 +267,12 @@ func (cli *Instance) CreateVault(cmd *cobra.Command, name string) error {
|
|||||||
}
|
}
|
||||||
defer release()
|
defer release()
|
||||||
|
|
||||||
|
// Refuse an invalid name or an existing vault before asking for anything
|
||||||
|
err = vault.CheckNewVaultName(cli.fs, cli.stateDir, name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
mnemonic, cleanupMnemonic, err := cli.promptMnemonic()
|
mnemonic, cleanupMnemonic, err := cli.promptMnemonic()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ import (
|
|||||||
// empty. A passphrase unlocker that fails with it was not tried.
|
// empty. A passphrase unlocker that fails with it was not tried.
|
||||||
var ErrPassphraseNotRead = errors.New("failed to read passphrase")
|
var ErrPassphraseNotRead = errors.New("failed to read passphrase")
|
||||||
|
|
||||||
|
// ErrWrongPassphrase is wrapped in the error of GetIdentity when the
|
||||||
|
// passphrase does not decrypt the unlocker's private key.
|
||||||
|
var ErrWrongPassphrase = errors.New("wrong passphrase")
|
||||||
|
|
||||||
// PassphraseUnlocker represents a passphrase-protected unlocker
|
// PassphraseUnlocker represents a passphrase-protected unlocker
|
||||||
type PassphraseUnlocker struct {
|
type PassphraseUnlocker struct {
|
||||||
Directory string
|
Directory string
|
||||||
@@ -73,6 +77,12 @@ func (p *PassphraseUnlocker) GetIdentity() (*age.X25519Identity, error) {
|
|||||||
Debug("Failed to decrypt unlocker private key",
|
Debug("Failed to decrypt unlocker private key",
|
||||||
"error", err, "unlocker_id", p.GetID())
|
"error", err, "unlocker_id", p.GetID())
|
||||||
|
|
||||||
|
// age says that no identity matched when the passphrase is wrong
|
||||||
|
var noMatch *age.NoIdentityMatchError
|
||||||
|
if errors.As(err, &noMatch) {
|
||||||
|
return nil, fmt.Errorf("%w for unlocker %s", ErrWrongPassphrase, p.GetID())
|
||||||
|
}
|
||||||
|
|
||||||
return nil, fmt.Errorf("failed to decrypt unlocker private key: %w", err)
|
return nil, fmt.Errorf("failed to decrypt unlocker private key: %w", err)
|
||||||
}
|
}
|
||||||
defer privKeyBuffer.Destroy()
|
defer privKeyBuffer.Destroy()
|
||||||
|
|||||||
@@ -212,16 +212,40 @@ func processMnemonicForVault(
|
|||||||
return ltIdentity, derivationIndex, publicKeyHash, familyHash, nil
|
return ltIdentity, derivationIndex, publicKeyHash, familyHash, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CheckNewVaultName returns an error when name cannot be the name of a new
|
||||||
|
// vault: one wrapping ErrInvalidVaultName when it is not a valid vault name,
|
||||||
|
// and one wrapping ErrVaultExists when that vault already exists. Creating an
|
||||||
|
// existing vault again would replace its keys, and its secrets could no
|
||||||
|
// longer be decrypted. CreateVault checks this before writing anything; the
|
||||||
|
// commands that create a vault also check it before they ask for the
|
||||||
|
// mnemonic or passphrase, holding the state directory lock.
|
||||||
|
func CheckNewVaultName(fs afero.Fs, stateDir string, name string) error {
|
||||||
|
err := ValidateVaultName(name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
exists, err := afero.DirExists(fs, filepath.Join(stateDir, "vaults.d", name))
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to check if vault exists: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if exists {
|
||||||
|
return fmt.Errorf("vault %s %w", name, ErrVaultExists)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// CreateVault creates a new vault and selects it as the current vault. When
|
// CreateVault creates a new vault and selects it as the current vault. When
|
||||||
// mnemonic is not nil, the vault's long-term key is derived from it, and the
|
// mnemonic is not nil, the vault's long-term key is derived from it, and the
|
||||||
// returned vault has it as its Mnemonic; when it is nil, the vault has no
|
// returned vault has it as its Mnemonic; when it is nil, the vault has no
|
||||||
// long-term key until one is imported. When passphrase is not nil, the vault
|
// long-term key until one is imported. When passphrase is not nil, the vault
|
||||||
// gets a passphrase unlocker protected by it, as its current unlocker; that
|
// gets a passphrase unlocker protected by it, as its current unlocker; that
|
||||||
// needs a mnemonic. It refuses a vault that already exists before writing
|
// needs a mnemonic. It refuses an invalid name or a vault that already exists,
|
||||||
// anything: creating it again would replace its keys, and its secrets could
|
// as CheckNewVaultName does, before writing anything. The commands that call
|
||||||
// no longer be decrypted. The commands that call it hold the state directory
|
// it hold the state directory lock, so no other command can create the vault
|
||||||
// lock, so no other command can create the vault between the check and the
|
// between the check and the writes.
|
||||||
// writes.
|
|
||||||
//
|
//
|
||||||
// The vault is written whole into a temporary directory, which is renamed
|
// The vault is written whole into a temporary directory, which is renamed
|
||||||
// into vaults.d only once complete, and only then selected: a crash at any
|
// into vaults.d only once complete, and only then selected: a crash at any
|
||||||
@@ -233,30 +257,17 @@ func CreateVault(
|
|||||||
) (*Vault, error) {
|
) (*Vault, error) {
|
||||||
secret.Debug("Creating new vault", "name", name, "state_dir", stateDir)
|
secret.Debug("Creating new vault", "name", name, "state_dir", stateDir)
|
||||||
|
|
||||||
err := ValidateVaultName(name)
|
err := CheckNewVaultName(fs, stateDir, name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
secret.Debug("Invalid vault name provided", "vault_name", name)
|
|
||||||
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
secret.Debug("Vault name validation passed", "vault_name", name)
|
|
||||||
|
|
||||||
vaultDir := filepath.Join(stateDir, "vaults.d", name)
|
|
||||||
|
|
||||||
exists, err := afero.DirExists(fs, vaultDir)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to check if vault exists: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if exists {
|
|
||||||
return nil, fmt.Errorf("vault %s %w", name, ErrVaultExists)
|
|
||||||
}
|
|
||||||
|
|
||||||
if passphrase != nil && mnemonic == nil {
|
if passphrase != nil && mnemonic == nil {
|
||||||
return nil, fmt.Errorf("vault %s %w", name, ErrUnlockerWithoutMnemonic)
|
return nil, fmt.Errorf("vault %s %w", name, ErrUnlockerWithoutMnemonic)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
vaultDir := filepath.Join(stateDir, "vaults.d", name)
|
||||||
|
|
||||||
secret.Debug("Creating vault directory structure", "vault_dir", vaultDir)
|
secret.Debug("Creating vault directory structure", "vault_dir", vaultDir)
|
||||||
|
|
||||||
err = secret.WriteDir(fs, vaultDir, func(dir string) error {
|
err = secret.WriteDir(fs, vaultDir, func(dir string) error {
|
||||||
|
|||||||
@@ -291,10 +291,13 @@ func (v *Vault) unlockLongTermKey(
|
|||||||
// without a mnemonic records none, and without its metadata the key cannot
|
// without a mnemonic records none, and without its metadata the key cannot
|
||||||
// be derived. It is not added when the passphrase could not be read: the
|
// be derived. It is not added when the passphrase could not be read: the
|
||||||
// unlocker was not tried, and adding one would need a passphrase read the
|
// unlocker was not tried, and adding one would need a passphrase read the
|
||||||
// same way. Nor is it added when the current unlocker does not exist and the
|
// same way. Nor is it added when the passphrase is wrong: the unlocker still
|
||||||
// vault has others: the error already says to select one of them.
|
// opens the vault with the right one. Nor is it added when the current
|
||||||
|
// unlocker does not exist and the vault has others: the error already says
|
||||||
|
// to select one of them.
|
||||||
func (v *Vault) withMnemonicAdvice(err error) error {
|
func (v *Vault) withMnemonicAdvice(err error) error {
|
||||||
if errors.Is(err, secret.ErrPassphraseNotRead) ||
|
if errors.Is(err, secret.ErrPassphraseNotRead) ||
|
||||||
|
errors.Is(err, secret.ErrWrongPassphrase) ||
|
||||||
errors.Is(err, ErrUnlockerNotFound) {
|
errors.Is(err, ErrUnlockerNotFound) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"filippo.io/age"
|
|
||||||
"github.com/awnumar/memguard"
|
"github.com/awnumar/memguard"
|
||||||
"github.com/spf13/afero"
|
"github.com/spf13/afero"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
@@ -140,9 +139,7 @@ func TestAddSecretForceWithWrongPassphraseChangesNothing(t *testing.T) {
|
|||||||
|
|
||||||
err = vlt.AddSecret(testSecretName, second, true)
|
err = vlt.AddSecret(testSecretName, second, true)
|
||||||
|
|
||||||
var noMatch *age.NoIdentityMatchError
|
require.ErrorIs(t, err, secret.ErrWrongPassphrase)
|
||||||
|
|
||||||
require.ErrorAs(t, err, &noMatch)
|
|
||||||
assert.Equal(t, before, dirContents(t, fs, secretDir))
|
assert.Equal(t, before, dirContents(t, fs, secretDir))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user