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

remove duplicate check of the URL scheme in the HTTP/3 client

Browse source 
There's already a check like this performed in the http3.RoundTripper.
This commit is contained in:
Marten Seemann 2020-12-25 13:15:53 +07:00
parent 68e8c4d1dd
commit 7e4ac36b2f
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
http3/client.go
View file

@ -201,9 +201,6 @@ func (c *client) maxHeaderBytes() uint64 {
// RoundTrip executes a request and returns a response // RoundTrip executes a request and returns a response
func (c *client) RoundTrip(req *http.Request) (*http.Response, error) { func (c *client) RoundTrip(req *http.Request) (*http.Response, error) {
if req.URL.Scheme != "https" {
return nil, errors.New("http3: unsupported scheme")
}
if authorityAddr("https", hostnameFromRequest(req)) != c.hostname { if authorityAddr("https", hostnameFromRequest(req)) != c.hostname {
return nil, fmt.Errorf("http3 client BUG: RoundTrip called for the wrong client (expected %s, got %s)", c.hostname, req.Host) return nil, fmt.Errorf("http3 client BUG: RoundTrip called for the wrong client (expected %s, got %s)", c.hostname, req.Host)
} }

10
http3/client_test.go
View file

@ -173,11 +173,15 @@ var _ = Describe("Client", func() {
Expect(err).To(MatchError("http3 client BUG: RoundTrip called for the wrong client (expected quic.clemente.io:1337, got quic.clemente.io:1336)")) Expect(err).To(MatchError("http3 client BUG: RoundTrip called for the wrong client (expected quic.clemente.io:1337, got quic.clemente.io:1336)"))
}) })
It("refuses to do plain HTTP requests", func() { It("allows requests using a different scheme", func() {
req, err := http.NewRequest("https", "http://quic.clemente.io:1337/foobar.html", nil) testErr := errors.New("handshake error")
req, err := http.NewRequest("masque", "masque://quic.clemente.io:1337/foobar.html", nil)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
dialAddr = func(hostname string, _ *tls.Config, _ *quic.Config) (quic.EarlySession, error) {
return nil, testErr
}
_, err = client.RoundTrip(req) _, err = client.RoundTrip(req)
Expect(err).To(MatchError("http3: unsupported scheme")) Expect(err).To(MatchError(testErr))
}) })
}) })