KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

oauthutil: copy the config before modifying it

Browse source 
The stops simultaneous use of oauth configs with different client IDs
causing a problem.
This commit is contained in:
Nick Craig-Wood 2017-01-16 15:10:08 +00:00
parent 0604d3dbf2
commit 166fd50451
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
oauthutil/oauthutil.go
View file

@ -194,8 +194,11 @@ func Context() context.Context {
// overrideCredentials sets the ClientID and ClientSecret from the // overrideCredentials sets the ClientID and ClientSecret from the
// config file if they are not blank. // config file if they are not blank.
// If any value is overridden, true is returned. // If any value is overridden, true is returned.
func overrideCredentials(name string, config *oauth2.Config) bool { // the origConfig is copied
changed := false func overrideCredentials(name string, origConfig *oauth2.Config) (config *oauth2.Config, changed bool) {
config = new(oauth2.Config)
*config = *origConfig
changed = false
ClientID := fs.ConfigFileGet(name, fs.ConfigClientID) ClientID := fs.ConfigFileGet(name, fs.ConfigClientID)
if ClientID != "" { if ClientID != "" {
config.ClientID = ClientID config.ClientID = ClientID
@ -206,13 +209,13 @@ func overrideCredentials(name string, config *oauth2.Config) bool {
config.ClientSecret = ClientSecret config.ClientSecret = ClientSecret
changed = true changed = true
} }
return changed return config, changed
} }
// NewClient gets a token from the config file and configures a Client // NewClient gets a token from the config file and configures a Client
// with it. It returns the client and a TokenSource which Invalidate may need to be called on // with it. It returns the client and a TokenSource which Invalidate may need to be called on
func NewClient(name string, config *oauth2.Config) (*http.Client, *TokenSource, error) { func NewClient(name string, config *oauth2.Config) (*http.Client, *TokenSource, error) {
overrideCredentials(name, config) config, _ = overrideCredentials(name, config)
token, err := getToken(name) token, err := getToken(name)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
@ -237,7 +240,7 @@ func NewClient(name string, config *oauth2.Config) (*http.Client, *TokenSource,
// //
// It may run an internal webserver to receive the results // It may run an internal webserver to receive the results
func Config(id, name string, config *oauth2.Config) error { func Config(id, name string, config *oauth2.Config) error {
changed := overrideCredentials(name, config) config, changed := overrideCredentials(name, config)
automatic := fs.ConfigFileGet(name, fs.ConfigAutomatic) != "" automatic := fs.ConfigFileGet(name, fs.ConfigAutomatic) != ""
// See if already have a token // See if already have a token