CERBERUS/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-08-04 14:58:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reverseproxy: inline WebTransport protocol const and writer interface

Browse source 
Francis pointed out in review of #7669 that importing the whole
modules/caddyhttp/webtransport package solely to pull in one constant
and one interface wasn't worthwhile.

Move both into webtransport_transport.go as unexported identifiers
(webtransportProtocol, webtransportWriter). This removes reverseproxy's
dependency on the caddywt package and clears the way for moving the
echo handler itself out of the production module tree.

No behavior change.
This commit is contained in:
tomholford 2026-04-23 11:04:10 -07:00
parent ce2b861cdc
commit 9cd591db87
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/caddyhttp/reverseproxy/webtransport_transport.go
View file

@ -23,20 +23,35 @@ import (
"time"
"github.com/quic-go/quic-go"
"github.com/quic-go/quic-go/http3"
"github.com/quic-go/webtransport-go"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
caddywt "github.com/caddyserver/caddy/v2/modules/caddyhttp/webtransport"
)
// webtransportProtocol is the :protocol pseudo-header value sent by a
// client that wants to establish a WebTransport session over an HTTP/3
// Extended CONNECT.
const webtransportProtocol = "webtransport"
// webtransportWriter is the naked HTTP/3 response-writer shape that
// webtransport.Server.Upgrade type-asserts on. Caddy's
// UnwrapResponseWriterAs walks the ResponseWriter wrapper chain to this
// type before calling Upgrade.
type webtransportWriter interface {
http.ResponseWriter
http3.Settingser
http3.HTTPStreamer
}
// isWebTransportExtendedConnect reports whether r is an HTTP/3 Extended
// CONNECT that requests a WebTransport session. Does not check whether
// WebTransport proxying is configured; callers gate on Handler state.
func isWebTransportExtendedConnect(r *http.Request) bool {
return r.ProtoMajor == 3 && r.Method == http.MethodConnect && r.Proto == caddywt.Protocol
return r.ProtoMajor == 3 && r.Method == http.MethodConnect && r.Proto == webtransportProtocol
}
// serveWebTransport handles a WebTransport Extended CONNECT: selects an
@ -118,7 +133,7 @@ func (h *Handler) serveWebTransport(w http.ResponseWriter, r *http.Request) erro
// Reach the naked http3 response writer so Upgrade's type assertions
// succeed through Caddy's wrapper chain. Done before dialing so we
// fail fast if the writer stack is unexpectedly incompatible.
naked, ok := caddyhttp.UnwrapResponseWriterAs[caddywt.Writer](w)
naked, ok := caddyhttp.UnwrapResponseWriterAs[webtransportWriter](w)
if !ok {
return caddyhttp.Error(http.StatusInternalServerError,
errors.New("webtransport: response writer does not support WebTransport upgrade"))