Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: force min/max size values (#698)

Guilherme Oenning5086957ab05b
diff --git a/app/handlers/common.go b/app/handlers/common.go
index 0cb11b646..603f47590 100644
--- a/app/handlers/common.go
+++ b/app/handlers/common.go
@@ -169,3 +169,12 @@ func handleImageUpload(c web.Context, img *models.ImageUpload) error {
}
return nil
}
+
+func between(n, min, max int) int {
+ if n > max {
+ return max
+ } else if n < min {
+ return min
+ }
+ return n
+}
diff --git a/app/handlers/images.go b/app/handlers/images.go
index d42305dbb..5f48ad312 100644
--- a/app/handlers/images.go
+++ b/app/handlers/images.go
@@ -30,10 +30,7 @@ func LetterAvatar() web.HandlerFunc {
if err != nil {
return c.Failure(err)
}
-
- if size >= 200 {
- size = 200
- }
+ size = between(size, 50, 200)
img, err := letteravatar.Draw(size, strings.ToUpper(letteravatar.Extract(name)), &letteravatar.Options{
PaletteKey: fmt.Sprintf("%s:%s", id, name),
@@ -65,9 +62,7 @@ func Gravatar() web.HandlerFunc {
return c.Failure(err)
}
- if size >= 200 {
- size = 200
- }
+ size = between(size, 50, 200)
if err == nil && id > 0 {
user, err := c.Services().Users.GetByID(id)
@@ -126,6 +121,8 @@ func Favicon() web.HandlerFunc {
return c.Failure(err)
}
+ size = between(size, 50, 200)
+
opts := []img.ImageOperation{}
if size > 0 {
opts = append(opts, img.Padding(size*10/100))
@@ -155,6 +152,8 @@ func ViewUploadedImage() web.HandlerFunc {
return c.Failure(err)
}
+ size = between(size, 50, 2000)
+
logo, err := c.Services().Blobs.Get(bkey)
if err != nil {
return c.Failure(err)