diff options
Diffstat (limited to 'app/file.go')
| -rw-r--r-- | app/file.go | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/app/file.go b/app/file.go index 31df445b3..74f70ec16 100644 --- a/app/file.go +++ b/app/file.go @@ -28,6 +28,7 @@ import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" s3 "github.com/minio/minio-go" + "github.com/minio/minio-go/pkg/credentials" "github.com/rwcarlsen/goexif/exif" _ "golang.org/x/image/bmp" ) @@ -60,11 +61,17 @@ const ( // Similar to s3.New() but allows initialization of signature v2 or signature v4 client. // If signV2 input is false, function always returns signature v4. -func s3New(endpoint, accessKey, secretKey string, secure bool, signV2 bool) (*s3.Client, error) { +// +// Additionally this function also takes a user defined region, if set +// disables automatic region lookup. +func s3New(endpoint, accessKey, secretKey string, secure bool, signV2 bool, region string) (*s3.Client, error) { + var creds *credentials.Credentials if signV2 { - return s3.NewV2(endpoint, accessKey, secretKey, secure) + creds = credentials.NewStatic(accessKey, secretKey, "", credentials.SignatureV2) + } else { + creds = credentials.NewStatic(accessKey, secretKey, "", credentials.SignatureV4) } - return s3.NewV4(endpoint, accessKey, secretKey, secure) + return s3.NewWithCredentials(endpoint, creds, secure, region) } func ReadFile(path string) ([]byte, *model.AppError) { @@ -74,7 +81,8 @@ func ReadFile(path string) ([]byte, *model.AppError) { secretKey := utils.Cfg.FileSettings.AmazonS3SecretAccessKey secure := *utils.Cfg.FileSettings.AmazonS3SSL signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2 - s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2) + region := utils.Cfg.FileSettings.AmazonS3Region + s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2, region) if err != nil { return nil, model.NewLocAppError("ReadFile", "api.file.read_file.s3.app_error", nil, err.Error()) } @@ -107,7 +115,8 @@ func MoveFile(oldPath, newPath string) *model.AppError { secretKey := utils.Cfg.FileSettings.AmazonS3SecretAccessKey secure := *utils.Cfg.FileSettings.AmazonS3SSL signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2 - s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2) + region := utils.Cfg.FileSettings.AmazonS3Region + s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2, region) if err != nil { return model.NewLocAppError("moveFile", "api.file.write_file.s3.app_error", nil, err.Error()) } @@ -146,7 +155,8 @@ func WriteFile(f []byte, path string) *model.AppError { secretKey := utils.Cfg.FileSettings.AmazonS3SecretAccessKey secure := *utils.Cfg.FileSettings.AmazonS3SSL signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2 - s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2) + region := utils.Cfg.FileSettings.AmazonS3Region + s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2, region) if err != nil { return model.NewLocAppError("WriteFile", "api.file.write_file.s3.app_error", nil, err.Error()) } |