Add MaxImageResolution config setting (#17941)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
e1b0644b0d
Коммит
96593580ae
10
app/image.go
10
app/image.go
@@ -10,23 +10,23 @@ import (
|
||||
"github.com/mattermost/mattermost-server/v6/app/imaging"
|
||||
)
|
||||
|
||||
func checkImageResolutionLimit(w, h int) error {
|
||||
func checkImageResolutionLimit(w, h int, maxRes int64) error {
|
||||
// This casting is done to prevent overflow on 32 bit systems (not needed
|
||||
// in 64 bits systems because images can't have more than 32 bits height or
|
||||
// width)
|
||||
imageRes := int64(w) * int64(h)
|
||||
if imageRes > maxImageRes {
|
||||
return fmt.Errorf("image resolution is too high: %d, max allowed is %d", imageRes, maxImageRes)
|
||||
if imageRes > maxRes {
|
||||
return fmt.Errorf("image resolution is too high: %d, max allowed is %d", imageRes, maxRes)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func checkImageLimits(imageData io.Reader) error {
|
||||
func checkImageLimits(imageData io.Reader, maxRes int64) error {
|
||||
w, h, err := imaging.GetDimensions(imageData)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get image dimensions: %w", err)
|
||||
}
|
||||
|
||||
return checkImageResolutionLimit(w, h)
|
||||
return checkImageResolutionLimit(w, h, maxRes)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user