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>
103 lines
3.8 KiB
Go
103 lines
3.8 KiB
Go
// Copyright 2019 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 upload
|
|
|
|
import (
|
|
"net/http"
|
|
"net/url"
|
|
"path"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/modules/context"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
)
|
|
|
|
// ErrFileTypeForbidden not allowed file type error
|
|
type ErrFileTypeForbidden struct {
|
|
Type string
|
|
}
|
|
|
|
// IsErrFileTypeForbidden checks if an error is a ErrFileTypeForbidden.
|
|
func IsErrFileTypeForbidden(err error) bool {
|
|
_, ok := err.(ErrFileTypeForbidden)
|
|
return ok
|
|
}
|
|
|
|
func (err ErrFileTypeForbidden) Error() string {
|
|
return "This file extension or type is not allowed to be uploaded."
|
|
}
|
|
|
|
var mimeTypeSuffixRe = regexp.MustCompile(`;.*$`)
|
|
var wildcardTypeRe = regexp.MustCompile(`^[a-z]+/\*$`)
|
|
|
|
// Verify validates whether a file is allowed to be uploaded.
|
|
func Verify(buf []byte, fileName string, allowedTypesStr string) error {
|
|
allowedTypesStr = strings.ReplaceAll(allowedTypesStr, "|", ",") // compat for old config format
|
|
|
|
allowedTypes := []string{}
|
|
for _, entry := range strings.Split(allowedTypesStr, ",") {
|
|
entry = strings.ToLower(strings.TrimSpace(entry))
|
|
if entry != "" {
|
|
allowedTypes = append(allowedTypes, entry)
|
|
}
|
|
}
|
|
|
|
if len(allowedTypes) == 0 {
|
|
return nil // everything is allowed
|
|
}
|
|
|
|
fullMimeType := http.DetectContentType(buf)
|
|
mimeType := strings.TrimSpace(mimeTypeSuffixRe.ReplaceAllString(fullMimeType, ""))
|
|
extension := strings.ToLower(path.Ext(fileName))
|
|
|
|
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file#Unique_file_type_specifiers
|
|
for _, allowEntry := range allowedTypes {
|
|
if allowEntry == "*/*" {
|
|
return nil // everything allowed
|
|
} else if strings.HasPrefix(allowEntry, ".") && allowEntry == extension {
|
|
return nil // extension is allowed
|
|
} else if mimeType == allowEntry {
|
|
return nil // mime type is allowed
|
|
} else if wildcardTypeRe.MatchString(allowEntry) && strings.HasPrefix(mimeType, allowEntry[:len(allowEntry)-1]) {
|
|
return nil // wildcard match, e.g. image/*
|
|
}
|
|
}
|
|
|
|
log.Info("Attachment with type %s blocked from upload", fullMimeType)
|
|
return ErrFileTypeForbidden{Type: fullMimeType}
|
|
}
|
|
|
|
// AddUploadContext renders template values for dropzone
|
|
func AddUploadContext(ctx *context.Context, uploadType string) {
|
|
if uploadType == "release" {
|
|
ctx.Data["UploadUrl"] = ctx.Repo.RepoLink + "/releases/attachments"
|
|
ctx.Data["UploadRemoveUrl"] = ctx.Repo.RepoLink + "/releases/attachments/remove"
|
|
ctx.Data["UploadLinkUrl"] = ctx.Repo.RepoLink + "/releases/attachments"
|
|
ctx.Data["UploadAccepts"] = strings.ReplaceAll(setting.Repository.Release.AllowedTypes, "|", ",")
|
|
ctx.Data["UploadMaxFiles"] = setting.Attachment.MaxFiles
|
|
ctx.Data["UploadMaxSize"] = setting.Attachment.MaxSize
|
|
} else if uploadType == "comment" {
|
|
ctx.Data["UploadUrl"] = ctx.Repo.RepoLink + "/issues/attachments"
|
|
ctx.Data["UploadRemoveUrl"] = ctx.Repo.RepoLink + "/issues/attachments/remove"
|
|
if len(ctx.Params(":index")) > 0 {
|
|
ctx.Data["UploadLinkUrl"] = ctx.Repo.RepoLink + "/issues/" + url.PathEscape(ctx.Params(":index")) + "/attachments"
|
|
} else {
|
|
ctx.Data["UploadLinkUrl"] = ctx.Repo.RepoLink + "/issues/attachments"
|
|
}
|
|
ctx.Data["UploadAccepts"] = strings.ReplaceAll(setting.Attachment.AllowedTypes, "|", ",")
|
|
ctx.Data["UploadMaxFiles"] = setting.Attachment.MaxFiles
|
|
ctx.Data["UploadMaxSize"] = setting.Attachment.MaxSize
|
|
} else if uploadType == "repo" {
|
|
ctx.Data["UploadUrl"] = ctx.Repo.RepoLink + "/upload-file"
|
|
ctx.Data["UploadRemoveUrl"] = ctx.Repo.RepoLink + "/upload-remove"
|
|
ctx.Data["UploadLinkUrl"] = ctx.Repo.RepoLink + "/upload-file"
|
|
ctx.Data["UploadAccepts"] = strings.ReplaceAll(setting.Repository.Upload.AllowedTypes, "|", ",")
|
|
ctx.Data["UploadMaxFiles"] = setting.Repository.Upload.MaxFiles
|
|
ctx.Data["UploadMaxSize"] = setting.Repository.Upload.FileMaxSize
|
|
}
|
|
}
|