vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixes an IAM role authentication bug

Browse source 
More specifically, the driver panics if initialized with
FromParameters with empty accesskey or secretkey.
This commit is contained in:
Andrey Kostov 2015-01-23 15:50:55 -08:00
parent 75c1b2bae7
commit 34f86b9ad6
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
storagedriver/s3/s3.go
View file

@ -82,8 +82,14 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
// Providing no values for these is valid in case the user is authenticating // Providing no values for these is valid in case the user is authenticating
// with an IAM on an ec2 instance (in which case the instance credentials will // with an IAM on an ec2 instance (in which case the instance credentials will
// be summoned when GetAuth is called) // be summoned when GetAuth is called)
accessKey, _ := parameters["accesskey"] accessKey, ok := parameters["accesskey"]
secretKey, _ := parameters["secretkey"] if !ok {
accessKey = ""
}
secretKey, ok := parameters["secretkey"]
if !ok {
secretKey = ""
}
regionName, ok := parameters["region"] regionName, ok := parameters["region"]
if !ok || fmt.Sprint(regionName) == "" { if !ok || fmt.Sprint(regionName) == "" {