SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

[bugfix]: Prevent extension of S3 presigned url TTL (#1208) 

Thanks :)
This commit is contained in:
Dominik Süß 2022-12-05 11:09:22 +01:00 committed by GitHub
parent 847e7c7c3a
commit 611df7b22d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/storage/storage.go
View File

@ -26,7 +26,7 @@ import (
"path" "path"
"time" "time"
"codeberg.org/gruf/go-cache/v3" "codeberg.org/gruf/go-cache/v3/ttl"
"codeberg.org/gruf/go-store/v2/kv" "codeberg.org/gruf/go-store/v2/kv"
"codeberg.org/gruf/go-store/v2/storage" "codeberg.org/gruf/go-store/v2/storage"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
@ -52,7 +52,7 @@ type Driver struct {
// S3-only parameters // S3-only parameters
Proxy bool Proxy bool
Bucket string Bucket string
PresignedCache cache.Cache[string, *url.URL] PresignedCache *ttl.Cache[string, *url.URL]
} }
// URL will return a presigned GET object URL, but only if running on S3 storage with proxying disabled. // URL will return a presigned GET object URL, but only if running on S3 storage with proxying disabled.
@ -63,8 +63,9 @@ func (d *Driver) URL(ctx context.Context, key string) *url.URL {
return nil return nil
} }
if u, ok := d.PresignedCache.Get(key); ok { // access the cache member directly to avoid extending the TTL
return u if u, ok := d.PresignedCache.Cache.Get(key); ok {
return u.Value
} }
u, err := s3.Client().PresignedGetObject(ctx, d.Bucket, key, urlCacheTTL, url.Values{ u, err := s3.Client().PresignedGetObject(ctx, d.Bucket, key, urlCacheTTL, url.Values{
@ -139,7 +140,7 @@ func NewS3Storage() (*Driver, error) {
} }
// ttl should be lower than the expiry used by S3 to avoid serving invalid URLs // ttl should be lower than the expiry used by S3 to avoid serving invalid URLs
presignedCache := cache.New[string, *url.URL](0, 1000, urlCacheTTL-urlCacheExpiryFrequency) presignedCache := ttl.New[string, *url.URL](0, 1000, urlCacheTTL-urlCacheExpiryFrequency)
presignedCache.Start(urlCacheExpiryFrequency) presignedCache.Start(urlCacheExpiryFrequency)
return &Driver{ return &Driver{