mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-20 21:32:46 +03:00
82224c54e0
Fixes: #8972 Fixes: #24263 And I think it also (partially) fix #24263 (no need to convert) , because users could upload any supported image format if it isn't larger than AVATAR_MAX_ORIGIN_SIZE The main idea: * if the uploaded file size is not larger than AVATAR_MAX_ORIGIN_SIZE, use the origin * if the resized size is larger than the origin, use the origin Screenshots: JPG: <details> ![image](https://github.com/go-gitea/gitea/assets/2114189/70e98bb0-ecb9-4c4e-a89f-4a37d4e37f8e) </details> APNG: <details> ![image](https://github.com/go-gitea/gitea/assets/2114189/9055135b-5e2d-4152-bd72-596fcb7c6671) ![image](https://github.com/go-gitea/gitea/assets/2114189/50364caf-f7f6-4241-a289-e485fe4cd582) </details> WebP (animated) <details> ![image](https://github.com/go-gitea/gitea/assets/2114189/f642eb85-498a-49a5-86bf-0a7b04089ae0) </details> The only exception: if a WebP image is larger than MaxOriginSize and it is animated, then current `webp` package can't decode it, so only in this case it isn't supported. IMO no need to support such case: why a user would upload a 1MB animated webp as avatar? crazy ..... --------- Co-authored-by: silverwind <me@silverwind.io>
101 lines
2.9 KiB
Go
101 lines
2.9 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
// Avatar settings
|
|
|
|
var (
|
|
Avatar = struct {
|
|
Storage
|
|
|
|
MaxWidth int
|
|
MaxHeight int
|
|
MaxFileSize int64
|
|
MaxOriginSize int64
|
|
RenderedSizeFactor int
|
|
}{
|
|
MaxWidth: 4096,
|
|
MaxHeight: 4096,
|
|
MaxFileSize: 1048576,
|
|
MaxOriginSize: 262144,
|
|
RenderedSizeFactor: 2,
|
|
}
|
|
|
|
GravatarSource string
|
|
DisableGravatar bool // Depreciated: migrated to database
|
|
EnableFederatedAvatar bool // Depreciated: migrated to database
|
|
|
|
RepoAvatar = struct {
|
|
Storage
|
|
|
|
Fallback string
|
|
FallbackImage string
|
|
}{}
|
|
)
|
|
|
|
func loadPictureFrom(rootCfg ConfigProvider) {
|
|
sec := rootCfg.Section("picture")
|
|
|
|
avatarSec := rootCfg.Section("avatar")
|
|
storageType := sec.Key("AVATAR_STORAGE_TYPE").MustString("")
|
|
// Specifically default PATH to AVATAR_UPLOAD_PATH
|
|
avatarSec.Key("PATH").MustString(
|
|
sec.Key("AVATAR_UPLOAD_PATH").String())
|
|
|
|
Avatar.Storage = getStorage(rootCfg, "avatars", storageType, avatarSec)
|
|
|
|
Avatar.MaxWidth = sec.Key("AVATAR_MAX_WIDTH").MustInt(4096)
|
|
Avatar.MaxHeight = sec.Key("AVATAR_MAX_HEIGHT").MustInt(4096)
|
|
Avatar.MaxFileSize = sec.Key("AVATAR_MAX_FILE_SIZE").MustInt64(1048576)
|
|
Avatar.MaxOriginSize = sec.Key("AVATAR_MAX_ORIGIN_SIZE").MustInt64(262144)
|
|
Avatar.RenderedSizeFactor = sec.Key("AVATAR_RENDERED_SIZE_FACTOR").MustInt(2)
|
|
|
|
switch source := sec.Key("GRAVATAR_SOURCE").MustString("gravatar"); source {
|
|
case "duoshuo":
|
|
GravatarSource = "http://gravatar.duoshuo.com/avatar/"
|
|
case "gravatar":
|
|
GravatarSource = "https://secure.gravatar.com/avatar/"
|
|
case "libravatar":
|
|
GravatarSource = "https://seccdn.libravatar.org/avatar/"
|
|
default:
|
|
GravatarSource = source
|
|
}
|
|
|
|
DisableGravatar = sec.Key("DISABLE_GRAVATAR").MustBool(GetDefaultDisableGravatar())
|
|
deprecatedSettingDB(rootCfg, "", "DISABLE_GRAVATAR")
|
|
EnableFederatedAvatar = sec.Key("ENABLE_FEDERATED_AVATAR").MustBool(GetDefaultEnableFederatedAvatar(DisableGravatar))
|
|
deprecatedSettingDB(rootCfg, "", "ENABLE_FEDERATED_AVATAR")
|
|
|
|
loadRepoAvatarFrom(rootCfg)
|
|
}
|
|
|
|
func GetDefaultDisableGravatar() bool {
|
|
return OfflineMode
|
|
}
|
|
|
|
func GetDefaultEnableFederatedAvatar(disableGravatar bool) bool {
|
|
v := !InstallLock
|
|
if OfflineMode {
|
|
v = false
|
|
}
|
|
if disableGravatar {
|
|
v = false
|
|
}
|
|
return v
|
|
}
|
|
|
|
func loadRepoAvatarFrom(rootCfg ConfigProvider) {
|
|
sec := rootCfg.Section("picture")
|
|
|
|
repoAvatarSec := rootCfg.Section("repo-avatar")
|
|
storageType := sec.Key("REPOSITORY_AVATAR_STORAGE_TYPE").MustString("")
|
|
// Specifically default PATH to AVATAR_UPLOAD_PATH
|
|
repoAvatarSec.Key("PATH").MustString(
|
|
sec.Key("REPOSITORY_AVATAR_UPLOAD_PATH").String())
|
|
|
|
RepoAvatar.Storage = getStorage(rootCfg, "repo-avatars", storageType, repoAvatarSec)
|
|
|
|
RepoAvatar.Fallback = sec.Key("REPOSITORY_AVATAR_FALLBACK").MustString("none")
|
|
RepoAvatar.FallbackImage = sec.Key("REPOSITORY_AVATAR_FALLBACK_IMAGE").MustString(AppSubURL + "/assets/img/repo_default.png")
|
|
}
|