caddyhttp: Fix panic when request missing ClientIPVarKey (#6040)

caddyserver · Jan 24, 2024 · f5344f8 · f5344f8
1 parent 750d0b8
commit f5344f8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/modules/caddyhttp/marshalers.go b/modules/caddyhttp/marshalers.go
@@ -40,7 +40,9 @@ func (r LoggableHTTPRequest) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 
 	enc.AddString("remote_ip", ip)
 	enc.AddString("remote_port", port)
-	enc.AddString("client_ip", GetVar(r.Context(), ClientIPVarKey).(string))
+	if ip, ok := GetVar(r.Context(), ClientIPVarKey).(string); ok {
+		enc.AddString("client_ip", ip)
+	}
 	enc.AddString("proto", r.Proto)
 	enc.AddString("method", r.Method)
 	enc.AddString("host", r.Host)