rafaelcaricio/gotosocial
1
0
Fork 0
forked from mirrors/gotosocial
Code Issues Pull requests Projects Releases Packages Wiki Activity

[chore] Do cache-control in a less silly way to avoid writing header twice (#1481)

Browse source 
* do cache-control in a less silly way to avoid writing header twice

* add comment back in
This commit is contained in:
tobi 2023-02-13 12:58:22 +01:00 committed by GitHub
parent eeca1988ce
commit 041c8e695e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
internal/api/fileserver.go
View file

@ -21,6 +21,7 @@ package api
import (
"github.com/gin-gonic/gin"
"github.com/superseriousbusiness/gotosocial/internal/api/fileserver"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/middleware"
"github.com/superseriousbusiness/gotosocial/internal/processing"
"github.com/superseriousbusiness/gotosocial/internal/router"
@ -30,21 +31,31 @@ type Fileserver struct {
fileserver *fileserver.Module
}
// maxAge returns an appropriate max-age value for the
// storage method that's being used.
//
// The default max-age is very long to reflect that we
// never host different files at the same URL (since
// ULIDs are generated per piece of media), so we can
// easily prevent clients having to fetch files repeatedly.
//
// If we're using non-proxying s3, however, the max age is
// significantly shorter, to ensure that clients don't
// cache redirect responses to expired pre-signed URLs.
func maxAge() string {
if config.GetStorageBackend() == "s3" && !config.GetStorageS3Proxy() {
return "max-age=86400" // 24h
}
return "max-age=604800" // 7d
}
func (f *Fileserver) Route(r router.Router, m ...gin.HandlerFunc) {
fileserverGroup := r.AttachGroup("fileserver")
// attach middlewares appropriate for this group
fileserverGroup.Use(m...)
fileserverGroup.Use(
// Since we'll never host different files at the same
// URL (bc the ULIDs are generated per piece of media),
// it's sensible and safe to use a long cache here, so
// that clients don't keep fetching files over + over again.
//
// Nevertheless, we should use 'private' to indicate
// that there might be media in there which are gated by ACLs.
middleware.CacheControl("private", "max-age=604800"),
)
fileserverGroup.Use(middleware.CacheControl("private", maxAge()))
f.fileserver.Route(fileserverGroup.Handle)
}

7
internal/api/fileserver/servefile.go
View file

@ -88,12 +88,7 @@ func (m *Module) ServeFile(c *gin.Context) {
}
if content.URL != nil {
// This is a non-local S3 file we're redirecting to.
// Rewrite the cache control header to reflect the
// TTL of the generated signed link, instead of the
// default very long cache.
const cacheControl = "private,max-age=86400" // 24h
c.Header("Cache-Control", cacheControl)
// This is a non-local, non-proxied S3 file we're redirecting to.
c.Redirect(http.StatusFound, content.URL.String())
return
}