Load a config that has no age recipient (closes #221)
check / check (push) Successful in 13m47s
check / check (push) Successful in 13m47s
The README's steps for restoring on another machine failed at the first command: `config init` wrote a placeholder recipient, and `config.Load` rejects any recipient that does not parse. `config init` now writes an empty `age_recipients` list, `config.Load` accepts an empty list, and `snapshot create` refuses to start without a recipient. A malformed recipient is still rejected at load. The recovery-host test now builds its config with `config init` and `config set` and reads it through `config.Load`, so it imports `internal/cli`. On a fresh file, `config set age_recipients.0` writes the list in flow style (`[age1...]`). Model: opus-5-5
This commit was merged in pull request #244.
This commit is contained in:
@@ -10,6 +10,7 @@ import (
|
||||
"github.com/spf13/afero"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
"sneak.berlin/go/vaultik/internal/cli"
|
||||
"sneak.berlin/go/vaultik/internal/config"
|
||||
"sneak.berlin/go/vaultik/internal/database"
|
||||
"sneak.berlin/go/vaultik/internal/log"
|
||||
@@ -27,10 +28,12 @@ import (
|
||||
//
|
||||
// The backup half writes a snapshot with one index and hostname. The
|
||||
// restore half throws that index away entirely: a fresh, empty index and
|
||||
// a config that shares nothing with the original but the storage location
|
||||
// and the secret key. If restore or verify needed the original local
|
||||
// index — or the human snapshot ID that only that index holds — this test
|
||||
// could not run, because the recovery host can know neither.
|
||||
// a config written by `config init` and `config set storage_url`, as in
|
||||
// the README's steps for restoring on another machine, which shares
|
||||
// nothing with the original but the storage location and the secret key.
|
||||
// If restore or verify needed the original local index — or
|
||||
// the human snapshot ID that only that index holds — this test could not
|
||||
// run, because the recovery host can know neither.
|
||||
func TestRestoreOnAnotherMachine(t *testing.T) {
|
||||
log.Initialize(log.Config{})
|
||||
t.Parallel()
|
||||
@@ -58,7 +61,12 @@ func TestRestoreOnAnotherMachine(t *testing.T) {
|
||||
|
||||
// Recovery host: a fresh empty index, a different hostname, and no
|
||||
// age_recipients — only the secret key and the same storage location.
|
||||
recovery, stdout := newRecoveryHost(ctx, t, fs, storer)
|
||||
configPath := filepath.Join(tempDir, "config.yml")
|
||||
runVaultikCommand(t, "--config", configPath, "config", "init")
|
||||
runVaultikCommand(t, "--config", configPath,
|
||||
"config", "set", "storage_url", "file://"+storeDir)
|
||||
|
||||
recovery, stdout := newRecoveryHost(ctx, t, fs, storer, configPath)
|
||||
|
||||
// The recovery index really is empty. This is the assertion that makes
|
||||
// the test a guard against restore quietly depending on the original
|
||||
@@ -93,6 +101,10 @@ func TestRestoreOnAnotherMachine(t *testing.T) {
|
||||
remote.RemoteKey, &vaultik.VerifyOptions{Deep: true}))
|
||||
|
||||
assertRestoredTreeMatches(t, fs, restoreDir, sourceFiles)
|
||||
|
||||
// With no public key configured, a backup must refuse to start.
|
||||
err = recovery.CreateSnapshot(&vaultik.SnapshotCreateOptions{Cron: true})
|
||||
require.ErrorContains(t, err, "age_recipients")
|
||||
}
|
||||
|
||||
// writeRecoverySourceTree writes a small source tree spanning several
|
||||
@@ -118,14 +130,24 @@ func writeRecoverySourceTree(
|
||||
}
|
||||
|
||||
// newRecoveryHost builds the Vaultik a replacement machine would run: an
|
||||
// empty in-memory index, a hostname different from the backup host, no
|
||||
// age_recipients, and only the secret key plus the shared storer. It
|
||||
// returns the instance and the buffer its stdout is wired to.
|
||||
// empty in-memory index, a hostname different from the backup host, and
|
||||
// only the secret key plus the shared storer. Its config is read from
|
||||
// configPath by config.Load, as every command reads it. It returns the
|
||||
// instance and the buffer its stdout is wired to.
|
||||
func newRecoveryHost(
|
||||
ctx context.Context, t *testing.T, fs afero.Fs, storer storage.Storer,
|
||||
configPath string,
|
||||
) (*vaultik.Vaultik, *bytes.Buffer) {
|
||||
t.Helper()
|
||||
|
||||
cfg, err := config.Load(configPath)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Set directly rather than through VAULTIK_AGE_SECRET_KEY, which a
|
||||
// parallel test cannot change.
|
||||
cfg.AgeSecretKey = testAgeSecretKey
|
||||
cfg.Hostname = "recovery-host"
|
||||
|
||||
recoveryDB, err := database.New(ctx, ":memory:")
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(func() { _ = recoveryDB.Close() })
|
||||
@@ -133,10 +155,7 @@ func newRecoveryHost(
|
||||
stdout := &bytes.Buffer{}
|
||||
|
||||
recovery := &vaultik.Vaultik{
|
||||
Config: &config.Config{
|
||||
AgeSecretKey: testAgeSecretKey,
|
||||
Hostname: "recovery-host",
|
||||
},
|
||||
Config: cfg,
|
||||
Storage: storer,
|
||||
Fs: fs,
|
||||
Repositories: database.NewRepositories(recoveryDB),
|
||||
@@ -150,6 +169,20 @@ func newRecoveryHost(
|
||||
return recovery, stdout
|
||||
}
|
||||
|
||||
// runVaultikCommand runs one vaultik command line in-process and fails the
|
||||
// test if it returns an error. The command writes the cli package's global
|
||||
// flag variables, so it must not be called from two tests that run at the
|
||||
// same time.
|
||||
func runVaultikCommand(t *testing.T, args ...string) {
|
||||
t.Helper()
|
||||
|
||||
cmd := cli.NewRootCommand()
|
||||
cmd.SetArgs(args)
|
||||
cmd.SetOut(io.Discard)
|
||||
cmd.SetErr(io.Discard)
|
||||
require.NoError(t, cmd.Execute())
|
||||
}
|
||||
|
||||
// assertRestoredTreeMatches byte-compares every restored file against its
|
||||
// source content.
|
||||
func assertRestoredTreeMatches(
|
||||
|
||||
Reference in New Issue
Block a user