mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-23 08:47:42 -05: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>
116 lines
3.6 KiB
Go
116 lines
3.6 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repository
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
"code.gitea.io/gitea/modules/avatar"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/storage"
|
|
)
|
|
|
|
// UploadAvatar saves custom avatar for repository.
|
|
// FIXME: split uploads to different subdirs in case we have massive number of repos.
|
|
func UploadAvatar(ctx context.Context, repo *repo_model.Repository, data []byte) error {
|
|
avatarData, err := avatar.ProcessAvatarImage(data)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
newAvatar := avatar.HashAvatar(repo.ID, data)
|
|
if repo.Avatar == newAvatar { // upload the same picture
|
|
return nil
|
|
}
|
|
|
|
ctx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
oldAvatarPath := repo.CustomAvatarRelativePath()
|
|
|
|
// Users can upload the same image to other repo - prefix it with ID
|
|
// Then repo will be removed - only it avatar file will be removed
|
|
repo.Avatar = newAvatar
|
|
if err := repo_model.UpdateRepositoryCols(ctx, repo, "avatar"); err != nil {
|
|
return fmt.Errorf("UploadAvatar: Update repository avatar: %w", err)
|
|
}
|
|
|
|
if err := storage.SaveFrom(storage.RepoAvatars, repo.CustomAvatarRelativePath(), func(w io.Writer) error {
|
|
_, err := w.Write(avatarData)
|
|
return err
|
|
}); err != nil {
|
|
return fmt.Errorf("UploadAvatar %s failed: Failed to remove old repo avatar %s: %w", repo.RepoPath(), newAvatar, err)
|
|
}
|
|
|
|
if len(oldAvatarPath) > 0 {
|
|
if err := storage.RepoAvatars.Delete(oldAvatarPath); err != nil {
|
|
return fmt.Errorf("UploadAvatar: Failed to remove old repo avatar %s: %w", oldAvatarPath, err)
|
|
}
|
|
}
|
|
|
|
return committer.Commit()
|
|
}
|
|
|
|
// DeleteAvatar deletes the repos's custom avatar.
|
|
func DeleteAvatar(ctx context.Context, repo *repo_model.Repository) error {
|
|
// Avatar not exists
|
|
if len(repo.Avatar) == 0 {
|
|
return nil
|
|
}
|
|
|
|
avatarPath := repo.CustomAvatarRelativePath()
|
|
log.Trace("DeleteAvatar[%d]: %s", repo.ID, avatarPath)
|
|
|
|
ctx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
repo.Avatar = ""
|
|
if err := repo_model.UpdateRepositoryCols(ctx, repo, "avatar"); err != nil {
|
|
return fmt.Errorf("DeleteAvatar: Update repository avatar: %w", err)
|
|
}
|
|
|
|
if err := storage.RepoAvatars.Delete(avatarPath); err != nil {
|
|
return fmt.Errorf("DeleteAvatar: Failed to remove %s: %w", avatarPath, err)
|
|
}
|
|
|
|
return committer.Commit()
|
|
}
|
|
|
|
// RemoveRandomAvatars removes the randomly generated avatars that were created for repositories
|
|
func RemoveRandomAvatars(ctx context.Context) error {
|
|
return db.Iterate(ctx, nil, func(ctx context.Context, repository *repo_model.Repository) error {
|
|
select {
|
|
case <-ctx.Done():
|
|
return db.ErrCancelledf("before random avatars removed for %s", repository.FullName())
|
|
default:
|
|
}
|
|
stringifiedID := strconv.FormatInt(repository.ID, 10)
|
|
if repository.Avatar == stringifiedID {
|
|
return DeleteAvatar(ctx, repository)
|
|
}
|
|
return nil
|
|
})
|
|
}
|
|
|
|
// generateAvatar generates the avatar from a template repository
|
|
func generateAvatar(ctx context.Context, templateRepo, generateRepo *repo_model.Repository) error {
|
|
generateRepo.Avatar = strings.Replace(templateRepo.Avatar, strconv.FormatInt(templateRepo.ID, 10), strconv.FormatInt(generateRepo.ID, 10), 1)
|
|
if _, err := storage.Copy(storage.RepoAvatars, generateRepo.CustomAvatarRelativePath(), storage.RepoAvatars, templateRepo.CustomAvatarRelativePath()); err != nil {
|
|
return err
|
|
}
|
|
|
|
return repo_model.UpdateRepositoryCols(ctx, generateRepo, "avatar")
|
|
}
|