gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1779 from lucas-clemente/remove-tls-received-extensions-error

Browse Source 
remove the error return value when receiving TLS extensions
This commit is contained in:
Marten Seemann
2019-02-07 20:51:57 +08:00
committed by GitHub
parent f4057379fe 26afc7a4ca
commit 7dc4be2ce9
7 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/handshake/interface.go
View File

@@ -24,7 +24,7 @@ type Sealer interface {
// A tlsExtensionHandler sends and received the QUIC TLS extension.
type tlsExtensionHandler interface {
GetExtensions(msgType uint8) []qtls.Extension
ReceivedExtensions(msgType uint8, exts []qtls.Extension) error
ReceivedExtensions(msgType uint8, exts []qtls.Extension)
TransportParameters() <-chan []byte
}

5
internal/handshake/tls_extension_handler.go
View File

@@ -34,10 +34,10 @@ func (h *extensionHandler) GetExtensions(msgType uint8) []qtls.Extension {
}}
}
func (h *extensionHandler) ReceivedExtensions(msgType uint8, exts []qtls.Extension) error {
func (h *extensionHandler) ReceivedExtensions(msgType uint8, exts []qtls.Extension) {
if (h.perspective == protocol.PerspectiveClient && messageType(msgType) != typeEncryptedExtensions) ||
(h.perspective == protocol.PerspectiveServer && messageType(msgType) != typeClientHello) {
return nil
return
}
var data []byte
@@ -49,7 +49,6 @@ func (h *extensionHandler) ReceivedExtensions(msgType uint8, exts []qtls.Extensi
}
h.paramsChan <- data
return nil
}
func (h *extensionHandler) TransportParameters() <-chan []byte {

16
internal/handshake/tls_extension_handler_test.go
View File

@@ -52,7 +52,7 @@ var _ = Describe("TLS Extension Handler, for the server", func() {
It("sends the extension on the channel", func() {
go func() {
defer GinkgoRecover()
Expect(handlerServer.ReceivedExtensions(uint8(typeClientHello), chExts)).To(Succeed())
handlerServer.ReceivedExtensions(uint8(typeClientHello), chExts)
}()
var data []byte
@@ -63,7 +63,7 @@ var _ = Describe("TLS Extension Handler, for the server", func() {
It("sends nil on the channel if the extension is missing", func() {
go func() {
defer GinkgoRecover()
Expect(handlerServer.ReceivedExtensions(uint8(typeClientHello), nil)).To(Succeed())
handlerServer.ReceivedExtensions(uint8(typeClientHello), nil)
}()
var data []byte
@@ -75,7 +75,7 @@ var _ = Describe("TLS Extension Handler, for the server", func() {
go func() {
defer GinkgoRecover()
exts := []qtls.Extension{{Type: 0x1337, Data: []byte("invalid")}}
Expect(handlerServer.ReceivedExtensions(uint8(typeClientHello), exts)).To(Succeed())
handlerServer.ReceivedExtensions(uint8(typeClientHello), exts)
}()
var data []byte
@@ -86,7 +86,7 @@ var _ = Describe("TLS Extension Handler, for the server", func() {
It("ignores extensions that are not sent with the ClientHello", func() {
go func() {
defer GinkgoRecover()
Expect(handlerServer.ReceivedExtensions(uint8(typeFinished), chExts)).To(Succeed())
handlerServer.ReceivedExtensions(uint8(typeFinished), chExts)
}()
Consistently(handlerServer.TransportParameters()).ShouldNot(Receive())
@@ -121,7 +121,7 @@ var _ = Describe("TLS Extension Handler, for the server", func() {
It("sends the extension on the channel", func() {
go func() {
defer GinkgoRecover()
Expect(handlerClient.ReceivedExtensions(uint8(typeEncryptedExtensions), chExts)).To(Succeed())
handlerClient.ReceivedExtensions(uint8(typeEncryptedExtensions), chExts)
}()
var data []byte
@@ -132,7 +132,7 @@ var _ = Describe("TLS Extension Handler, for the server", func() {
It("sends nil on the channel if the extension is missing", func() {
go func() {
defer GinkgoRecover()
Expect(handlerClient.ReceivedExtensions(uint8(typeEncryptedExtensions), nil)).To(Succeed())
handlerClient.ReceivedExtensions(uint8(typeEncryptedExtensions), nil)
}()
var data []byte
@@ -144,7 +144,7 @@ var _ = Describe("TLS Extension Handler, for the server", func() {
go func() {
defer GinkgoRecover()
exts := []qtls.Extension{{Type: 0x1337, Data: []byte("invalid")}}
Expect(handlerClient.ReceivedExtensions(uint8(typeEncryptedExtensions), exts)).To(Succeed())
handlerClient.ReceivedExtensions(uint8(typeEncryptedExtensions), exts)
}()
var data []byte
@@ -155,7 +155,7 @@ var _ = Describe("TLS Extension Handler, for the server", func() {
It("ignores extensions that are not sent with the EncryptedExtensions", func() {
go func() {
defer GinkgoRecover()
Expect(handlerClient.ReceivedExtensions(uint8(typeFinished), chExts)).To(Succeed())
handlerClient.ReceivedExtensions(uint8(typeFinished), chExts)
}()
Consistently(handlerClient.TransportParameters()).ShouldNot(Receive())