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

http3: only use :protocol pseudo-header for Extended CONNECT (#4261)

Browse source 
* Fix protocol

The default value should be "HTTP/3.0".

* Reject normal request with :protocol header

The :protocol pseudo header is only defined for
Extended Connect requests (RFC 9220).

* save one branch check

* Fix review issue
This commit is contained in:
taoso 2024-01-26 11:07:35 +08:00 • committed by GitHub
parent d3974e1674
commit 808f849ca2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
http3/headers.go
View file

@ -126,9 +126,14 @@ func requestFromHeaders(headerFields []qpack.HeaderField) (*http.Request, error)
return nil, errors.New(":path, :authority and :method must not be empty") return nil, errors.New(":path, :authority and :method must not be empty")
} }
if !isExtendedConnected && len(hdr.Protocol) > 0 {
return nil, errors.New(":protocol must be empty")
}
var u *url.URL var u *url.URL
var requestURI string var requestURI string
var protocol string
protocol := "HTTP/3.0"
if isConnect { if isConnect {
u = &url.URL{} u = &url.URL{}
@ -137,15 +142,14 @@ func requestFromHeaders(headerFields []qpack.HeaderField) (*http.Request, error)
if err != nil { if err != nil {
return nil, err return nil, err
} }
protocol = hdr.Protocol
} else { } else {
u.Path = hdr.Path u.Path = hdr.Path
} }
u.Scheme = hdr.Scheme u.Scheme = hdr.Scheme
u.Host = hdr.Authority u.Host = hdr.Authority
requestURI = hdr.Authority requestURI = hdr.Authority
protocol = hdr.Protocol
} else { } else {
protocol = "HTTP/3.0"
u, err = url.ParseRequestURI(hdr.Path) u, err = url.ParseRequestURI(hdr.Path)
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid content length: %w", err) return nil, fmt.Errorf("invalid content length: %w", err)

12
http3/headers_test.go
View file

@ -212,6 +212,17 @@ var _ = Describe("Request", func() {
Expect(err).To(MatchError(":path, :authority and :method must not be empty")) Expect(err).To(MatchError(":path, :authority and :method must not be empty"))
}) })
It("errors with invalid protocol", func() {
headers := []qpack.HeaderField{
{Name: ":path", Value: "/foo"},
{Name: ":authority", Value: "quic.clemente.io"},
{Name: ":method", Value: "GET"},
{Name: ":protocol", Value: "connect-udp"},
}
_, err := requestFromHeaders(headers)
Expect(err).To(MatchError(":protocol must be empty"))
})
Context("regular HTTP CONNECT", func() { Context("regular HTTP CONNECT", func() {
It("handles CONNECT method", func() { It("handles CONNECT method", func() {
headers := []qpack.HeaderField{ headers := []qpack.HeaderField{
@ -221,6 +232,7 @@ var _ = Describe("Request", func() {
req, err := requestFromHeaders(headers) req, err := requestFromHeaders(headers)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(req.Method).To(Equal(http.MethodConnect)) Expect(req.Method).To(Equal(http.MethodConnect))
Expect(req.Proto).To(Equal("HTTP/3.0"))
Expect(req.RequestURI).To(Equal("quic.clemente.io")) Expect(req.RequestURI).To(Equal("quic.clemente.io"))
}) })