Add automatic redirect to https if both http and https are configured

Author: hons82

cmd/tunneld/tunneld.go

@@ -9,6 +9,7 @@ import (
 	"crypto/x509"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"os"
 	"strings"
@@ -68,13 +69,40 @@ func main() {
 	// start HTTP
 	if opts.httpAddr != "" {
 		go func() {
-			logger.Log(
-				"level", 1,
-				"action", "start http",
-				"addr", opts.httpAddr,
-			)
-
-			fatal("failed to start HTTP: %s", http.ListenAndServe(opts.httpAddr, server))
+			if opts.httpsAddr != "" {
+				logger.Log(
+					"level", 1,
+					"action", "start http redirect",
+					"addr", opts.httpAddr,
+				)
+
+				_, tlsPort, err := net.SplitHostPort(opts.httpsAddr)
+				if err != nil {
+					fatal("failed to get https port: %s", err)
+				}
+				fatal("failed to start HTTP: %s",
+					http.ListenAndServe(opts.httpAddr, http.HandlerFunc(
+						func(w http.ResponseWriter, r *http.Request) {
+							host, _, err := net.SplitHostPort(r.Host)
+							if err != nil {
+								host = r.Host
+							}
+							u := r.URL
+							u.Host = net.JoinHostPort(host, tlsPort)
+							u.Scheme = "https"
+							http.Redirect(w, r, u.String(), http.StatusMovedPermanently)
+						},
+					)),
+				)
+			} else {
+				logger.Log(
+					"level", 1,
+					"action", "start http",
+					"addr", opts.httpAddr,
+				)
+
+				fatal("failed to start HTTP: %s", http.ListenAndServe(opts.httpAddr, server))
+			}
 		}()
 	}