mirror of https://github.com/restic/restic.git
Merge pull request #3283 from dennypage/master
Treat an empty password as a fatal error for repository init.
This commit is contained in:
commit
814a399e4c
|
@ -0,0 +1,9 @@
|
||||||
|
Bugfix: Treat an empty password as a fatal error for repository init
|
||||||
|
|
||||||
|
When attempting to initialize a new repository, if an empty password was
|
||||||
|
supplied, the repository would be created but the init command would return
|
||||||
|
an error with a stack trace. Now, if an empty password is provided, it is
|
||||||
|
treated as a fatal error, and no repository is created.
|
||||||
|
|
||||||
|
https://github.com/restic/restic/issues/3214
|
||||||
|
https://github.com/restic/restic/pull/3283
|
|
@ -53,11 +53,6 @@ func runInit(opts InitOptions, gopts GlobalOptions, args []string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
be, err := create(repo, gopts.extended)
|
|
||||||
if err != nil {
|
|
||||||
return errors.Fatalf("create repository at %s failed: %v\n", location.StripPassword(gopts.Repo), err)
|
|
||||||
}
|
|
||||||
|
|
||||||
gopts.password, err = ReadPasswordTwice(gopts,
|
gopts.password, err = ReadPasswordTwice(gopts,
|
||||||
"enter password for new repository: ",
|
"enter password for new repository: ",
|
||||||
"enter password again: ")
|
"enter password again: ")
|
||||||
|
@ -65,6 +60,11 @@ func runInit(opts InitOptions, gopts GlobalOptions, args []string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
be, err := create(repo, gopts.extended)
|
||||||
|
if err != nil {
|
||||||
|
return errors.Fatalf("create repository at %s failed: %v\n", location.StripPassword(gopts.Repo), err)
|
||||||
|
}
|
||||||
|
|
||||||
s := repository.New(be)
|
s := repository.New(be)
|
||||||
|
|
||||||
err = s.Init(gopts.ctx, gopts.password, chunkerPolynomial)
|
err = s.Init(gopts.ctx, gopts.password, chunkerPolynomial)
|
||||||
|
|
|
@ -364,7 +364,7 @@ func ReadPassword(opts GlobalOptions, prompt string) (string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(password) == 0 {
|
if len(password) == 0 {
|
||||||
return "", errors.New("an empty password is not a password")
|
return "", errors.Fatal("an empty password is not a password")
|
||||||
}
|
}
|
||||||
|
|
||||||
return password, nil
|
return password, nil
|
||||||
|
|
Loading…
Reference in New Issue