Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reverseproxy: Rewrite requests and responses for websocket over http2 #6567

Merged
merged 11 commits into from
Dec 6, 2024
Merged

reverseproxy: Rewrite requests and responses for websocket over http2 #6567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
389cec4
reverse proxy: rewrite requests and responses for websocket over http2
WeidiDeng Sep 10, 2024
8eaa94b
delete protocol pseudo-header
WeidiDeng Sep 10, 2024
67778fc
modify cloned requests
WeidiDeng Sep 10, 2024
460c3e5
set request variable to track if it's a h2 websocket
WeidiDeng Sep 10, 2024
feac4b0
use request bodu
WeidiDeng Sep 10, 2024
ebd589c
rewrite request body
WeidiDeng Sep 10, 2024
0097468
use WebSocket instead of Websocket in the headers
WeidiDeng Nov 26, 2024
af10f23
Merge branch 'master' into reverse-proxy-h2-websocket
WeidiDeng Nov 26, 2024
12e5c5d
use logger check for zap loggers
WeidiDeng Nov 26, 2024
182153e
fix lint
WeidiDeng Nov 26, 2024
c9faf72
Merge branch 'master' into reverse-proxy-h2-websocket
WeidiDeng Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
set request variable to track if it's a h2 websocket
  • Loading branch information
@WeidiDeng
WeidiDeng committed Sep 10, 2024
commit 460c3e5d2aa359235749273f3d242088eca12d80
1 change: 1 addition & 0 deletions modules/caddyhttp/reverseproxy/reverseproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyht
// websocket over http2, assuming backend doesn't support this, the request will be modifided to http1.1 upgrade
// TODO: once we can reliably detect backend support this, it can be removed for those backends
if r.ProtoMajor == 2 && r.Method == http.MethodConnect && r.Header.Get(":protocol") != "" {
caddyhttp.SetVar(clonedReq.Context(), "h2_websocket", true)
clonedReq.Header.Del(":protocol")
clonedReq.Method = http.MethodGet
clonedReq.Header.Set("Upgrade", r.Header.Get(":protocol"))
Expand Down
3 changes: 2 additions & 1 deletion modules/caddyhttp/reverseproxy/streaming.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"context"
"errors"
"fmt"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"io"
weakrand "math/rand"
"mime"
Expand Down Expand Up @@ -87,7 +88,7 @@ func (h *Handler) handleUpgradeResponse(logger *zap.Logger, wg *sync.WaitGroup,
)
// websocket over http2, assuming backend doesn't support this, the request will be modifided to http1.1 upgrade
// TODO: once we can reliably detect backend support this, it can be removed for those backends
if req.ProtoMajor == 2 && req.Method == http.MethodConnect && req.Header.Get(":protocol") != "" {
if b, ok := caddyhttp.GetVar(req.Context(), "h2_websocket").(bool); ok && b {
rw.Header().Del("Upgrade")
rw.Header().Del("Connection")
rw.Header().Del("Sec-Websocket-Accept")
Expand Down
Loading