fix(background): validate unsupported formats and show error message (#1123)

This commit is contained in:
kolaente
2025-07-15 13:21:48 +02:00
committed by GitHub
parent f981e7087e
commit 4da4bf69ca
2 changed files with 69 additions and 0 deletions

View File

@@ -52,6 +52,15 @@ import (
"xorm.io/xorm"
)
var allowedImageMimes = []string{
"image/jpeg",
"image/png",
"image/gif",
"image/bmp",
"image/tiff",
"image/webp",
}
// BackgroundProvider represents a thing which holds a background provider
// Lets us get a new fresh provider every time we need one.
type BackgroundProvider struct {
@@ -202,6 +211,17 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
_ = s.Rollback()
return c.JSON(http.StatusBadRequest, models.Message{Message: "Uploaded file is no image."})
}
supported := false
for _, m := range allowedImageMimes {
if mime.Is(m) {
supported = true
break
}
}
if !supported {
_ = s.Rollback()
return c.JSON(http.StatusBadRequest, models.Message{Message: "Unsupported image format. Allowed: " + strings.Join(allowedImageMimes, ",")})
}
err = SaveBackgroundFile(s, auth, project, srcf, file.Filename, uint64(file.Size))
if err != nil {
@@ -209,6 +229,9 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
if files.IsErrFileIsTooLarge(err) {
return echo.ErrBadRequest
}
if IsErrFileUnsupportedImageFormat(err) {
return c.JSON(http.StatusBadRequest, models.Message{Message: "Unsupported image format. Allowed: " + strings.Join(allowedImageMimes, ",")})
}
return handler.HandleHTTPError(err)
}
@@ -228,9 +251,13 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
}
func SaveBackgroundFile(s *xorm.Session, auth web.Auth, project *models.Project, srcf io.ReadSeeker, filename string, filesize uint64) (err error) {
mime, _ := mimetype.DetectReader(srcf)
_, _ = srcf.Seek(0, io.SeekStart)
src, err := imaging.Decode(srcf)
if err != nil {
if strings.Contains(err.Error(), "unknown format") {
return ErrFileUnsupportedImageFormat{Mime: mime.String()}
}
return err
}

View File

@@ -0,0 +1,42 @@
// Vikunja is a to-do list application to facilitate your life.
// Copyright 2018-present Vikunja and contributors. All rights reserved.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
package handler
import (
"errors"
"fmt"
)
// ErrFileUnsupportedImageFormat defines an error where an uploaded image format is not supported
// by the imaging library
//
// This is returned when decoding the image fails because the format is unknown.
type ErrFileUnsupportedImageFormat struct {
Mime string
}
// Error is the error implementation of ErrFileUnsupportedImageFormat
func (err ErrFileUnsupportedImageFormat) Error() string {
return fmt.Sprintf("file is not a supported image format [Mime: %s]", err.Mime)
}
// IsErrFileUnsupportedImageFormat checks if an error is ErrFileUnsupportedImageFormat
func IsErrFileUnsupportedImageFormat(err error) bool {
var errFileUnsupportedImageFormat ErrFileUnsupportedImageFormat
ok := errors.As(err, &errFileUnsupportedImageFormat)
return ok
}