mirror/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-23 00:07:25 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4853 from MichaelEischer/safer-repo-init

Browse source 
init: double check that no repository exists yet
This commit is contained in:
Michael Eischer 2024-06-09 11:27:45 +02:00 committed by GitHub
commit da4512738a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/repository/repository.go
View file

@ -772,6 +772,14 @@ func (r *Repository) Init(ctx context.Context, version uint, password string, ch
if err == nil {
return errors.New("repository master key and config already initialized")
}
// double check to make sure that a repository is not accidentally reinitialized
// if the backend somehow fails to stat the config file. An initialized repository
// must always contain at least one key file.
if err := r.List(ctx, restic.KeyFile, func(_ restic.ID, _ int64) error {
return errors.New("repository already contains keys")
}); err != nil {
return err
}
cfg, err := restic.CreateConfig(version)
if err != nil {

17
internal/repository/repository_test.go
View file

@ -9,6 +9,7 @@ import (
"math/rand"
"os"
"path/filepath"
"strings"
"sync"
"testing"
"time"
@ -457,3 +458,19 @@ func TestListPack(t *testing.T) {
rtest.Assert(t, !c.Has(backend.Handle{Type: restic.PackFile, Name: packID.String()}), "tree pack should no longer be cached as ListPack does not set IsMetadata in the backend.Handle")
}
func TestNoDoubleInit(t *testing.T) {
r, be := repository.TestRepositoryWithVersion(t, restic.StableRepoVersion)
repo, err := repository.New(be, repository.Options{})
rtest.OK(t, err)
pol := r.Config().ChunkerPolynomial
err = repo.Init(context.TODO(), r.Config().Version, test.TestPassword, &pol)
rtest.Assert(t, strings.Contains(err.Error(), "repository master key and config already initialized"), "expected config exist error, got %q", err)
// must also prevent init if only keys exist
rtest.OK(t, be.Remove(context.TODO(), backend.Handle{Type: backend.ConfigFile}))
err = repo.Init(context.TODO(), r.Config().Version, test.TestPassword, &pol)
rtest.Assert(t, strings.Contains(err.Error(), "repository already contains keys"), "expected already contains keys error, got %q", err)
}