mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

http3: don't automatically set RoundTripper.QuicConfig.EnableDatagrams (#4340)

Browse source 
If the user provides a quic.Config, we shouldn't modify it. Instead, we
should return an error if the user enables HTTP Datagrams but fails to
enable datagrams on the QUIC layer.
This commit is contained in:
Marten Seemann 2024-03-03 17:09:21 +10:30 • committed by GitHub
parent c786a46f42
commit 0405634108
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
http3/client.go
View file

@ -73,6 +73,10 @@ var _ roundTripCloser = &client{}
func newClient(hostname string, tlsConf *tls.Config, opts *roundTripperOpts, conf *quic.Config, dialer dialFunc) (roundTripCloser, error) { func newClient(hostname string, tlsConf *tls.Config, opts *roundTripperOpts, conf *quic.Config, dialer dialFunc) (roundTripCloser, error) {
if conf == nil { if conf == nil {
conf = defaultQuicConfig.Clone() conf = defaultQuicConfig.Clone()
conf.EnableDatagrams = opts.EnableDatagram
}
if opts.EnableDatagram && !conf.EnableDatagrams {
return nil, errors.New("HTTP Datagrams enabled, but QUIC Datagrams disabled")
} }
if len(conf.Versions) == 0 { if len(conf.Versions) == 0 {
conf = conf.Clone() conf = conf.Clone()
@ -84,7 +88,6 @@ func newClient(hostname string, tlsConf *tls.Config, opts *roundTripperOpts, con
if conf.MaxIncomingStreams == 0 { if conf.MaxIncomingStreams == 0 {
conf.MaxIncomingStreams = -1 // don't allow any bidirectional streams conf.MaxIncomingStreams = -1 // don't allow any bidirectional streams
} }
conf.EnableDatagrams = opts.EnableDatagram
logger := utils.DefaultLogger.WithPrefix("h3 client") logger := utils.DefaultLogger.WithPrefix("h3 client")
if tlsConf == nil { if tlsConf == nil {

5
http3/roundtrip.go
View file

@ -50,9 +50,8 @@ type RoundTripper struct {
// If nil, reasonable default values will be used. // If nil, reasonable default values will be used.
QuicConfig *quic.Config QuicConfig *quic.Config
// Enable support for HTTP/3 datagrams. // Enable support for HTTP/3 datagrams (RFC 9297).
// If set to true, QuicConfig.EnableDatagram will be set. // If a QuicConfig is set, datagram support also needs to be enabled on the QUIC layer by setting EnableDatagrams.
// See https://datatracker.ietf.org/doc/html/rfc9297.
EnableDatagrams bool EnableDatagrams bool
// Additional HTTP/3 settings. // Additional HTTP/3 settings.

13
http3/roundtrip_test.go
View file

@ -99,6 +99,19 @@ var _ = Describe("RoundTripper", func() {
Expect(receivedConfig.HandshakeIdleTimeout).To(Equal(config.HandshakeIdleTimeout)) Expect(receivedConfig.HandshakeIdleTimeout).To(Equal(config.HandshakeIdleTimeout))
}) })
It("requires quic.Config.EnableDatagram if HTTP datagrams are enabled", func() {
rt.QuicConfig = &quic.Config{EnableDatagrams: false}
rt.Dial = func(_ context.Context, _ string, _ *tls.Config, config *quic.Config) (quic.EarlyConnection, error) {
return nil, errors.New("handshake error")
}
rt.EnableDatagrams = true
_, err := rt.RoundTrip(req)
Expect(err).To(MatchError("HTTP Datagrams enabled, but QUIC Datagrams disabled"))
rt.QuicConfig.EnableDatagrams = true
_, err = rt.RoundTrip(req)
Expect(err).To(MatchError("handshake error"))
})
It("uses the custom dialer, if provided", func() { It("uses the custom dialer, if provided", func() {
var dialed bool var dialed bool
dialer := func(_ context.Context, _ string, tlsCfgP *tls.Config, cfg *quic.Config) (quic.EarlyConnection, error) { dialer := func(_ context.Context, _ string, tlsCfgP *tls.Config, cfg *quic.Config) (quic.EarlyConnection, error) {