"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
config: add error if RCLONE_CONFIG_PASS was supplied but didn't decrypt config
n4n5ff9cbab5fa36
diff --git a/fs/config/crypt.go b/fs/config/crypt.goindex 4a68d4159..4b356580c 100644--- a/fs/config/crypt.go+++ b/fs/config/crypt.go@@ -51,6 +51,7 @@ func Decrypt(b io.ReadSeeker) (io.Reader, error) {ctx := context.Background()ci := fs.GetConfig(ctx)var usingPasswordCommand bool+ var usingEnvPassword bool// Find first non-empty liner := bufio.NewReader(b)@@ -99,15 +100,18 @@ func Decrypt(b io.ReadSeeker) (io.Reader, error) {} else {usingPasswordCommand = false- envpw := os.Getenv("RCLONE_CONFIG_PASS")+ envPassword := os.Getenv("RCLONE_CONFIG_PASS")- if envpw != "" {- err := SetConfigPassword(envpw)+ if envPassword != "" {+ usingEnvPassword = true+ err := SetConfigPassword(envPassword)if err != nil {fs.Errorf(nil, "Using RCLONE_CONFIG_PASS returned: %v", err)} else {fs.Debugf(nil, "Using RCLONE_CONFIG_PASS password.")}+ } else {+ usingEnvPassword = false}}}@@ -144,6 +148,9 @@ func Decrypt(b io.ReadSeeker) (io.Reader, error) {if usingPasswordCommand {return nil, errors.New("using --password-command derived password, unable to decrypt configuration")}+ if usingEnvPassword {+ return nil, errors.New("using RCLONE_CONFIG_PASS env password, unable to decrypt configuration")+ }if !ci.AskPassword {return nil, errors.New("unable to decrypt configuration and not allowed to ask for password - set RCLONE_CONFIG_PASS to your configuration password")}