Skip to content

Commit

Permalink
Add Cache-Control to avatar redirects (#16973)
Browse files Browse the repository at this point in the history
* Add Cache-Control to avatar redirects

This does seem to do the trick to make the Avatar redirects cachable
in Chrome.

In Firefox, it does not seem to work, thought and I found no way to
suppress the requests to the original URLs, I even tried setting an
Etag to no avail.

Related discussion in #16964.

Co-authored-by: zeripath <art27@cantab.net>
  • Loading branch information
silverwind and zeripath committed Sep 6, 2021
1 parent cf6d398 commit 9fa6bdb
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions routers/web/user/avatar.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/httpcache"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)

func cacheableRedirect(ctx *context.Context, location string) {
ctx.Resp.Header().Set("Cache-Control", httpcache.GetCacheControl())
ctx.Redirect(location)
}

// Avatar redirect browser to user avatar of requested size
func Avatar(ctx *context.Context) {
userName := ctx.Params(":username")
Expand All @@ -43,7 +49,7 @@ func Avatar(ctx *context.Context) {
user = models.NewGhostUser()
}

ctx.Redirect(user.RealSizedAvatarLink(size))
cacheableRedirect(ctx, user.RealSizedAvatarLink(size))
}

// AvatarByEmailHash redirects the browser to the appropriate Avatar link
Expand All @@ -63,7 +69,7 @@ func AvatarByEmailHash(ctx *context.Context) {
return
}
if len(email) == 0 {
ctx.Redirect(models.DefaultAvatarLink())
cacheableRedirect(ctx, models.DefaultAvatarLink())
return
}
size := ctx.FormInt("size")
Expand Down Expand Up @@ -94,5 +100,5 @@ func AvatarByEmailHash(ctx *context.Context) {
}
}

ctx.Redirect(models.MakeFinalAvatarURL(avatarURL, size))
cacheableRedirect(ctx, models.MakeFinalAvatarURL(avatarURL, size))
}

0 comments on commit 9fa6bdb

Please sign in to comment.