TrueCloudLab/distribution
13
0
Fork 3
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #2230 from tt/support-session-token

Browse source 
Support session token
This commit is contained in:
Derek McGowan 2017-04-26 12:53:50 -07:00 committed by GitHub
commit f4a1d3e0d5
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
registry/storage/driver/s3-aws/s3.go
View file

@ -98,6 +98,7 @@ type DriverParameters struct {
StorageClass string StorageClass string
UserAgent string UserAgent string
ObjectACL string ObjectACL string
SessionToken string
} }
func init() { func init() {
@ -331,6 +332,8 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
objectACL = objectACLString objectACL = objectACLString
} }
sessionToken := ""
params := DriverParameters{ params := DriverParameters{
fmt.Sprint(accessKey), fmt.Sprint(accessKey),
fmt.Sprint(secretKey), fmt.Sprint(secretKey),
@ -349,6 +352,7 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
storageClass, storageClass,
fmt.Sprint(userAgent), fmt.Sprint(userAgent),
objectACL, objectACL,
fmt.Sprint(sessionToken),
} }
return New(params) return New(params)
@ -398,6 +402,7 @@ func New(params DriverParameters) (*Driver, error) {
Value: credentials.Value{ Value: credentials.Value{
AccessKeyID: params.AccessKey, AccessKeyID: params.AccessKey,
SecretAccessKey: params.SecretKey, SecretAccessKey: params.SecretKey,
SessionToken: params.SessionToken,
}, },
}, },
&credentials.EnvProvider{}, &credentials.EnvProvider{},

2
registry/storage/driver/s3-aws/s3_test.go
View file

@ -36,6 +36,7 @@ func init() {
objectACL := os.Getenv("S3_OBJECT_ACL") objectACL := os.Getenv("S3_OBJECT_ACL")
root, err := ioutil.TempDir("", "driver-") root, err := ioutil.TempDir("", "driver-")
regionEndpoint := os.Getenv("REGION_ENDPOINT") regionEndpoint := os.Getenv("REGION_ENDPOINT")
sessionToken := os.Getenv("AWS_SESSION_TOKEN")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -84,6 +85,7 @@ func init() {
storageClass, storageClass,
driverName + "-test", driverName + "-test",
objectACL, objectACL,
sessionToken,
} }
return New(parameters) return New(parameters)

3
registry/storage/driver/s3-aws/s3_v2_signer.go
View file

@ -137,6 +137,9 @@ func (v2 *signer) Sign() error {
host, canonicalPath := parsedURL.Host, parsedURL.Path host, canonicalPath := parsedURL.Host, parsedURL.Path
v2.Request.Header["Host"] = []string{host} v2.Request.Header["Host"] = []string{host}
v2.Request.Header["date"] = []string{v2.Time.In(time.UTC).Format(time.RFC1123)} v2.Request.Header["date"] = []string{v2.Time.In(time.UTC).Format(time.RFC1123)}
if credValue.SessionToken != "" {
v2.Request.Header["x-amz-security-token"] = []string{credValue.SessionToken}
}
smap = make(map[string]string) smap = make(map[string]string)
for k, v := range headers { for k, v := range headers {