mirror of
https://github.com/go-gitea/gitea.git
synced 2026-08-13 15:40:56 +00:00
e3ee28f15b
- Hash emails with sha256. Gravatar moved to sha256, and both it and libravatar.org serve the same image for either hash. - Drop `strk.kbt.io/projects/go/libravatar` for a 46 line inline SRV lookup. It could not bound or cancel its DNS query and panicked on an unexpected resolver error. The replacement carries the request context and a 3s timeout. - Fix federated avatars querying DNS for every avatar on every render. `loadAvatarSetting` compared a cache field that was never assigned, so each call rebuilt the resolver and dropped its cache. That cache is gone, both settings are read where they are used. - Migration 348 recreates `email_hash` with a 64 char hash column and a `hash_type` column, so a later algorithm change can tell old rows apart. The MD5 rows are unreachable and their `UNIQUE` email index would reject the SHA256 replacements. - Fix a re-saved avatar form replacing an uploaded avatar with a random one. - Remove the `duoshuo` `GRAVATAR_SOURCE` alias, that service shut down in 2017. - Remove dead i18n key. Fixes: https://github.com/go-gitea/gitea/issues/34284 Fixes: https://github.com/go-gitea/gitea/issues/28110 Docs: https://gitea.com/gitea/docs/pulls/499 Signed-off-by: silverwind <me@silverwind.io>
76 lines
2.1 KiB
Go
76 lines
2.1 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
|
|
"gitea.dev/modules/log"
|
|
"gitea.dev/modules/setting"
|
|
"gitea.dev/modules/typesniffer"
|
|
"gitea.dev/modules/web"
|
|
"gitea.dev/services/context"
|
|
"gitea.dev/services/forms"
|
|
repo_service "gitea.dev/services/repository"
|
|
)
|
|
|
|
// UpdateAvatarSetting update repo's avatar
|
|
func UpdateAvatarSetting(ctx *context.Context, form forms.AvatarForm) error {
|
|
ctxRepo := ctx.Repo.Repository
|
|
|
|
if form.Avatar == nil {
|
|
// No avatar is uploaded and we not removing it here.
|
|
// No random avatar generated here.
|
|
// Just exit, no action.
|
|
if ctxRepo.CustomAvatarRelativePath() == "" {
|
|
log.Trace("No avatar was uploaded for repo: %d. Default icon will appear instead.", ctxRepo.ID)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
r, err := form.Avatar.Open()
|
|
if err != nil {
|
|
return fmt.Errorf("Avatar.Open: %w", err)
|
|
}
|
|
defer r.Close()
|
|
|
|
if form.Avatar.Size > setting.Avatar.MaxFileSize {
|
|
return errors.New(ctx.Locale.TrString("settings.uploaded_avatar_is_too_big", form.Avatar.Size/1024, setting.Avatar.MaxFileSize/1024))
|
|
}
|
|
|
|
data, err := io.ReadAll(r)
|
|
if err != nil {
|
|
return fmt.Errorf("io.ReadAll: %w", err)
|
|
}
|
|
st := typesniffer.DetectContentType(data)
|
|
if !(st.IsImage() && !st.IsSvgImage()) {
|
|
return errors.New(ctx.Locale.TrString("settings.uploaded_avatar_not_a_image"))
|
|
}
|
|
if err = repo_service.UploadAvatar(ctx, ctxRepo, data); err != nil {
|
|
return fmt.Errorf("UploadAvatar: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// SettingsAvatar save new POSTed repository avatar
|
|
func SettingsAvatar(ctx *context.Context) {
|
|
form := web.GetForm[*forms.AvatarForm](ctx)
|
|
if err := UpdateAvatarSetting(ctx, *form); err != nil {
|
|
ctx.Flash.Error(err.Error())
|
|
} else {
|
|
ctx.Flash.Success(ctx.Tr("repo.settings.update_avatar_success"))
|
|
}
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/settings")
|
|
}
|
|
|
|
// SettingsDeleteAvatar delete repository avatar
|
|
func SettingsDeleteAvatar(ctx *context.Context) {
|
|
if err := repo_service.DeleteAvatar(ctx, ctx.Repo.Repository); err != nil {
|
|
ctx.Flash.Error(fmt.Sprintf("DeleteAvatar: %v", err))
|
|
}
|
|
ctx.JSONRedirect(ctx.Repo.RepoLink + "/settings")
|
|
}
|