Merge pull request #2632 from whoshuu/feature/improve-s3-driver

Improve s3 driver
This commit is contained in:
Olivier 2018-08-10 15:01:11 -07:00 committed by GitHub
commit 7d9f067716
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 4 deletions

View file

@ -14,6 +14,7 @@ package s3
import ( import (
"bytes" "bytes"
"context" "context"
"crypto/tls"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@ -90,6 +91,7 @@ type DriverParameters struct {
Encrypt bool Encrypt bool
KeyID string KeyID string
Secure bool Secure bool
SkipVerify bool
V4Auth bool V4Auth bool
ChunkSize int64 ChunkSize int64
MultipartCopyChunkSize int64 MultipartCopyChunkSize int64
@ -248,6 +250,23 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
return nil, fmt.Errorf("The secure parameter should be a boolean") return nil, fmt.Errorf("The secure parameter should be a boolean")
} }
skipVerifyBool := false
skipVerify := parameters["skipverify"]
switch skipVerify := skipVerify.(type) {
case string:
b, err := strconv.ParseBool(skipVerify)
if err != nil {
return nil, fmt.Errorf("The skipVerify parameter should be a boolean")
}
skipVerifyBool = b
case bool:
skipVerifyBool = skipVerify
case nil:
// do nothing
default:
return nil, fmt.Errorf("The skipVerify parameter should be a boolean")
}
v4Bool := true v4Bool := true
v4auth := parameters["v4auth"] v4auth := parameters["v4auth"]
switch v4auth := v4auth.(type) { switch v4auth := v4auth.(type) {
@ -344,6 +363,7 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
encryptBool, encryptBool,
fmt.Sprint(keyID), fmt.Sprint(keyID),
secureBool, secureBool,
skipVerifyBool,
v4Bool, v4Bool,
chunkSize, chunkSize,
multipartCopyChunkSize, multipartCopyChunkSize,
@ -424,10 +444,22 @@ func New(params DriverParameters) (*Driver, error) {
awsConfig.WithRegion(params.Region) awsConfig.WithRegion(params.Region)
awsConfig.WithDisableSSL(!params.Secure) awsConfig.WithDisableSSL(!params.Secure)
if params.UserAgent != "" || params.SkipVerify {
httpTransport := http.DefaultTransport
if params.SkipVerify {
httpTransport = &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
}
if params.UserAgent != "" { if params.UserAgent != "" {
awsConfig.WithHTTPClient(&http.Client{ awsConfig.WithHTTPClient(&http.Client{
Transport: transport.NewTransport(http.DefaultTransport, transport.NewHeaderRequestModifier(http.Header{http.CanonicalHeaderKey("User-Agent"): []string{params.UserAgent}})), Transport: transport.NewTransport(httpTransport, transport.NewHeaderRequestModifier(http.Header{http.CanonicalHeaderKey("User-Agent"): []string{params.UserAgent}})),
}) })
} else {
awsConfig.WithHTTPClient(&http.Client{
Transport: transport.NewTransport(httpTransport),
})
}
} }
sess, err = session.NewSession(awsConfig) sess, err = session.NewSession(awsConfig)

View file

@ -31,6 +31,7 @@ func init() {
encrypt := os.Getenv("S3_ENCRYPT") encrypt := os.Getenv("S3_ENCRYPT")
keyID := os.Getenv("S3_KEY_ID") keyID := os.Getenv("S3_KEY_ID")
secure := os.Getenv("S3_SECURE") secure := os.Getenv("S3_SECURE")
skipVerify := os.Getenv("S3_SKIP_VERIFY")
v4Auth := os.Getenv("S3_V4_AUTH") v4Auth := os.Getenv("S3_V4_AUTH")
region := os.Getenv("AWS_REGION") region := os.Getenv("AWS_REGION")
objectACL := os.Getenv("S3_OBJECT_ACL") objectACL := os.Getenv("S3_OBJECT_ACL")
@ -59,6 +60,14 @@ func init() {
} }
} }
skipVerifyBool := false
if skipVerify != "" {
skipVerifyBool, err = strconv.ParseBool(skipVerify)
if err != nil {
return nil, err
}
}
v4Bool := true v4Bool := true
if v4Auth != "" { if v4Auth != "" {
v4Bool, err = strconv.ParseBool(v4Auth) v4Bool, err = strconv.ParseBool(v4Auth)
@ -76,6 +85,7 @@ func init() {
encryptBool, encryptBool,
keyID, keyID,
secureBool, secureBool,
skipVerifyBool,
v4Bool, v4Bool,
minChunkSize, minChunkSize,
defaultMultipartCopyChunkSize, defaultMultipartCopyChunkSize,