Merge pull request 'implement x-forwarded-proto' (#239) from x-forwarded-for into main

Reviewed-on: https://codeberg.org/rimgo/rimgo/pulls/239
Reviewed-by: video-prize-ranch <video-prize-ranch@noreply.codeberg.org>

utils/config.go

@@ -6,15 +6,16 @@ import (
 )
 
 type config struct {
-	Port            string
-	Addr            string
-	ImgurId         string
-	Secure          bool
-	FiberPrefork    bool
-	ImageCache      bool
-	CleanupInterval time.Duration
-	CacheDir        string
-	Privacy         map[string]interface{}
+	Port              string
+	Addr              string
+	ImgurId           string
+	ProtocolDetection bool
+	Secure            bool
+	FiberPrefork      bool
+	ImageCache        bool
+	CleanupInterval   time.Duration
+	CacheDir          string
+	Privacy           map[string]interface{}
 }
 
 var Config config
@@ -45,11 +46,12 @@ func LoadConfig() {
 	}
 
 	Config = config{
-		Port:         port,
-		Addr:         addr,
-		ImgurId:      imgurId,
-		Secure:       os.Getenv("SECURE") == "true",
-		FiberPrefork: os.Getenv("FIBER_PREFORK") == "true",
+		Port:              port,
+		Addr:              addr,
+		ImgurId:           imgurId,
+		ProtocolDetection: os.Getenv("PROTOCOL_DETECTION") == "true" || os.Getenv("PROTOCOL_DETECTION") == "1",
+		Secure:            os.Getenv("SECURE") == "true",
+		FiberPrefork:      os.Getenv("FIBER_PREFORK") == "true",
 		Privacy: map[string]interface{}{
 			"set":           os.Getenv("PRIVACY_NOT_COLLECTED") != "",
 			"policy":        os.Getenv("PRIVACY_POLICY"),

utils/getUrl.go

@@ -3,9 +3,12 @@ package utils
 import "github.com/gofiber/fiber/v2"
 
 func GetInstanceUrl(c *fiber.Ctx) string {
-	proto := "https://"
+	proto := "https"
 	if !Config.Secure {
-		proto = "http://"
+		proto = "http"
 	}
-	return proto + c.Hostname()
+	if Config.ProtocolDetection {
+		proto = c.Get("X-Forwarded-Proto", proto)
+	}
+	return proto + "://" + c.Hostname()
 }