KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #1668 from restic/fix-1663

Browse source 
Return the first password/key which works
This commit is contained in:
Alexander Neumann 2018-03-11 21:51:54 +01:00
commit 817890794d
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal/repository/key.go
View file

@ -115,8 +115,11 @@ func OpenKey(ctx context.Context, s *Repository, name string, password string) (
func SearchKey(ctx context.Context, s *Repository, password string, maxKeys int) (k *Key, err error) { func SearchKey(ctx context.Context, s *Repository, password string, maxKeys int) (k *Key, err error) {
checked := 0 checked := 0
// try at most maxKeysForSearch keys in repo listCtx, cancel := context.WithCancel(ctx)
err = s.Backend().List(ctx, restic.KeyFile, func(fi restic.FileInfo) error { defer cancel()
// try at most maxKeys keys in repo
err = s.Backend().List(listCtx, restic.KeyFile, func(fi restic.FileInfo) error {
if maxKeys > 0 && checked > maxKeys { if maxKeys > 0 && checked > maxKeys {
return ErrMaxKeysReached return ErrMaxKeysReached
} }
@ -142,9 +145,14 @@ func SearchKey(ctx context.Context, s *Repository, password string, maxKeys int)
debug.Log("successfully opened key %v", fi.Name) debug.Log("successfully opened key %v", fi.Name)
k = key k = key
cancel()
return nil return nil
}) })
if err == context.Canceled {
err = nil
}
if err != nil { if err != nil {
return nil, err return nil, err
} }