TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

drive, gcs: fix service account authentication - fixes #2279

Browse source 
This fixes a problem introduced in b78af517de where it would
attempt to read a non-existent service account file.
This commit is contained in:
Nick Craig-Wood 2018-04-28 09:33:43 +01:00
parent 0daced29db
commit a3bf6b9c2c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/drive/drive.go
View file

@ -464,8 +464,8 @@ func createOAuthClient(name string) (*http.Client, error) {
// try loading service account credentials from env variable, then from a file // try loading service account credentials from env variable, then from a file
serviceAccountCreds := []byte(config.FileGet(name, "service_account_credentials")) serviceAccountCreds := []byte(config.FileGet(name, "service_account_credentials"))
if len(serviceAccountCreds) == 0 {
serviceAccountPath := config.FileGet(name, "service_account_file") serviceAccountPath := config.FileGet(name, "service_account_file")
if len(serviceAccountCreds) == 0 && serviceAccountPath != "" {
loadedCreds, err := ioutil.ReadFile(os.ExpandEnv(serviceAccountPath)) loadedCreds, err := ioutil.ReadFile(os.ExpandEnv(serviceAccountPath))
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error opening service account credentials file") return nil, errors.Wrap(err, "error opening service account credentials file")

2
backend/googlecloudstorage/googlecloudstorage.go
View file

@ -293,8 +293,8 @@ func NewFs(name, root string) (fs.Fs, error) {
// try loading service account credentials from env variable, then from a file // try loading service account credentials from env variable, then from a file
serviceAccountCreds := []byte(config.FileGet(name, "service_account_credentials")) serviceAccountCreds := []byte(config.FileGet(name, "service_account_credentials"))
if len(serviceAccountCreds) == 0 {
serviceAccountPath := config.FileGet(name, "service_account_file") serviceAccountPath := config.FileGet(name, "service_account_file")
if len(serviceAccountCreds) == 0 && serviceAccountPath != "" {
loadedCreds, err := ioutil.ReadFile(os.ExpandEnv(serviceAccountPath)) loadedCreds, err := ioutil.ReadFile(os.ExpandEnv(serviceAccountPath))
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error opening service account credentials file") return nil, errors.Wrap(err, "error opening service account credentials file")