refactor: refine redirect https

Author: marjune163

src/param/cli.go

@@ -426,13 +426,11 @@ func doParseCli() []*Param {
 
 		// hsts & https
 		if len(param.ListensTLS) > 0 {
-			param.GlobalHsts = result.HasKey("globalhsts")
-			if param.GlobalHsts {
+			if result.HasKey("globalhsts") {
 				param.GlobalHsts = validateHstsPort(param.ListensPlain, param.ListensTLS)
 			}
 
-			param.GlobalHttps = result.HasKey("globalhttps")
-			if param.GlobalHttps {
+			if result.HasKey("globalhttps") {
 				httpsPort, _ := result.GetString("globalhttps")
 				param.HttpsPort, param.GlobalHttps = normalizeHttpsPort(httpsPort, param.ListensTLS)
 			}

src/param/strUtil.go

@@ -187,7 +187,7 @@ func normalizeFilenames(inputs []string) []string {
 	return outputs
 }
 
-func validateHstsPort(listensPlain, ListensTLS []string) bool {
+func validateHstsPort(listensPlain, listensTLS []string) bool {
 	var fromOK, toOK bool
 
 	for _, listen := range listensPlain {
@@ -198,7 +198,7 @@ func validateHstsPort(listensPlain, ListensTLS []string) bool {
 		}
 	}
 
-	for _, listen := range ListensTLS {
+	for _, listen := range listensTLS {
 		port := util.ExtractListenPort(listen)
 		if len(port) == 0 || port == "443" {
 			toOK = true
@@ -209,29 +209,23 @@ func validateHstsPort(listensPlain, ListensTLS []string) bool {
 	return fromOK && toOK
 }
 
-func normalizeHttpsPort(httpsPort string, ListensTLS []string) (string, bool) {
+func normalizeHttpsPort(httpsPort string, listensTLS []string) (string, bool) {
 	if len(httpsPort) > 0 {
 		httpsPort = util.ExtractListenPort(httpsPort)
 		if len(httpsPort) == 0 {
 			return "", false
 		}
-	} else if len(ListensTLS) > 0 {
-		httpsPort = util.ExtractListenPort(ListensTLS[0])
+	} else if len(listensTLS) > 0 {
+		httpsPort = util.ExtractListenPort(listensTLS[0])
 	}
 
-	lenHttpsPort := len(httpsPort)
-	httpsColonPort := ":" + httpsPort
-	for _, listen := range ListensTLS {
-		if lenHttpsPort == 0 && len(listen) == 0 {
-			return "", true
-		}
-
+	for _, listen := range listensTLS {
 		port := util.ExtractListenPort(listen)
-		if lenHttpsPort == 0 && len(port) == 0 {
+		if len(httpsPort) == 0 && len(port) == 0 {
 			return "", true
 		}
 		if httpsPort == port {
-			return httpsColonPort, true
+			return ":" + httpsPort, true
 		}
 
 		if httpsPort == "443" && port == "" {

src/param/strUtil_test.go

@@ -220,6 +220,26 @@ func TestNormalizeHttpsPort(t *testing.T) {
 		t.Error("4")
 	}
 
+	httpsPort, ok = normalizeHttpsPort("", nil)
+	if ok {
+		t.Error("5")
+	}
+
+	httpsPort, ok = normalizeHttpsPort("", []string{})
+	if ok {
+		t.Error("5")
+	}
+
+	httpsPort, ok = normalizeHttpsPort("123", nil)
+	if ok {
+		t.Error("5")
+	}
+
+	httpsPort, ok = normalizeHttpsPort("123", []string{})
+	if ok {
+		t.Error("5")
+	}
+
 	httpsPort, ok = normalizeHttpsPort("", []string{""})
 	if !ok || httpsPort != "" {
 		t.Error("5")

src/serverHandler/hsts.go

@@ -36,9 +36,7 @@ func (h *handler) https(w http.ResponseWriter, r *http.Request) (needRedirect bo
 		targetPort = h.httpsPort
 	}
 
-	targetHost := hostname + targetPort
-
-	location := "https://" + targetHost + r.RequestURI
+	location := "https://" + hostname + targetPort + r.RequestURI
 	http.Redirect(w, r, location, http.StatusMovedPermanently)
 	return true
 }