mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1227 from restic/fix-1204-2 

Handle invalid key file
This commit is contained in:
Alexander Neumann 2017-09-10 14:12:51 +02:00
parent 6f8eba9c28 e846e14965
commit 1a08a8219f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/restic/global.go
View File

@ -319,7 +319,7 @@ func OpenRepository(opts GlobalOptions) (*repository.Repository, error) {
err = s.SearchKey(context.TODO(), opts.password, maxKeys) err = s.SearchKey(context.TODO(), opts.password, maxKeys)
if err != nil { if err != nil {
return nil, errors.Fatalf("unable to open repo: %v", err) return nil, err
} }
return s, nil return s, nil

9
internal/repository/key.go
View File

@ -19,10 +19,10 @@ import (
var ( var (
// ErrNoKeyFound is returned when no key for the repository could be decrypted. // ErrNoKeyFound is returned when no key for the repository could be decrypted.
ErrNoKeyFound = errors.New("wrong password or no key found") ErrNoKeyFound = errors.Fatal("wrong password or no key found")
// ErrMaxKeysReached is returned when the maximum number of keys was checked and no key could be found. // ErrMaxKeysReached is returned when the maximum number of keys was checked and no key could be found.
ErrMaxKeysReached = errors.New("maximum number of keys reached") ErrMaxKeysReached = errors.Fatal("maximum number of keys reached")
) )
// Key represents an encrypted master key for a repository. // Key represents an encrypted master key for a repository.
@ -133,7 +133,10 @@ func SearchKey(ctx context.Context, s *Repository, password string, maxKeys int)
continue continue
} }
return nil, err if err != nil {
debug.Log("unable to open key %v: %v\n", err)
continue
}
} }
debug.Log("successfully opened key %v", name[:12]) debug.Log("successfully opened key %v", name[:12])

2
internal/repository/parallel.go
View File

@ -68,7 +68,7 @@ func ParallelWorkFuncParseID(f ParallelIDWorkFunc) ParallelWorkFunc {
id, err := restic.ParseID(s) id, err := restic.ParseID(s)
if err != nil { if err != nil {
debug.Log("invalid ID %q: %v", id, err) debug.Log("invalid ID %q: %v", id, err)
return err return nil
} }
return f(ctx, id) return f(ctx, id)