Merge pull request 'Fix scheme determination behind reverse proxies' (#23) from fix/mixed into dev

Reviewed-on: #23

.gitea/workflows/gobuild.yaml

@@ -3,10 +3,8 @@ name: build
 on:
   pull_request:
   push:
-    branches:
-      - '**'
-    tags:
-      - '**'
+    branches-ignore:
+      - main
 
 jobs:
   Go-Build:

.gitea/workflows/release-docker.yaml

@@ -2,8 +2,8 @@ name: docker
 
 on:
   push:
-    tags:
-      - '**'
+    branches:
+      - 'main'
 
 jobs:
   docker:

Dockerfile

@@ -16,6 +16,4 @@ RUN apt update && apt install -y curl tar \
     && mv resvg /usr/local/bin/resvg \
     && chmod +x /usr/local/bin/resvg
 COPY --from=builder /app/svg-templater /usr/local/bin/svg-templater
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
+CMD ["svg-templater"]

entrypoint.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-CMD="svg-templater"
-
-if [ -n "$API_KEY" ]; then
-    CMD="$CMD --frontendkey $API_KEY"
-fi
-
-if [ -n "$DATA_DIR" ]; then
-    CMD="$CMD --data $DATA_DIR"
-fi
-
-eval exec $CMD "$@"

internal/routes/download.go

@@ -104,9 +104,18 @@ func getPublicUrl(r *http.Request, subpath string) string {
 		Host: r.Host,
 		Path: path.Join("public", subpath),
 	}
-	newURL.Scheme = "http"
-	if r.TLS != nil {
-		newURL.Scheme = "https"
-	}
+	newURL.Scheme = determineScheme(r)
 	return newURL.String()
 }
+
+func determineScheme(r *http.Request) string {
+	if proto := r.Header.Get("X-Forwarded-Proto"); proto != "" {
+		return proto
+	}
+
+	if r.TLS != nil {
+		return "https"
+	}
+
+	return "http"
+}