Merge pull request #4011 from greatroar/backup-stdin-password

cmd: Don't read password from stdin for backup --stdin
This commit is contained in:
Michael Eischer authored and GitHub committed 2022-11-12 19:18:56 +01:00
commit 6fa45d0d39
2 files changed
+26

No files matched your search

+4
View File
@@ -262,6 +262,10 @@ func readFilenamesRaw(r io.Reader) (names []string, err error) {
// Check returns an error when an invalid combination of options was set.
func (opts BackupOptions) Check(gopts GlobalOptions, args []string) error {
if gopts.password == "" {
if opts.Stdin {
return errors.Fatal("cannot read both password and data from stdin")
}
filesFrom := append(append(opts.FilesFrom, opts.FilesFromVerbatim...), opts.FilesFromRaw...)
for _, filename := range filesFrom {
if filename == "-" {