From 12b6cdcd8ce52269be5a1ca8acaae006896808b5 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Thu, 13 Jul 2023 21:27:25 +0200 Subject: [bugfix] Set Vary header correctly on cache-control (#1988) * [bugfix] Set Vary header correctly on cache-control * Prefer activitypub types on AP endpoints * use immutable on file server, vary by range * vary auth on Accept --- internal/api/auth.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'internal/api/auth.go') diff --git a/internal/api/auth.go b/internal/api/auth.go index e2411229d..961caa981 100644 --- a/internal/api/auth.go +++ b/internal/api/auth.go @@ -43,13 +43,16 @@ func (a *Auth) Route(r router.Router, m ...gin.HandlerFunc) { // instantiate + attach shared, non-global middlewares to both of these groups var ( - cacheControlMiddleware = middleware.CacheControl("private", "max-age=120") - sessionMiddleware = middleware.Session(a.sessionName, a.routerSession.Auth, a.routerSession.Crypt) + ccMiddleware = middleware.CacheControl(middleware.CacheControlConfig{ + Directives: []string{"private", "max-age=120"}, + Vary: []string{"Accept", "Accept-Encoding"}, + }) + sessionMiddleware = middleware.Session(a.sessionName, a.routerSession.Auth, a.routerSession.Crypt) ) authGroup.Use(m...) oauthGroup.Use(m...) - authGroup.Use(cacheControlMiddleware, sessionMiddleware) - oauthGroup.Use(cacheControlMiddleware, sessionMiddleware) + authGroup.Use(ccMiddleware, sessionMiddleware) + oauthGroup.Use(ccMiddleware, sessionMiddleware) a.auth.RouteAuth(authGroup.Handle) a.auth.RouteOauth(oauthGroup.Handle) -- cgit v1.2.3