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

Merge pull request #2184 from sakeven/master

Browse source 
Check whether must use v4 auth in specific aws region ( storage driver s3-goamz )
This commit is contained in:
Aaron Lehmann 2017-02-13 22:29:02 -08:00 committed by GitHub
commit 62d8d910b5
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
registry/storage/driver/s3-goamz/s3.go
View file

@ -266,10 +266,8 @@ func New(params DriverParameters) (*Driver, error) {
if params.V4Auth { if params.V4Auth {
s3obj.Signature = aws.V4Signature s3obj.Signature = aws.V4Signature
} else { } else if mustV4Auth(params.Region.Name) {
if params.Region.Name == "eu-central-1" { return nil, fmt.Errorf("The %s region only works with v4 authentication", params.Region.Name)
return nil, fmt.Errorf("The eu-central-1 region only works with v4 authentication")
}
} }
bucket := s3obj.Bucket(params.Bucket) bucket := s3obj.Bucket(params.Bucket)
@ -573,6 +571,17 @@ func getPermissions() s3.ACL {
return s3.Private return s3.Private
} }
// mustV4Auth checks whether must use v4 auth in specific region.
// Please see documentation at http://docs.aws.amazon.com/general/latest/gr/signature-version-2.html
func mustV4Auth(region string) bool {
switch region {
case "eu-central-1", "cn-north-1", "us-east-2",
"ca-central-1", "ap-south-1", "ap-northeast-2", "eu-west-2":
return true
}
return false
}
func (d *driver) getContentType() string { func (d *driver) getContentType() string {
return "application/octet-stream" return "application/octet-stream"
} }