add <meta> refresh

an additional fallback, as the mission for this project remains to implement pretty much every standard way of https upgrading
chrissxMedia · Aug 15, 2023 · 4239466 · 4239466
1 parent b527fc2
commit 4239466
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/redirector.go b/redirector.go
@@ -3,6 +3,7 @@ package main
 import (
 	_ "embed"
 	"fmt"
+	"html"
 	"net/http"
 	"net/url"
 	"strings"
@@ -29,13 +30,15 @@ func main() {
 
 	cm3.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		totalReqs.WithLabelValues().Inc()
+		refresh := ""
 		if strings.Contains(r.Host, ".") && !strings.Contains(r.Host, ":") {
 			var url = url.URL{Host: r.Host, Scheme: "https", Path: r.URL.Path}
 			w.Header().Add("Location", url.String())
 			w.WriteHeader(301)
 			hostReqs.WithLabelValues().Inc()
+			refresh = "<meta http-equiv=\"refresh\" content=\"0;url=" + html.EscapeString(url.String()) + "\"/>"
 		}
-		fmt.Fprintf(w, response)
+		fmt.Fprintf(w, response, refresh)
 	})
 
 	cm3.ListenAndServeHttp(":80", nil)

diff --git a/response.html b/response.html
@@ -3,8 +3,14 @@
     <head>
         <title>Redirecting...</title>
         <script>window.location.protocol = 'https:';</script>
+        %s
     </head>
-    <body>
-        Just switch to https up there ↑
+    <body style="font-size: large;">
+        <p>
+            This site is only available over HTTPS, please use that.
+        </p>
+        <noscript>
+            Since you don't have JavaScript enabled, we might not be able to redirect you.
+        </noscript>
     </body>
 </html>
diff --git a/response.min.html b/response.min.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><title>Redirecting...</title><script>window.location.protocol="https:"</script></head><body>Just switch to https up there ↑</body></html>
+<!doctype html><html lang="en"><head><title>Redirecting...</title><script>window.location.protocol="https:"</script>%s</head><body style="font-size:large"><p>This site is only available over HTTPS, please use that.</p><noscript>Since you don't have JavaScript enabled, we might not be able to redirect you.</noscript></body></html>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><title>Redirecting...</title><script>window.location.protocol="https:"</script></head><body>Just switch to https up there ↑</body></html>
		<!doctype html><html lang="en"><head><title>Redirecting...</title><script>window.location.protocol="https:"</script>%s</head><body style="font-size:large"><p>This site is only available over HTTPS, please use that.</p><noscript>Since you don't have JavaScript enabled, we might not be able to redirect you.</noscript></body></html>