TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-12-12 03:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor configuration of cache dir and repository

Browse Source
This commit is contained in:
Alexander Neumann
2015-05-09 21:50:10 +02:00
parent 848793df84
commit f5537e7a0e
6 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
cmd/restic/cmd_key.go
View File

@@ -56,15 +56,28 @@ func listKeys(s *repository.Repository) error {
return nil
}
func addKey(s *repository.Repository) error {
pw := readPassword("RESTIC_NEWPASSWORD", "enter password for new key: ")
pw2 := readPassword("RESTIC_NEWPASSWORD", "enter password again: ")
func getNewPassword() (string, error) {
newPassword := os.Getenv("RESTIC_NEWPASSWORD")
if pw != pw2 {
return errors.New("passwords do not match")
if newPassword == "" {
newPassword = readPassword("enter password for new key: ")
newPassword2 := readPassword("enter password again: ")
if newPassword != newPassword2 {
return "", errors.New("passwords do not match")
}
}
id, err := repository.AddKey(s, pw, s.Key())
return newPassword, nil
}
func addKey(repo *repository.Repository) error {
newPassword, err := getNewPassword()
if err != nil {
return err
}
id, err := repository.AddKey(repo, newPassword, repo.Key())
if err != nil {
return fmt.Errorf("creating new key failed: %v\n", err)
}
@@ -88,22 +101,18 @@ func deleteKey(repo *repository.Repository, name string) error {
return nil
}
func changePassword(s *repository.Repository) error {
pw := readPassword("RESTIC_NEWPASSWORD", "enter password for new key: ")
pw2 := readPassword("RESTIC_NEWPASSWORD", "enter password again: ")
if pw != pw2 {
return errors.New("passwords do not match")
func changePassword(repo *repository.Repository) error {
newPassword, err := getNewPassword()
if err != nil {
return err
}
// add new key
id, err := repository.AddKey(s, pw, s.Key())
id, err := repository.AddKey(repo, newPassword, repo.Key())
if err != nil {
return fmt.Errorf("creating new key failed: %v\n", err)
}
// remove old key
err = s.Backend().Remove(backend.Key, s.KeyName())
err = repo.Backend().Remove(backend.Key, repo.KeyName())
if err != nil {
return err
}