From 68e468a3bc753c8faa7802050e23db096586a28c Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 5 Aug 2021 10:28:43 +0200 Subject: [PATCH] drop support for Go 1.15 --- .circleci/config.yml | 1 - .github/workflows/cross-compile.yml | 2 +- .github/workflows/go-generate.sh | 1 - .github/workflows/go-generate.yml | 7 +- .github/workflows/integration.yml | 2 +- .github/workflows/unit.yml | 2 +- go.mod | 3 +- go.sum | 4 +- integrationtests/self/cancelation_test.go | 17 ++-- integrationtests/self/conn_id_test.go | 4 +- integrationtests/self/deadline_test.go | 6 +- integrationtests/self/early_data_test.go | 4 +- integrationtests/self/handshake_drop_test.go | 6 +- integrationtests/self/handshake_test.go | 4 +- integrationtests/self/http_test.go | 17 ++-- integrationtests/self/key_update_test.go | 4 +- integrationtests/self/mitm_test.go | 6 +- integrationtests/self/multiplex_test.go | 4 +- integrationtests/self/rtt_test.go | 6 +- integrationtests/self/stream_test.go | 6 +- integrationtests/self/timeout_test.go | 3 +- integrationtests/self/tracer_test.go | 2 +- integrationtests/self/uni_stream_test.go | 4 +- integrationtests/self/zero_rtt_test.go | 10 +- internal/qerr/errors.go | 30 ++++-- internal/qerr/errors_go116.go | 14 --- internal/qerr/errors_go116_test.go | 22 ---- internal/qerr/errors_test.go | 10 ++ internal/qtls/go115.go | 100 ------------------- tools.go | 1 + 30 files changed, 93 insertions(+), 209 deletions(-) delete mode 100644 internal/qerr/errors_go116.go delete mode 100644 internal/qerr/errors_go116_test.go delete mode 100644 internal/qtls/go115.go diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f16219b..7ab4ec5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,5 +52,4 @@ jobs: workflows: workflow: jobs: - - go115 - go116 diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml index a7ac04ab..a37b6145 100644 --- a/.github/workflows/cross-compile.yml +++ b/.github/workflows/cross-compile.yml @@ -4,7 +4,7 @@ jobs: strategy: fail-fast: false matrix: - go: [ "1.15.x", "1.16.x", "1.17.0-rc1" ] + go: [ "1.16.x", "1.17.0-rc1" ] runs-on: ubuntu-latest name: "Cross Compilation (Go ${{matrix.go}})" steps: diff --git a/.github/workflows/go-generate.sh b/.github/workflows/go-generate.sh index 727d04b1..ff168aa7 100755 --- a/.github/workflows/go-generate.sh +++ b/.github/workflows/go-generate.sh @@ -5,7 +5,6 @@ set -e DIR=$(pwd) TMP=$(mktemp -d) cd "$TMP" -mkdir orig generated cp -r "$DIR" orig cp -r "$DIR" generated diff --git a/.github/workflows/go-generate.yml b/.github/workflows/go-generate.yml index 791e38dd..1521698d 100644 --- a/.github/workflows/go-generate.yml +++ b/.github/workflows/go-generate.yml @@ -5,6 +5,8 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 + with: + go-version: "1.16.x" - name: Install dependencies run: go build - name: Install code generators @@ -13,7 +15,4 @@ jobs: go install -v github.com/golang/mock/mockgen go install -v golang.org/x/tools/cmd/goimports - name: Run code generators - run: | - export GOPATH=$(go env GOPATH) - export PATH=$PATH:$GOPATH/bin - .github/workflows/go-generate.sh + run: .github/workflows/go-generate.sh diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 0be8795d..7b870621 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -5,7 +5,7 @@ jobs: strategy: fail-fast: false matrix: - go: [ "1.15.x", "1.16.x", "1.17.0-rc1" ] + go: [ "1.16.x", "1.17.0-rc1" ] runs-on: ubuntu-latest env: DEBUG: false # set this to true to export qlogs and save them as artifacts diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 6b7822f8..8a78d1a3 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -7,7 +7,7 @@ jobs: fail-fast: false matrix: os: [ "ubuntu", "windows", "macos" ] - go: [ "1.15.x", "1.16.x", "1.17.0-rc1" ] + go: [ "1.16.x", "1.17.0-rc1" ] runs-on: ${{ matrix.os }}-latest name: Unit tests (${{ matrix.os}}, Go ${{ matrix.go }}) steps: diff --git a/go.mod b/go.mod index 15f274c6..480653f4 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,12 @@ module github.com/lucas-clemente/quic-go -go 1.15 +go 1.16 require ( github.com/cheekybits/genny v1.0.0 github.com/francoispqt/gojay v1.2.13 github.com/golang/mock v1.6.0 github.com/marten-seemann/qpack v0.2.1 - github.com/marten-seemann/qtls-go1-15 v0.1.5 github.com/marten-seemann/qtls-go1-16 v0.1.4 github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1 github.com/onsi/ginkgo v1.16.4 diff --git a/go.sum b/go.sum index 9dd3c38f..2494ec41 100644 --- a/go.sum +++ b/go.sum @@ -55,7 +55,6 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -82,8 +81,6 @@ github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs= github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= -github.com/marten-seemann/qtls-go1-15 v0.1.5 h1:Ci4EIUN6Rlb+D6GmLdej/bCQ4nPYNtVXQB+xjiXE1nk= -github.com/marten-seemann/qtls-go1-15 v0.1.5/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco= github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1 h1:/rpmWuGvceLwwWuaKPdjpR4JJEUH0tq64/I3hvzaNLM= @@ -165,6 +162,7 @@ golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/integrationtests/self/cancelation_test.go b/integrationtests/self/cancelation_test.go index fb966638..60183f91 100644 --- a/integrationtests/self/cancelation_test.go +++ b/integrationtests/self/cancelation_test.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "math/rand" "net" "sync" @@ -93,7 +92,7 @@ var _ = Describe("Stream Cancelations", func() { str.CancelRead(quic.StreamErrorCode(str.StreamID())) return } - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) }() @@ -134,14 +133,14 @@ var _ = Describe("Stream Cancelations", func() { // only read some data from about 1/3 of the streams if rand.Int31()%3 != 0 { length := int(rand.Int31n(int32(len(PRData) - 1))) - data, err := ioutil.ReadAll(io.LimitReader(str, int64(length))) + data, err := io.ReadAll(io.LimitReader(str, int64(length))) Expect(err).ToNot(HaveOccurred()) str.CancelRead(quic.StreamErrorCode(str.StreamID())) Expect(data).To(Equal(PRData[:length])) atomic.AddInt32(&canceledCounter, 1) return } - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) }() @@ -179,7 +178,7 @@ var _ = Describe("Stream Cancelations", func() { defer wg.Done() str, err := sess.AcceptUniStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) if err != nil { atomic.AddInt32(&counter, 1) Expect(err).To(MatchError(&quic.StreamError{ @@ -329,7 +328,7 @@ var _ = Describe("Stream Cancelations", func() { str.CancelRead(quic.StreamErrorCode(str.StreamID())) return } - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) if err != nil { Expect(err).To(MatchError(&quic.StreamError{ StreamID: str.StreamID(), @@ -418,7 +417,7 @@ var _ = Describe("Stream Cancelations", func() { length = int(rand.Int31n(int32(len(PRData) - 1))) r = io.LimitReader(str, int64(length)) } - data, err := ioutil.ReadAll(r) + data, err := io.ReadAll(r) if err != nil { Expect(err).To(MatchError(&quic.StreamError{ StreamID: str.StreamID(), @@ -501,7 +500,7 @@ var _ = Describe("Stream Cancelations", func() { } return } - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) wg.Done() @@ -571,7 +570,7 @@ var _ = Describe("Stream Cancelations", func() { Expect(err).ToNot(HaveOccurred()) go func(str quic.ReceiveStream) { defer GinkgoRecover() - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) wg.Done() diff --git a/integrationtests/self/conn_id_test.go b/integrationtests/self/conn_id_test.go index 46d1355a..c93a82c1 100644 --- a/integrationtests/self/conn_id_test.go +++ b/integrationtests/self/conn_id_test.go @@ -3,7 +3,7 @@ package self_test import ( "context" "fmt" - "io/ioutil" + "io" "math/rand" "net" @@ -54,7 +54,7 @@ var _ = Describe("Connection ID lengths tests", func() { defer cl.CloseWithError(0, "") str, err := cl.AcceptStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) } diff --git a/integrationtests/self/deadline_test.go b/integrationtests/self/deadline_test.go index 7dfb8e2a..963db7aa 100644 --- a/integrationtests/self/deadline_test.go +++ b/integrationtests/self/deadline_test.go @@ -3,7 +3,7 @@ package self_test import ( "context" "fmt" - "io/ioutil" + "io" "net" "time" @@ -138,7 +138,7 @@ var _ = Describe("Stream deadline tests", func() { done := make(chan struct{}) go func() { defer GinkgoRecover() - data, err := ioutil.ReadAll(serverStr) + data, err := io.ReadAll(serverStr) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRDataLong)) close(done) @@ -171,7 +171,7 @@ var _ = Describe("Stream deadline tests", func() { readDone := make(chan struct{}) go func() { defer GinkgoRecover() - data, err := ioutil.ReadAll(serverStr) + data, err := io.ReadAll(serverStr) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRDataLong)) close(readDone) diff --git a/integrationtests/self/early_data_test.go b/integrationtests/self/early_data_test.go index 90cabea0..eb2d6ad8 100644 --- a/integrationtests/self/early_data_test.go +++ b/integrationtests/self/early_data_test.go @@ -3,7 +3,7 @@ package self_test import ( "context" "fmt" - "io/ioutil" + "io" "net" "time" @@ -61,7 +61,7 @@ var _ = Describe("early data", func() { Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptUniStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal([]byte("early data"))) sess.CloseWithError(0, "") diff --git a/integrationtests/self/handshake_drop_test.go b/integrationtests/self/handshake_drop_test.go index c9e04cf0..f766660a 100644 --- a/integrationtests/self/handshake_drop_test.go +++ b/integrationtests/self/handshake_drop_test.go @@ -4,7 +4,7 @@ import ( "context" "crypto/tls" "fmt" - "io/ioutil" + "io" mrand "math/rand" "net" "sync/atomic" @@ -79,7 +79,7 @@ var _ = Describe("Handshake drop tests", func() { defer sess.CloseWithError(0, "") str, err := sess.AcceptStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - b, err := ioutil.ReadAll(gbytes.TimeoutReader(str, timeout)) + b, err := io.ReadAll(gbytes.TimeoutReader(str, timeout)) Expect(err).ToNot(HaveOccurred()) Expect(b).To(Equal(data)) serverSessionChan <- sess @@ -134,7 +134,7 @@ var _ = Describe("Handshake drop tests", func() { Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - b, err := ioutil.ReadAll(gbytes.TimeoutReader(str, timeout)) + b, err := io.ReadAll(gbytes.TimeoutReader(str, timeout)) Expect(err).ToNot(HaveOccurred()) Expect(b).To(Equal(data)) diff --git a/integrationtests/self/handshake_test.go b/integrationtests/self/handshake_test.go index 951825e3..75af2ea9 100644 --- a/integrationtests/self/handshake_test.go +++ b/integrationtests/self/handshake_test.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "errors" "fmt" - "io/ioutil" + "io" "net" "time" @@ -216,7 +216,7 @@ var _ = Describe("Handshake tests", func() { Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) Expect(sess.ConnectionState().TLS.CipherSuite).To(Equal(suiteID)) diff --git a/integrationtests/self/http_test.go b/integrationtests/self/http_test.go index b6339435..e2288ea9 100644 --- a/integrationtests/self/http_test.go +++ b/integrationtests/self/http_test.go @@ -9,7 +9,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net" "net/http" "strconv" @@ -63,7 +62,7 @@ var _ = Describe("HTTP tests", func() { mux.HandleFunc("/echo", func(w http.ResponseWriter, r *http.Request) { defer GinkgoRecover() - body, err := ioutil.ReadAll(r.Body) + body, err := io.ReadAll(r.Body) Expect(err).NotTo(HaveOccurred()) w.Write(body) // don't check the error here. Stream may be reset. }) @@ -119,7 +118,7 @@ var _ = Describe("HTTP tests", func() { resp, err := client.Get("https://localhost:" + port + "/hello") Expect(err).ToNot(HaveOccurred()) Expect(resp.StatusCode).To(Equal(200)) - body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second)) + body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second)) Expect(err).ToNot(HaveOccurred()) Expect(string(body)).To(Equal("Hello, World!\n")) }) @@ -161,7 +160,7 @@ var _ = Describe("HTTP tests", func() { resp, err := client.Get("https://localhost:" + port + "/prdata") Expect(err).ToNot(HaveOccurred()) Expect(resp.StatusCode).To(Equal(200)) - body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second)) + body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second)) Expect(err).ToNot(HaveOccurred()) Expect(body).To(Equal(PRData)) }) @@ -170,7 +169,7 @@ var _ = Describe("HTTP tests", func() { resp, err := client.Get("https://localhost:" + port + "/prdatalong") Expect(err).ToNot(HaveOccurred()) Expect(resp.StatusCode).To(Equal(200)) - body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 20*time.Second)) + body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 20*time.Second)) Expect(err).ToNot(HaveOccurred()) Expect(body).To(Equal(PRDataLong)) }) @@ -182,7 +181,7 @@ var _ = Describe("HTTP tests", func() { resp, err := client.Get("https://localhost:" + port + "/hello") Expect(err).ToNot(HaveOccurred()) Expect(resp.StatusCode).To(Equal(200)) - body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second)) + body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second)) Expect(err).ToNot(HaveOccurred()) Expect(string(body)).To(Equal("Hello, World!\n")) } @@ -207,7 +206,7 @@ var _ = Describe("HTTP tests", func() { ) Expect(err).ToNot(HaveOccurred()) Expect(resp.StatusCode).To(Equal(200)) - body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second)) + body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second)) Expect(err).ToNot(HaveOccurred()) Expect(body).To(Equal([]byte("Hello, world!"))) }) @@ -220,7 +219,7 @@ var _ = Describe("HTTP tests", func() { ) Expect(err).ToNot(HaveOccurred()) Expect(resp.StatusCode).To(Equal(200)) - body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second)) + body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second)) Expect(err).ToNot(HaveOccurred()) Expect(body).To(Equal(PRData)) }) @@ -243,7 +242,7 @@ var _ = Describe("HTTP tests", func() { Expect(resp.StatusCode).To(Equal(200)) Expect(resp.Uncompressed).To(BeTrue()) - body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second)) + body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second)) Expect(err).ToNot(HaveOccurred()) Expect(string(body)).To(Equal("Hello, World!\n")) }) diff --git a/integrationtests/self/key_update_test.go b/integrationtests/self/key_update_test.go index cb682d9f..d9c83e59 100644 --- a/integrationtests/self/key_update_test.go +++ b/integrationtests/self/key_update_test.go @@ -3,7 +3,7 @@ package self_test import ( "context" "fmt" - "io/ioutil" + "io" "net" quic "github.com/lucas-clemente/quic-go" @@ -90,7 +90,7 @@ var _ = Describe("Key Update tests", func() { Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptUniStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRDataLong)) Expect(sess.CloseWithError(0, "")).To(Succeed()) diff --git a/integrationtests/self/mitm_test.go b/integrationtests/self/mitm_test.go index b36b0b2d..b0078c0f 100644 --- a/integrationtests/self/mitm_test.go +++ b/integrationtests/self/mitm_test.go @@ -5,7 +5,7 @@ import ( "context" "errors" "fmt" - "io/ioutil" + "io" "math" mrand "math/rand" "net" @@ -136,7 +136,7 @@ var _ = Describe("MITM test", func() { Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptUniStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) Expect(sess.CloseWithError(0, "")).To(Succeed()) @@ -182,7 +182,7 @@ var _ = Describe("MITM test", func() { Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptUniStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) Expect(sess.CloseWithError(0, "")).To(Succeed()) diff --git a/integrationtests/self/multiplex_test.go b/integrationtests/self/multiplex_test.go index c46999df..492e91fa 100644 --- a/integrationtests/self/multiplex_test.go +++ b/integrationtests/self/multiplex_test.go @@ -3,7 +3,7 @@ package self_test import ( "context" "fmt" - "io/ioutil" + "io" "net" "runtime" "time" @@ -52,7 +52,7 @@ var _ = Describe("Multiplexing", func() { defer sess.CloseWithError(0, "") str, err := sess.AcceptStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) } diff --git a/integrationtests/self/rtt_test.go b/integrationtests/self/rtt_test.go index efb9c4c4..c2f86eb4 100644 --- a/integrationtests/self/rtt_test.go +++ b/integrationtests/self/rtt_test.go @@ -3,7 +3,7 @@ package self_test import ( "context" "fmt" - "io/ioutil" + "io" "net" "time" @@ -48,7 +48,7 @@ var _ = Describe("non-zero RTT", func() { Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) sess.CloseWithError(0, "") @@ -84,7 +84,7 @@ var _ = Describe("non-zero RTT", func() { Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) sess.CloseWithError(0, "") diff --git a/integrationtests/self/stream_test.go b/integrationtests/self/stream_test.go index bf21560a..b67ddc22 100644 --- a/integrationtests/self/stream_test.go +++ b/integrationtests/self/stream_test.go @@ -3,7 +3,7 @@ package self_test import ( "context" "fmt" - "io/ioutil" + "io" "net" "sync" @@ -58,7 +58,7 @@ var _ = Describe("Bidirectional streams", func() { go func() { defer GinkgoRecover() defer wg.Done() - dataRead, err := ioutil.ReadAll(str) + dataRead, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(dataRead).To(Equal(data)) }() @@ -77,7 +77,7 @@ var _ = Describe("Bidirectional streams", func() { defer wg.Done() // shouldn't use io.Copy here // we should read from the stream as early as possible, to free flow control credit - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) _, err = str.Write(data) Expect(err).ToNot(HaveOccurred()) diff --git a/integrationtests/self/timeout_test.go b/integrationtests/self/timeout_test.go index e763fc33..52a10bc2 100644 --- a/integrationtests/self/timeout_test.go +++ b/integrationtests/self/timeout_test.go @@ -5,7 +5,6 @@ import ( "context" "fmt" "io" - "io/ioutil" mrand "math/rand" "net" "runtime/pprof" @@ -410,7 +409,7 @@ var _ = Describe("Timeout tests", func() { if err != nil { return err } - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) if err != nil { return err } diff --git a/integrationtests/self/tracer_test.go b/integrationtests/self/tracer_test.go index db5afc73..b0903e8d 100644 --- a/integrationtests/self/tracer_test.go +++ b/integrationtests/self/tracer_test.go @@ -136,7 +136,7 @@ var _ = Describe("Handshake tests", func() { defer sess.CloseWithError(0, "") str, err := sess.AcceptUniStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(PRData)) }) diff --git a/integrationtests/self/uni_stream_test.go b/integrationtests/self/uni_stream_test.go index 265ec360..db63da80 100644 --- a/integrationtests/self/uni_stream_test.go +++ b/integrationtests/self/uni_stream_test.go @@ -3,7 +3,7 @@ package self_test import ( "context" "fmt" - "io/ioutil" + "io" "net" "sync" @@ -61,7 +61,7 @@ var _ = Describe("Unidirectional Streams", func() { go func() { defer GinkgoRecover() defer wg.Done() - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(dataForStream(str.StreamID()))) }() diff --git a/integrationtests/self/zero_rtt_test.go b/integrationtests/self/zero_rtt_test.go index ee963b5d..4d08a727 100644 --- a/integrationtests/self/zero_rtt_test.go +++ b/integrationtests/self/zero_rtt_test.go @@ -4,7 +4,7 @@ import ( "context" "crypto/tls" "fmt" - "io/ioutil" + "io" mrand "math/rand" "net" "sort" @@ -113,7 +113,7 @@ var _ = Describe("0-RTT", func() { Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptUniStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(testdata)) Expect(sess.ConnectionState().TLS.Used0RTT).To(BeTrue()) @@ -266,12 +266,12 @@ var _ = Describe("0-RTT", func() { Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptUniStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(str) + data, err := io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(zeroRTTData)) str, err = sess.AcceptUniStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err = ioutil.ReadAll(str) + data, err = io.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal(oneRTTData)) Expect(sess.CloseWithError(0, "")).To(Succeed()) @@ -601,7 +601,7 @@ var _ = Describe("0-RTT", func() { Expect(err).ToNot(HaveOccurred()) rstr, err := serverSess.AcceptUniStream(context.Background()) Expect(err).ToNot(HaveOccurred()) - data, err := ioutil.ReadAll(rstr) + data, err := io.ReadAll(rstr) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal([]byte("foobar"))) Expect(serverSess.ConnectionState().TLS.Used0RTT).To(BeTrue()) diff --git a/internal/qerr/errors.go b/internal/qerr/errors.go index 65d3e007..8b1cff98 100644 --- a/internal/qerr/errors.go +++ b/internal/qerr/errors.go @@ -44,9 +44,17 @@ func (e *TransportError) Error() string { return str + ": " + msg } +func (e *TransportError) Is(target error) bool { + return target == net.ErrClosed +} + // An ApplicationErrorCode is an application-defined error code. type ApplicationErrorCode uint64 +func (e *ApplicationError) Is(target error) bool { + return target == net.ErrClosed +} + // A StreamErrorCode is an error code used to cancel streams. type StreamErrorCode uint64 @@ -69,17 +77,19 @@ type IdleTimeoutError struct{} var _ error = &IdleTimeoutError{} -func (e *IdleTimeoutError) Timeout() bool { return true } -func (e *IdleTimeoutError) Temporary() bool { return false } -func (e *IdleTimeoutError) Error() string { return "timeout: no recent network activity" } +func (e *IdleTimeoutError) Timeout() bool { return true } +func (e *IdleTimeoutError) Temporary() bool { return false } +func (e *IdleTimeoutError) Error() string { return "timeout: no recent network activity" } +func (e *IdleTimeoutError) Is(target error) bool { return target == net.ErrClosed } type HandshakeTimeoutError struct{} var _ error = &HandshakeTimeoutError{} -func (e *HandshakeTimeoutError) Timeout() bool { return true } -func (e *HandshakeTimeoutError) Temporary() bool { return false } -func (e *HandshakeTimeoutError) Error() string { return "timeout: handshake did not complete in time" } +func (e *HandshakeTimeoutError) Timeout() bool { return true } +func (e *HandshakeTimeoutError) Temporary() bool { return false } +func (e *HandshakeTimeoutError) Error() string { return "timeout: handshake did not complete in time" } +func (e *HandshakeTimeoutError) Is(target error) bool { return target == net.ErrClosed } // A VersionNegotiationError occurs when the client and the server can't agree on a QUIC version. type VersionNegotiationError struct { @@ -91,6 +101,10 @@ func (e *VersionNegotiationError) Error() string { return fmt.Sprintf("no compatible QUIC version found (we support %s, server offered %s)", e.Ours, e.Theirs) } +func (e *VersionNegotiationError) Is(target error) bool { + return target == net.ErrClosed +} + // A StatelessResetError occurs when we receive a stateless reset. type StatelessResetError struct { Token protocol.StatelessResetToken @@ -102,5 +116,9 @@ func (e *StatelessResetError) Error() string { return fmt.Sprintf("received a stateless reset with token %x", e.Token) } +func (e *StatelessResetError) Is(target error) bool { + return target == net.ErrClosed +} + func (e *StatelessResetError) Timeout() bool { return false } func (e *StatelessResetError) Temporary() bool { return true } diff --git a/internal/qerr/errors_go116.go b/internal/qerr/errors_go116.go deleted file mode 100644 index c57cbf3d..00000000 --- a/internal/qerr/errors_go116.go +++ /dev/null @@ -1,14 +0,0 @@ -// +build go1.16 - -package qerr - -import ( - "net" -) - -func (e *TransportError) Is(target error) bool { return target == net.ErrClosed } -func (e *ApplicationError) Is(target error) bool { return target == net.ErrClosed } -func (e *IdleTimeoutError) Is(target error) bool { return target == net.ErrClosed } -func (e *HandshakeTimeoutError) Is(target error) bool { return target == net.ErrClosed } -func (e *VersionNegotiationError) Is(target error) bool { return target == net.ErrClosed } -func (e *StatelessResetError) Is(target error) bool { return target == net.ErrClosed } diff --git a/internal/qerr/errors_go116_test.go b/internal/qerr/errors_go116_test.go deleted file mode 100644 index f0063aa2..00000000 --- a/internal/qerr/errors_go116_test.go +++ /dev/null @@ -1,22 +0,0 @@ -// +build go1.16 - -package qerr - -import ( - "errors" - "net" - - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" -) - -var _ = Describe("QUIC Errors", func() { - It("says that errors are net.ErrClosed errors", func() { - Expect(errors.Is(&TransportError{}, net.ErrClosed)).To(BeTrue()) - Expect(errors.Is(&ApplicationError{}, net.ErrClosed)).To(BeTrue()) - Expect(errors.Is(&IdleTimeoutError{}, net.ErrClosed)).To(BeTrue()) - Expect(errors.Is(&HandshakeTimeoutError{}, net.ErrClosed)).To(BeTrue()) - Expect(errors.Is(&StatelessResetError{}, net.ErrClosed)).To(BeTrue()) - Expect(errors.Is(&VersionNegotiationError{}, net.ErrClosed)).To(BeTrue()) - }) -}) diff --git a/internal/qerr/errors_test.go b/internal/qerr/errors_test.go index 434cd848..b2a3cca5 100644 --- a/internal/qerr/errors_test.go +++ b/internal/qerr/errors_test.go @@ -1,6 +1,7 @@ package qerr import ( + "errors" "net" "github.com/lucas-clemente/quic-go/internal/protocol" @@ -114,4 +115,13 @@ var _ = Describe("QUIC Errors", func() { Expect(nerr.Temporary()).To(BeTrue()) }) }) + + It("says that errors are net.ErrClosed errors", func() { + Expect(errors.Is(&TransportError{}, net.ErrClosed)).To(BeTrue()) + Expect(errors.Is(&ApplicationError{}, net.ErrClosed)).To(BeTrue()) + Expect(errors.Is(&IdleTimeoutError{}, net.ErrClosed)).To(BeTrue()) + Expect(errors.Is(&HandshakeTimeoutError{}, net.ErrClosed)).To(BeTrue()) + Expect(errors.Is(&StatelessResetError{}, net.ErrClosed)).To(BeTrue()) + Expect(errors.Is(&VersionNegotiationError{}, net.ErrClosed)).To(BeTrue()) + }) }) diff --git a/internal/qtls/go115.go b/internal/qtls/go115.go deleted file mode 100644 index 6eedc497..00000000 --- a/internal/qtls/go115.go +++ /dev/null @@ -1,100 +0,0 @@ -// +build go1.15 -// +build !go1.16 - -package qtls - -import ( - "crypto" - "crypto/cipher" - "crypto/tls" - "net" - "unsafe" - - "github.com/marten-seemann/qtls-go1-15" -) - -type ( - // Alert is a TLS alert - Alert = qtls.Alert - // A Certificate is qtls.Certificate. - Certificate = qtls.Certificate - // CertificateRequestInfo contains inforamtion about a certificate request. - CertificateRequestInfo = qtls.CertificateRequestInfo - // A CipherSuiteTLS13 is a cipher suite for TLS 1.3 - CipherSuiteTLS13 = qtls.CipherSuiteTLS13 - // ClientHelloInfo contains information about a ClientHello. - ClientHelloInfo = qtls.ClientHelloInfo - // ClientSessionCache is a cache used for session resumption. - ClientSessionCache = qtls.ClientSessionCache - // ClientSessionState is a state needed for session resumption. - ClientSessionState = qtls.ClientSessionState - // A Config is a qtls.Config. - Config = qtls.Config - // A Conn is a qtls.Conn. - Conn = qtls.Conn - // ConnectionState contains information about the state of the connection. - ConnectionState = qtls.ConnectionStateWith0RTT - // EncryptionLevel is the encryption level of a message. - EncryptionLevel = qtls.EncryptionLevel - // Extension is a TLS extension - Extension = qtls.Extension - // ExtraConfig is the qtls.ExtraConfig - ExtraConfig = qtls.ExtraConfig - // RecordLayer is a qtls RecordLayer. - RecordLayer = qtls.RecordLayer -) - -const ( - // EncryptionHandshake is the Handshake encryption level - EncryptionHandshake = qtls.EncryptionHandshake - // Encryption0RTT is the 0-RTT encryption level - Encryption0RTT = qtls.Encryption0RTT - // EncryptionApplication is the application data encryption level - EncryptionApplication = qtls.EncryptionApplication -) - -// AEADAESGCMTLS13 creates a new AES-GCM AEAD for TLS 1.3 -func AEADAESGCMTLS13(key, fixedNonce []byte) cipher.AEAD { - return qtls.AEADAESGCMTLS13(key, fixedNonce) -} - -// Client returns a new TLS client side connection. -func Client(conn net.Conn, config *Config, extraConfig *ExtraConfig) *Conn { - return qtls.Client(conn, config, extraConfig) -} - -// Server returns a new TLS server side connection. -func Server(conn net.Conn, config *Config, extraConfig *ExtraConfig) *Conn { - return qtls.Server(conn, config, extraConfig) -} - -func GetConnectionState(conn *Conn) ConnectionState { - return conn.ConnectionStateWith0RTT() -} - -// ToTLSConnectionState extracts the tls.ConnectionState -func ToTLSConnectionState(cs ConnectionState) tls.ConnectionState { - return cs.ConnectionState -} - -type cipherSuiteTLS13 struct { - ID uint16 - KeyLen int - AEAD func(key, fixedNonce []byte) cipher.AEAD - Hash crypto.Hash -} - -//go:linkname cipherSuiteTLS13ByID github.com/marten-seemann/qtls-go1-15.cipherSuiteTLS13ByID -func cipherSuiteTLS13ByID(id uint16) *cipherSuiteTLS13 - -// CipherSuiteTLS13ByID gets a TLS 1.3 cipher suite. -func CipherSuiteTLS13ByID(id uint16) *CipherSuiteTLS13 { - val := cipherSuiteTLS13ByID(id) - cs := (*cipherSuiteTLS13)(unsafe.Pointer(val)) - return &qtls.CipherSuiteTLS13{ - ID: cs.ID, - KeyLen: cs.KeyLen, - AEAD: cs.AEAD, - Hash: cs.Hash, - } -} diff --git a/tools.go b/tools.go index 65756689..12807f90 100644 --- a/tools.go +++ b/tools.go @@ -3,5 +3,6 @@ package quic import ( + _ "github.com/cheekybits/genny" _ "github.com/onsi/ginkgo/ginkgo" )