Skip to content

Add Cache-Control to avatar redirects #16973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 6, 2021
Merged

Add Cache-Control to avatar redirects #16973

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53fb93b
Add Cache-Control to avatar redirects
silverwind Sep 6, 2021
41a2068
Merge branch 'main' into cache-ava-redirect
zeripath Sep 6, 2021
86ef36e
Apply suggestions from code review
zeripath Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions routers/web/user/avatar.go
View file
Open in desktop
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 doRedirect(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))
doRedirect(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())
doRedirect(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))
doRedirect(ctx, models.MakeFinalAvatarURL(avatarURL, size))
}