Merge pull request PelicanPlatform#234 from Techming/fix-tls

Prevent TLSSkipVerify from being overwritten
joereuss12 · Oct 16, 2023 · 327a2df · 327a2df
2 parents 96d9cc0 + c816ca2
commit 327a2df
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/config/config.go b/config/config.go
@@ -275,7 +275,12 @@ func setupTransport() {
 		systemPool, err := x509.SystemCertPool()
 		if err == nil {
 			systemPool.AddCert(caCert)
-			transport.TLSClientConfig = &tls.Config{RootCAs: systemPool}
+			// Ensure that we don't override the InsecureSkipVerify if it's present
+			if transport.TLSClientConfig == nil {
+				transport.TLSClientConfig = &tls.Config{RootCAs: systemPool}
+			} else {
+				transport.TLSClientConfig.RootCAs = systemPool
+			}
 		}
 	}
 }