bbffcc3aec
There are multiple places where Gitea does not properly escape URLs that it is building and there are multiple places where it builds urls when there is already a simpler function available to use this. This is an extensive PR attempting to fix these issues. 1. The first commit in this PR looks through all href, src and links in the Gitea codebase and has attempted to catch all the places where there is potentially incomplete escaping. 2. Whilst doing this we will prefer to use functions that create URLs over recreating them by hand. 3. All uses of strings should be directly escaped - even if they are not currently expected to contain escaping characters. The main benefit to doing this will be that we can consider relaxing the constraints on user names and reponames in future. 4. The next commit looks at escaping in the wiki and re-considers the urls that are used there. Using the improved escaping here wiki files containing '/'. (This implementation will currently still place all of the wiki files the root directory of the repo but this would not be difficult to change.) 5. The title generation in feeds is now properly escaped. 6. EscapePound is no longer needed - urls should be PathEscaped / QueryEscaped as necessary but then re-escaped with Escape when creating html with locales Signed-off-by: Andrew Thornton <art27@cantab.net> Signed-off-by: Andrew Thornton <art27@cantab.net>
193 lines
5.4 KiB
Go
193 lines
5.4 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package models
|
|
|
|
import (
|
|
"context"
|
|
"crypto/md5"
|
|
"fmt"
|
|
"image/png"
|
|
"io"
|
|
"net/url"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
"code.gitea.io/gitea/modules/avatar"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/storage"
|
|
)
|
|
|
|
// CustomAvatarRelativePath returns repository custom avatar file path.
|
|
func (repo *Repository) CustomAvatarRelativePath() string {
|
|
return repo.Avatar
|
|
}
|
|
|
|
// generateRandomAvatar generates a random avatar for repository.
|
|
func (repo *Repository) generateRandomAvatar(e db.Engine) error {
|
|
idToString := fmt.Sprintf("%d", repo.ID)
|
|
|
|
seed := idToString
|
|
img, err := avatar.RandomImage([]byte(seed))
|
|
if err != nil {
|
|
return fmt.Errorf("RandomImage: %v", err)
|
|
}
|
|
|
|
repo.Avatar = idToString
|
|
|
|
if err := storage.SaveFrom(storage.RepoAvatars, repo.CustomAvatarRelativePath(), func(w io.Writer) error {
|
|
if err := png.Encode(w, img); err != nil {
|
|
log.Error("Encode: %v", err)
|
|
}
|
|
return err
|
|
}); err != nil {
|
|
return fmt.Errorf("Failed to create dir %s: %v", repo.CustomAvatarRelativePath(), err)
|
|
}
|
|
|
|
log.Info("New random avatar created for repository: %d", repo.ID)
|
|
|
|
if _, err := e.ID(repo.ID).Cols("avatar").NoAutoTime().Update(repo); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// RemoveRandomAvatars removes the randomly generated avatars that were created for repositories
|
|
func RemoveRandomAvatars(ctx context.Context) error {
|
|
return db.GetEngine(db.DefaultContext).
|
|
Where("id > 0").BufferSize(setting.Database.IterateBufferSize).
|
|
Iterate(new(Repository),
|
|
func(idx int, bean interface{}) error {
|
|
repository := bean.(*Repository)
|
|
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 repository.DeleteAvatar()
|
|
}
|
|
return nil
|
|
})
|
|
}
|
|
|
|
// RelAvatarLink returns a relative link to the repository's avatar.
|
|
func (repo *Repository) RelAvatarLink() string {
|
|
return repo.relAvatarLink(db.GetEngine(db.DefaultContext))
|
|
}
|
|
|
|
func (repo *Repository) relAvatarLink(e db.Engine) string {
|
|
// If no avatar - path is empty
|
|
avatarPath := repo.CustomAvatarRelativePath()
|
|
if len(avatarPath) == 0 {
|
|
switch mode := setting.RepoAvatar.Fallback; mode {
|
|
case "image":
|
|
return setting.RepoAvatar.FallbackImage
|
|
case "random":
|
|
if err := repo.generateRandomAvatar(e); err != nil {
|
|
log.Error("generateRandomAvatar: %v", err)
|
|
}
|
|
default:
|
|
// default behaviour: do not display avatar
|
|
return ""
|
|
}
|
|
}
|
|
return setting.AppSubURL + "/repo-avatars/" + url.PathEscape(repo.Avatar)
|
|
}
|
|
|
|
// AvatarLink returns a link to the repository's avatar.
|
|
func (repo *Repository) AvatarLink() string {
|
|
return repo.avatarLink(db.GetEngine(db.DefaultContext))
|
|
}
|
|
|
|
// avatarLink returns user avatar absolute link.
|
|
func (repo *Repository) avatarLink(e db.Engine) string {
|
|
link := repo.relAvatarLink(e)
|
|
// link may be empty!
|
|
if len(link) > 0 {
|
|
if link[0] == '/' && link[1] != '/' {
|
|
return setting.AppURL + strings.TrimPrefix(link, setting.AppSubURL)[1:]
|
|
}
|
|
}
|
|
return link
|
|
}
|
|
|
|
// UploadAvatar saves custom avatar for repository.
|
|
// FIXME: split uploads to different subdirs in case we have massive number of repos.
|
|
func (repo *Repository) UploadAvatar(data []byte) error {
|
|
m, err := avatar.Prepare(data)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
newAvatar := fmt.Sprintf("%d-%x", repo.ID, md5.Sum(data))
|
|
if repo.Avatar == newAvatar { // upload the same picture
|
|
return nil
|
|
}
|
|
|
|
sess := db.NewSession(db.DefaultContext)
|
|
defer sess.Close()
|
|
if err = sess.Begin(); err != nil {
|
|
return err
|
|
}
|
|
|
|
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 := sess.ID(repo.ID).Cols("avatar").Update(repo); err != nil {
|
|
return fmt.Errorf("UploadAvatar: Update repository avatar: %v", err)
|
|
}
|
|
|
|
if err := storage.SaveFrom(storage.RepoAvatars, repo.CustomAvatarRelativePath(), func(w io.Writer) error {
|
|
if err := png.Encode(w, *m); err != nil {
|
|
log.Error("Encode: %v", err)
|
|
}
|
|
return err
|
|
}); err != nil {
|
|
return fmt.Errorf("UploadAvatar %s failed: Failed to remove old repo avatar %s: %v", 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: %v", oldAvatarPath, err)
|
|
}
|
|
}
|
|
|
|
return sess.Commit()
|
|
}
|
|
|
|
// DeleteAvatar deletes the repos's custom avatar.
|
|
func (repo *Repository) DeleteAvatar() error {
|
|
// Avatar not exists
|
|
if len(repo.Avatar) == 0 {
|
|
return nil
|
|
}
|
|
|
|
avatarPath := repo.CustomAvatarRelativePath()
|
|
log.Trace("DeleteAvatar[%d]: %s", repo.ID, avatarPath)
|
|
|
|
sess := db.NewSession(db.DefaultContext)
|
|
defer sess.Close()
|
|
if err := sess.Begin(); err != nil {
|
|
return err
|
|
}
|
|
|
|
repo.Avatar = ""
|
|
if _, err := sess.ID(repo.ID).Cols("avatar").Update(repo); err != nil {
|
|
return fmt.Errorf("DeleteAvatar: Update repository avatar: %v", err)
|
|
}
|
|
|
|
if err := storage.RepoAvatars.Delete(avatarPath); err != nil {
|
|
return fmt.Errorf("DeleteAvatar: Failed to remove %s: %v", avatarPath, err)
|
|
}
|
|
|
|
return sess.Commit()
|
|
}
|