aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWeidiDeng <[email protected]>2024-10-11 17:02:23 +0800
committerMatthew Holt <[email protected]>2024-12-20 09:38:19 -0700
commit93ec641d5da5c9974dff7b9f6f63b881c0b7a581 (patch)
tree67c374d80170db0fc421b62204a0619135b47725
parent030b6051f11e6ff6e5a936c6e4da2389aa0d0660 (diff)
downloadcaddy-93ec641d5da5c9974dff7b9f6f63b881c0b7a581.tar.gz
caddy-93ec641d5da5c9974dff7b9f6f63b881c0b7a581.zip
reverseproxy: Use correct cases for websocket related headers (#6621)
Co-authored-by: Francis Lavoie <[email protected]>
-rw-r--r--modules/caddyhttp/reverseproxy/reverseproxy.go25
1 files changed, 25 insertions, 0 deletions
diff --git a/modules/caddyhttp/reverseproxy/reverseproxy.go b/modules/caddyhttp/reverseproxy/reverseproxy.go
index 907b47b0a..0a286e62d 100644
--- a/modules/caddyhttp/reverseproxy/reverseproxy.go
+++ b/modules/caddyhttp/reverseproxy/reverseproxy.go
@@ -573,6 +573,30 @@ func (h *Handler) proxyLoopIteration(r *http.Request, origReq *http.Request, w h
return false, proxyErr
}
+// Mapping of the canonical form of the headers, to the RFC 6455 form,
+// i.e. `WebSocket` with uppercase 'S'.
+var websocketHeaderMapping = map[string]string{
+ "Sec-Websocket-Accept": "Sec-WebSocket-Accept",
+ "Sec-Websocket-Extensions": "Sec-WebSocket-Extensions",
+ "Sec-Websocket-Key": "Sec-WebSocket-Key",
+ "Sec-Websocket-Protocol": "Sec-WebSocket-Protocol",
+ "Sec-Websocket-Version": "Sec-WebSocket-Version",
+}
+
+// normalizeWebsocketHeaders ensures we use the standard casing as per
+// RFC 6455, i.e. `WebSocket` with uppercase 'S'. Most servers don't
+// care about this difference (read headers case insensitively), but
+// some do, so this maximizes compatibility with upstreams.
+// See https://github.com/caddyserver/caddy/pull/6621
+func normalizeWebsocketHeaders(header http.Header) {
+ for k, rk := range websocketHeaderMapping {
+ if v, ok := header[k]; ok {
+ delete(header, k)
+ header[rk] = v
+ }
+ }
+}
+
// prepareRequest clones req so that it can be safely modified without
// changing the original request or introducing data races. It then
// modifies it so that it is ready to be proxied, except for directing
@@ -643,6 +667,7 @@ func (h Handler) prepareRequest(req *http.Request, repl *caddy.Replacer) (*http.
if reqUpType != "" {
req.Header.Set("Connection", "Upgrade")
req.Header.Set("Upgrade", reqUpType)
+ normalizeWebsocketHeaders(req.Header)
}
// Set up the PROXY protocol info