Merge pull request #268 from tucksaun/refacto/SSLKEYLOGFILE-env-var

fabpot · web-flow · commit d035d4373e5c · 2023-02-08T15:04:21.000+01:00
Refacto: Make the console handles SSLKEYLOGFILE env variable precedences
diff --git a/commands/local_server_start.go b/commands/local_server_start.go
@@ -72,6 +72,12 @@ var localServerStartCmd = &console.Command{
 		&console.StringFlag{
 			Name:  "tls-key-log-file",
 			Usage: "Destination for TLS master secrets in NSS key log format",
+			// If 'SSLKEYLOGFILE' environment variable is set, uses this as a
+			// destination of TLS key log. In this context, the name
+			// 'SSLKEYLOGFILE' is common, so using 'SSL' instead of 'TLS' name.
+			// This environment variable is preferred than the key log file
+			// from the console argument.
+			EnvVars: []string{"SSLKEYLOGFILE"},
 		},
 	},
 	Action: func(c *console.Context) error {
@@ -174,13 +180,6 @@ var localServerStartCmd = &console.Command{
 			}
 		}
 
-		// If 'SSLKEYLOGFILE' environment variable is set, uses this as a destination of TLS key log.
-		// In this context, the name 'SSLKEYLOGFILE' is common, so using 'SSL' instead of 'TLS' name.
-		// This environment variable is preferred than the key log file from the console argument.
-		if path := os.Getenv("SSLKEYLOGFILE"); path != "" {
-			config.TlsKeyLogFile = path
-		}
-
 		if config.TlsKeyLogFile != "" {
 			ui.Warning(localWebServerTlsKeyLogWarningMsg)
 		}
