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

replace the list of ALPN instead of appending to it in http3

Browse source
This commit is contained in:
Marten Seemann 2019-08-24 10:51:01 +07:00
parent f4621e280e
commit fd30146de5
4 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
http3/client.go
View file

@ -57,10 +57,11 @@ func newClient(
) *client {
if tlsConf == nil {
tlsConf = &tls.Config{}
} else {
tlsConf = tlsConf.Clone()
}
if !strSliceContains(tlsConf.NextProtos, nextProtoH3) {
tlsConf.NextProtos = append(tlsConf.NextProtos, nextProtoH3)
}
// Replace existing ALPNs by H3
tlsConf.NextProtos = []string{nextProtoH3}
if quicConfig == nil {
quicConfig = defaultQuicConfig
}

6
http3/client_test.go
View file

@ -85,13 +85,15 @@ var _ = Describe("Client", func() {
) (quic.Session, error) {
Expect(hostname).To(Equal("localhost:1337"))
Expect(tlsConfP.ServerName).To(Equal(tlsConf.ServerName))
Expect(tlsConfP.NextProtos).To(Equal([]string{"proto foo", "proto bar", nextProtoH3}))
Expect(tlsConfP.NextProtos).To(Equal([]string{nextProtoH3}))
Expect(quicConfP.IdleTimeout).To(Equal(quicConf.IdleTimeout))
dialAddrCalled = true
return nil, errors.New("test done")
}
client.RoundTrip(req)
Expect(dialAddrCalled).To(BeTrue())
// make sure the original tls.Config was not modified
Expect(tlsConf.NextProtos).To(Equal([]string{"proto foo", "proto bar"}))
})
It("uses the custom dialer, if provided", func() {
@ -102,7 +104,7 @@ var _ = Describe("Client", func() {
dialer := func(network, address string, tlsConfP *tls.Config, quicConfP *quic.Config) (quic.Session, error) {
Expect(network).To(Equal("udp"))
Expect(address).To(Equal("localhost:1337"))
Expect(tlsConfP).To(Equal(tlsConf))
Expect(tlsConfP.ServerName).To(Equal("foo.bar"))
Expect(quicConfP.IdleTimeout).To(Equal(quicConf.IdleTimeout))
dialerCalled = true
return nil, testErr

27
http3/server.go
View file

@ -77,7 +77,7 @@ func (s *Server) Serve(conn net.PacketConn) error {
return s.serveImpl(s.TLSConfig, conn)
}
func (s *Server) serveImpl(tlsConfig *tls.Config, conn net.PacketConn) error {
func (s *Server) serveImpl(tlsConf *tls.Config, conn net.PacketConn) error {
if s.Server == nil {
return errors.New("use of http3.Server without http.Server")
}
@ -92,20 +92,20 @@ func (s *Server) serveImpl(tlsConfig *tls.Config, conn net.PacketConn) error {
return errors.New("ListenAndServe may only be called once")
}
if tlsConfig == nil {
tlsConfig = &tls.Config{}
}
if !strSliceContains(tlsConfig.NextProtos, nextProtoH3) {
tlsConfig.NextProtos = append(tlsConfig.NextProtos, nextProtoH3)
if tlsConf == nil {
tlsConf = &tls.Config{}
} else {
tlsConf = tlsConf.Clone()
}
// Replace existing ALPNs by H3
tlsConf.NextProtos = []string{nextProtoH3}
var ln quic.Listener
var err error
if conn == nil {
ln, err = quicListenAddr(s.Addr, tlsConfig, s.QuicConfig)
ln, err = quicListenAddr(s.Addr, tlsConf, s.QuicConfig)
} else {
ln, err = quicListen(conn, tlsConfig, s.QuicConfig)
ln, err = quicListen(conn, tlsConf, s.QuicConfig)
}
if err != nil {
s.listenerMutex.Unlock()
@ -385,12 +385,3 @@ func ListenAndServe(addr, certFile, keyFile string, handler http.Handler) error
return err
}
}
func strSliceContains(ss []string, s string) bool {
for _, v := range ss {
if v == s {
return true
}
}
return false
}

9
http3/server_test.go
View file

@ -383,15 +383,18 @@ var _ = Describe("Server", func() {
Expect(receivedConf).To(Equal(conf))
})
It("adds the ALPN token to the tls.Config", func() {
It("replaces the ALPN token to the tls.Config", func() {
tlsConf := &tls.Config{NextProtos: []string{"foo", "bar"}}
var receivedConf *tls.Config
quicListenAddr = func(addr string, tlsConf *tls.Config, _ *quic.Config) (quic.Listener, error) {
receivedConf = tlsConf
return nil, errors.New("listen err")
}
s.TLSConfig = &tls.Config{NextProtos: []string{"foo", "bar"}}
s.TLSConfig = tlsConf
Expect(s.ListenAndServe()).To(HaveOccurred())
Expect(receivedConf.NextProtos).To(Equal([]string{"foo", "bar", nextProtoH3}))
Expect(receivedConf.NextProtos).To(Equal([]string{nextProtoH3}))
// make sure the original tls.Config was not modified
Expect(tlsConf.NextProtos).To(Equal([]string{"foo", "bar"}))
})
It("uses the ALPN token if no tls.Config is given", func() {