hotfix: configurable max allowed pixel (#35)

* hotfix: configurable max allowed pixel --------- Co-authored-by: Francisco <francisco.francisco@kumparan.com>
kumparan · May 29, 2024 · 9cc0f0f · 9cc0f0f
1 parent b0795b1
commit 9cc0f0f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/config.yml.dev b/config.yml.dev
@@ -10,4 +10,5 @@ aws:
     s3_secret: "$media_s3_secret"
     s3_bucket: "$dev_media_s3_bucket"
 cache_ttl: 10000
-placeholder_base64: ""
+placeholder_base64: ""
+max_image_pixel_allowed: "18.0"
diff --git a/config.yml.example b/config.yml.example
@@ -10,4 +10,5 @@ aws:
     s3_secret: "$media_s3_secret"
     s3_bucket: "$dev_media_s3_bucket"
 cache_ttl: 10000
-placeholder_base64: "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"
+placeholder_base64: "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"
+max_image_pixel_allowed: "18.0"
diff --git a/config.yml.prod b/config.yml.prod
@@ -10,4 +10,5 @@ aws:
     s3_secret: "$media_s3_secret"
     s3_bucket: "$prod_media_s3_bucket"
 cache_ttl: 10000
-placeholder_base64: ""
+placeholder_base64: ""
+max_image_pixel_allowed: "18.0"
diff --git a/config.yml.staging b/config.yml.staging
@@ -10,4 +10,5 @@ aws:
     s3_secret: "$media_s3_secret"
     s3_bucket: "$staging_media_s3_bucket"
 cache_ttl: 10000
-placeholder_base64: ""
+placeholder_base64: ""
+max_image_pixel_allowed: "18.0"
diff --git a/config/config.go b/config/config.go
@@ -90,3 +90,8 @@ func LogLevel() string {
 func PlaceholderBase64() string {
 	return viper.GetString("placeholder_base64")
 }
+
+// MaxImagePixelAllowedInMegaPixel :nodoc:
+func MaxImagePixelAllowedInMegaPixel() float64 {
+	return viper.GetFloat64("max_image_pixel_allowed")
+}
diff --git a/imaginary.go b/imaginary.go
@@ -186,13 +186,17 @@ func main() {
 		ForwardHeaders:     parseForwardHeaders(*aForwardHeaders),
 		AllowedOrigins:     parseOrigins(*aAllowedOrigins),
 		MaxAllowedSize:     *aMaxAllowedSize,
+		MaxAllowedPixels:   *aMaxAllowedPixels,
 		Cacher:             cacheKeeper,
 		S3Client:           db.S3Client,
-		MaxAllowedPixels:   *aMaxAllowedPixels,
 		LogLevel:           getLogLevel(*aLogLevel),
 		ReturnSize:         *aReturnSize,
 	}
 
+	if config.MaxImagePixelAllowedInMegaPixel() > 0 {
+		opts.MaxAllowedPixels = config.MaxImagePixelAllowedInMegaPixel()
+	}
+
 	// Show warning if gzip flag is passed
 	if *aGzip {
 		fmt.Println("warning: -gzip flag is deprecated and will not have effect")