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

Merge pull request #552 from lucas-clemente/fix-551

Browse Source 
fix race condition when saving the encryption level in h2quic.Client
This commit is contained in:
Marten Seemann
2017-04-18 17:02:19 +07:00
committed by GitHub
parent 2a1b3da971 dc782e78eb
commit 8b351a9b7e
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
h2quic/client.go
View File

@@ -64,6 +64,8 @@ func (c *Client) Dial() error {
return err return err
} }
// connStateCallback is the ConnStateCallback passed to the quic.Dial
// this function is called in a separate go-routine
func (c *Client) connStateCallback(sess quic.Session, state quic.ConnState) { func (c *Client) connStateCallback(sess quic.Session, state quic.ConnState) {
c.mutex.Lock() c.mutex.Lock()
if c.session == nil { if c.session == nil {
@@ -76,12 +78,15 @@ func (c *Client) connStateCallback(sess quic.Session, state quic.ConnState) {
c.Close(err) c.Close(err)
} }
case quic.ConnStateSecure: case quic.ConnStateSecure:
c.encryptionLevel = protocol.EncryptionSecure
utils.Debugf("is secure") utils.Debugf("is secure")
// only save the encryption level if it is now higher than it was before
if c.encryptionLevel < protocol.EncryptionSecure {
c.encryptionLevel = protocol.EncryptionSecure
}
c.cryptoChangedCond.Broadcast() c.cryptoChangedCond.Broadcast()
case quic.ConnStateForwardSecure: case quic.ConnStateForwardSecure:
c.encryptionLevel = protocol.EncryptionForwardSecure
utils.Debugf("is forward secure") utils.Debugf("is forward secure")
c.encryptionLevel = protocol.EncryptionForwardSecure
c.cryptoChangedCond.Broadcast() c.cryptoChangedCond.Broadcast()
} }
c.mutex.Unlock() c.mutex.Unlock()

7
h2quic/client_test.go
View File

@@ -104,6 +104,13 @@ var _ = Describe("Client", func() {
Expect(client.encryptionLevel).To(Equal(protocol.EncryptionForwardSecure)) Expect(client.encryptionLevel).To(Equal(protocol.EncryptionForwardSecure))
}) })
It("sets the correct crypto level, if the ConnStateCallback is called in the wrong order", func() {
client.config.ConnState(session, quic.ConnStateForwardSecure)
Expect(client.encryptionLevel).To(Equal(protocol.EncryptionForwardSecure))
client.config.ConnState(session, quic.ConnStateSecure)
Expect(client.encryptionLevel).To(Equal(protocol.EncryptionForwardSecure))
})
Context("Doing requests", func() { Context("Doing requests", func() {
var request *http.Request var request *http.Request
var dataStream *mockStream var dataStream *mockStream