refactor(param): decouple hsts & to-https cli param deserialization and normalization

Author: marjune163

src/param/cli.go

@@ -392,16 +392,10 @@ func ParseCli() (params []*Param, printVersion, printHelp bool, errs []error) {
 		param.ListensTLS, _ = result.GetStrings("listenstls")
 
 		// hsts & https
-		if len(param.ListensTLS) > 0 {
-			if result.HasKey("globalhsts") {
-				param.GlobalHsts = validateHstsPort(param.ListensPlain, param.ListensTLS)
-			}
+		param.GlobalHsts = result.HasKey("globalhsts")
 
-			if result.HasKey("globalhttps") {
-				httpsPort, _ := result.GetString("globalhttps")
-				param.HttpsPort, param.GlobalHttps = normalizeHttpsPort(httpsPort, param.ListensTLS)
-			}
-		}
+		param.GlobalHttps = result.HasKey("globalhttps")
+		param.HttpsPort, _ = result.GetString("globalhttps")
 
 		// shows/hides
 		param.Shows, _ = result.GetStrings("shows")

src/param/main.go

@@ -158,5 +158,14 @@ func (param *Param) normalize() (errs []error) {
 	param.AuthUrls = normalizeUrlPaths(param.AuthUrls)
 	param.AuthDirs = normalizeFsPaths(param.AuthDirs)
 
+	// hsts & https
+	if param.GlobalHsts {
+		param.GlobalHsts = validateHstsPort(param.ListensPlain, param.ListensTLS)
+	}
+
+	if param.GlobalHttps {
+		param.HttpsPort, param.GlobalHttps = normalizeHttpsPort(param.HttpsPort, param.ListensTLS)
+	}
+
 	return
 }