Skip to content

Prevent NPE on avatar direct rendering if federated avatars disabled #15434

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
Apr 13, 2021
Merged

Prevent NPE on avatar direct rendering if federated avatars disabled #15434

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1090b32
Prevent NPE on avatar direct rendering if federated avatars disabled
zeripath Apr 12, 2021
f6d3f9a
Merge branch 'master' into fix-15421-initialize-libravatar-service
zeripath Apr 12, 2021
44dba73
Merge branch 'master' into fix-15421-initialize-libravatar-service
techknowlogick Apr 13, 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
19 changes: 17 additions & 2 deletions routers/user/avatar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ package user
import (
"errors"
"net/url"
"path"
"strconv"
"strings"

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

// Avatar redirect browser to user avatar of requested size
Expand Down Expand Up @@ -70,8 +72,21 @@ func AvatarByEmailHash(ctx *context.Context) {
}

var avatarURL *url.URL
avatarURL, err = models.LibravatarURL(email)
if err != nil {

if setting.EnableFederatedAvatar && setting.LibravatarService != nil {
avatarURL, err = models.LibravatarURL(email)
if err != nil {
avatarURL, err = url.Parse(models.DefaultAvatarLink())
if err != nil {
ctx.ServerError("invalid default avatar url", err)
return
}
}
} else if !setting.DisableGravatar {
copyOfGravatarSourceURL := *setting.GravatarSourceURL
avatarURL = &copyOfGravatarSourceURL
avatarURL.Path = path.Join(avatarURL.Path, hash)
} else {
avatarURL, err = url.Parse(models.DefaultAvatarLink())
if err != nil {
ctx.ServerError("invalid default avatar url", err)
Expand Down