Merge pull request #3776 from wjiec/bugfix/maxkeys-in-search

Limit number of key files tested while opening a repository

changelog/unreleased/pull-3776

@@ -0,0 +1,10 @@
+Bugfix: Limit number of key files tested while opening a repository
+
+Previously, restic tested the password against every key in the repository, when
+there are more and more keys in the repository, opening the repository becomes
+slower and slower.
+
+Now restic tests password against up to 20 key file in the repository. Alternatively,
+you can use `--key-hint=<Key ID>` to specify the key file to be used.
+
+https://github.com/restic/restic/pull/3776

cmd/restic/integration_test.go

@@ -1040,7 +1040,7 @@ func testRunKeyAddNewKeyUserHost(t testing.TB, gopts GlobalOptions) {
 
 	repo, err := OpenRepository(gopts)
 	rtest.OK(t, err)
-	key, err := repository.SearchKey(gopts.ctx, repo, testKeyNewPassword, 1, "")
+	key, err := repository.SearchKey(gopts.ctx, repo, testKeyNewPassword, 2, "")
 	rtest.OK(t, err)
 
 	rtest.Equals(t, "john", key.Username)

internal/repository/key.go

@@ -137,6 +137,7 @@ func SearchKey(ctx context.Context, s *Repository, password string, maxKeys int,
 
 	// try at most maxKeys keys in repo
 	err = s.Backend().List(listCtx, restic.KeyFile, func(fi restic.FileInfo) error {
+		checked++
 		if maxKeys > 0 && checked > maxKeys {
 			return ErrMaxKeysReached
 		}