luzifer/cloudbox
1
0
Fork 0
mirror of https://github.com/Luzifer/cloudbox.git synced 2024-09-19 15:12:55 +00:00
Code Issues Releases Wiki Activity

Allow specifying default ACL through parameters

Browse Source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2019-06-30 04:54:04 +02:00
parent ec3cd88486
commit 5cf68673a3
Signed by: luzifer
GPG Key ID: DC2729FDD34BE99E
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
providers/s3/provider.go
View File

@ -23,6 +23,7 @@ import (
type Provider struct { type Provider struct {
bucket string bucket string
bucketRegion string bucketRegion string
defaultACL string
s3 *s3.S3 s3 *s3.S3
} }
@ -51,11 +52,18 @@ func New(uri string) (providers.CloudProvider, error) {
sess := session.Must(session.NewSession(cfg)) sess := session.Must(session.NewSession(cfg))
svc := s3.New(sess) svc := s3.New(sess)
return &Provider{ p := &Provider{
bucket: u.Host, bucket: u.Host,
bucketRegion: region, bucketRegion: region,
defaultACL: s3.ObjectCannedACLPrivate,
s3: svc, s3: svc,
}, nil }
if acl := u.Query().Get("acl"); acl == s3.ObjectCannedACLPublicRead || acl == s3.ObjectCannedACLPrivate {
p.defaultACL = acl
}
return p, nil
} }
func (p *Provider) Capabilities() providers.Capability { func (p *Provider) Capabilities() providers.Capability {
@ -161,7 +169,7 @@ func (p *Provider) getFileACL(relativeName string) string {
}) })
if err != nil { if err != nil {
return s3.ObjectCannedACLPrivate return p.defaultACL
} }
for _, g := range objACL.Grants { for _, g := range objACL.Grants {
@ -173,5 +181,5 @@ func (p *Provider) getFileACL(relativeName string) string {
} }
} }
return s3.ObjectCannedACLPrivate return p.defaultACL
} }