TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-08-22 01:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

repository: Introduce RemoveKey function

Browse Source 
This replaces directly removing keys via the backend.
This commit is contained in:
Michael Eischer
2024-01-21 20:38:42 +01:00
parent 6696195f38
commit c13bf0b607
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/repository/key.go
View File

@@ -285,6 +285,15 @@ func AddKey(ctx context.Context, s *Repository, password, username, hostname str
return newkey, nil
}
func RemoveKey(ctx context.Context, repo *Repository, id restic.ID) error {
if id == repo.KeyID() {
return errors.New("refusing to remove key currently used to access repository")
}
h := backend.Handle{Type: restic.KeyFile, Name: id.String()}
return repo.be.Remove(ctx, h)
}
func (k *Key) String() string {
if k == nil {
return "<Key nil>"

13
internal/repository/repository.go
View File

@@ -743,12 +743,19 @@ func (r *Repository) SearchKey(ctx context.Context, password string, maxKeys int
return err
}
oldKey := r.key
oldKeyID := r.keyID
r.key = key.master
r.keyID = key.ID()
cfg, err := restic.LoadConfig(ctx, r)
if err == crypto.ErrUnauthenticated {
return fmt.Errorf("config or key %v is damaged: %w", key.ID(), err)
} else if err != nil {
if err != nil {
r.key = oldKey
r.keyID = oldKeyID
if err == crypto.ErrUnauthenticated {
return fmt.Errorf("config or key %v is damaged: %w", key.ID(), err)
}
return fmt.Errorf("config cannot be loaded: %w", err)
}