Merge pull request #749 from JanHolger/fix-panic-without-mtls

k8s-ci-robot · web-flow · commit e135055943ef · 2025-06-09T20:16:23.000-07:00
Fix panic when mtls is disabled
diff --git a/pkg/server/tunnel.go b/pkg/server/tunnel.go
@@ -40,7 +40,7 @@ func (t *Tunnel) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer metrics.Metrics.HTTPConnectionDec()
 
 	klog.V(2).InfoS("Received request for host", "method", r.Method, "host", r.Host, "userAgent", r.UserAgent())
-	if r.TLS != nil {
+	if r.TLS != nil && len(r.TLS.PeerCertificates) > 0 {
 		klog.V(2).InfoS("TLS", "commonName", r.TLS.PeerCertificates[0].Subject.CommonName)
 	}
 	if r.Method != http.MethodConnect {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (t Tunnel) ServeHTTP(w http.ResponseWriter, r http.Request) {`
`40`	`40`	`defer metrics.Metrics.HTTPConnectionDec()`
`41`	`41`
`42`	`42`	`klog.V(2).InfoS("Received request for host", "method", r.Method, "host", r.Host, "userAgent", r.UserAgent())`
`43`		`- if r.TLS != nil {`
	`43`	`+ if r.TLS != nil && len(r.TLS.PeerCertificates) > 0 {`
`44`	`44`	`klog.V(2).InfoS("TLS", "commonName", r.TLS.PeerCertificates[0].Subject.CommonName)`
`45`	`45`	`}`
`46`	`46`	`if r.Method != http.MethodConnect {`