fix: keep tls config structurues of http and websockets separate, uns…

…hared ref: epinio#445 ref: gorilla/websocket#601 (comment)
riqueps · Jan 26, 2023 · 8e3f3df · 8e3f3df
1 parent 4f3665f
commit 8e3f3df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/internal/auth/certs.go b/internal/auth/certs.go
@@ -42,7 +42,7 @@ func ExtendLocalTrust(certs string) {
 	}
 
 	http.DefaultTransport.(*http.Transport).TLSClientConfig = config
-	websocket.DefaultDialer.TLSClientConfig = config
+	websocket.DefaultDialer.TLSClientConfig = config.Clone()
 
 	// See https://github.com/gorilla/websocket/issues/601 for
 	// what this is a work around for.

diff --git a/internal/cli/settings/settings.go b/internal/cli/settings/settings.go
@@ -132,13 +132,11 @@ func LoadFrom(file string) (*Settings, error) {
 			}
 
 			http.DefaultTransport.(*http.Transport).TLSClientConfig = tlsInsecure
-			websocket.DefaultDialer.TLSClientConfig = tlsInsecure
 		} else {
 			// nolint:gosec // Controlled by user option
 			http.DefaultTransport.(*http.Transport).TLSClientConfig.InsecureSkipVerify = true
-			// websocket.DefaultDialer.TLSClientConfig refers to the same structure,
-			// and the assignment has modified it also.
 		}
+		websocket.DefaultDialer.TLSClientConfig = http.DefaultTransport.(*http.Transport).TLSClientConfig.Clone()
 	}
 
 	if !cfg.Colors || viper.GetBool("no-colors") {