From e8feee59944445399b7b0351312c6f15e1e40280 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Mon, 29 May 2023 16:56:33 +0200 Subject: [PATCH] chore: use go1.20.4 (#1144) Part of https://github.com/ooni/probe/issues/2417 and https://github.com/ooni/probe/issues/2478. --- GOVERSION | 2 +- docs/design/dd-003-step-by-step.md | 2 +- go.mod | 28 +++++----- go.sum | 56 +++++++++---------- internal/cmd/jafar/README.md | 2 +- internal/cmd/oohelperd/quic.go | 2 +- internal/dslx/connpool_test.go | 2 +- internal/dslx/quic.go | 2 +- internal/dslx/quic_test.go | 2 +- internal/experiment/quicping/crypto.go | 12 ++-- .../simplequicping/simplequicping.go | 2 +- .../simplequicping/simplequicping_test.go | 8 +-- internal/measurex/http.go | 2 +- internal/measurex/measurer.go | 2 +- internal/measurex/quic.go | 2 +- internal/measurexlite/conn.go | 2 +- internal/measurexlite/quic.go | 2 +- internal/measurexlite/quic_test.go | 2 +- internal/measurexlite/trace_test.go | 2 +- internal/mocks/quic.go | 2 +- internal/mocks/quic_test.go | 2 +- internal/mocks/trace.go | 2 +- internal/mocks/trace_test.go | 2 +- internal/model/netx.go | 4 +- internal/netemx/netemx_test.go | 2 +- internal/netxlite/classify.go | 2 +- internal/netxlite/classify_test.go | 2 +- internal/netxlite/http3.go | 2 +- internal/netxlite/http3_test.go | 2 +- internal/netxlite/integration_test.go | 2 +- internal/netxlite/quic.go | 4 +- internal/netxlite/quic_test.go | 2 +- internal/netxlite/trace.go | 2 +- internal/tracex/quic.go | 2 +- internal/tracex/quic_test.go | 2 +- .../tutorial/netxlite/chapter04/README.md | 2 +- internal/tutorial/netxlite/chapter04/main.go | 2 +- .../tutorial/netxlite/chapter08/README.md | 2 +- internal/tutorial/netxlite/chapter08/main.go | 2 +- 39 files changed, 87 insertions(+), 91 deletions(-) diff --git a/GOVERSION b/GOVERSION index 2a4feaf54..0bd54efd3 100644 --- a/GOVERSION +++ b/GOVERSION @@ -1 +1 @@ -1.19.6 +1.20.4 diff --git a/docs/design/dd-003-step-by-step.md b/docs/design/dd-003-step-by-step.md index 7dcdbbfc9..07e864d88 100644 --- a/docs/design/dd-003-step-by-step.md +++ b/docs/design/dd-003-step-by-step.md @@ -239,7 +239,7 @@ alternative TLS libs (e.g., refraction-networking/utls). We could say more here. But I am trying to be brief. Because of that, I am glossing over HTTP3, which is not part of the standard library but is implemented by -[lucas-clemente/quic-go](https://github.com/lucas-clemente/quic-go). +[quic-go/quic-go](https://github.com/quic-go/quic-go). Apart from the stdlib and quic-go, the only other significant network code dependency is [miekg/dns](https://github.com/miekg/dns) for custom DNS resolvers (e.g., DNS-over-HTTPS). diff --git a/go.mod b/go.mod index f3e07a7de..a9f7f4f01 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/ooni/probe-cli/v3 -go 1.19 +go 1.20 require ( filippo.io/age v1.1.1 git.torproject.org/pluggable-transports/goptlib.git v1.3.0 git.torproject.org/pluggable-transports/snowflake.git/v2 v2.5.1 github.com/AlecAivazis/survey/v2 v2.3.6 - github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20230109152509-df9b786ba0f4 + github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20230418182520-830177ebde85 github.com/alecthomas/kingpin v2.2.6+incompatible github.com/apex/log v1.9.0 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 @@ -21,28 +21,28 @@ require ( github.com/gorilla/websocket v1.5.0 github.com/hexops/gotextdiff v1.0.3 github.com/iancoleman/strcase v0.2.0 - github.com/lucas-clemente/quic-go v0.31.1 github.com/mattn/go-colorable v0.1.13 github.com/miekg/dns v1.1.52 github.com/mitchellh/go-wordwrap v1.0.1 github.com/montanaflynn/stats v0.7.0 github.com/ooni/go-libtor v1.1.7 github.com/ooni/netem v0.0.0-20230316075930-83d9720a67f9 - github.com/ooni/oocrypto v0.4.2 - github.com/ooni/oohttp v0.5.2 + github.com/ooni/oocrypto v0.5.1 + github.com/ooni/oohttp v0.6.1 github.com/ooni/probe-assets v0.15.0 github.com/pborman/getopt/v2 v2.1.0 github.com/pion/stun v0.3.5 github.com/pkg/errors v0.9.1 + github.com/quic-go/quic-go v0.33.0 github.com/rogpeppe/go-internal v1.9.0 github.com/rubenv/sql-migrate v1.3.0 github.com/schollz/progressbar/v3 v3.13.0 github.com/upper/db/v4 v4.6.0 gitlab.com/yawning/obfs4.git v0.0.0-20220904064028-336a71d6e4cf gitlab.com/yawning/utls.git v0.0.12-1 - golang.org/x/crypto v0.7.0 - golang.org/x/net v0.8.0 - golang.org/x/sys v0.6.0 + golang.org/x/crypto v0.9.0 + golang.org/x/net v0.10.0 + golang.org/x/sys v0.8.0 ) require ( @@ -50,7 +50,7 @@ require ( github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464 // indirect github.com/Psiphon-Labs/qtls-go1-18 v0.0.0-20221014170512-3bdc7291c091 // indirect github.com/Psiphon-Labs/qtls-go1-19 v0.0.0-20221014165721-ed28749db082 // indirect - github.com/Psiphon-Labs/quic-go v0.0.0-20221014165902-1b7c3975fcf3 // indirect + github.com/Psiphon-Labs/quic-go v0.0.0-20230215230806-9b1ddbf778cc // indirect github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad // indirect github.com/andybalholm/brotli v1.0.5-0.20220518190645-786ec621f618 // indirect github.com/golang/mock v1.6.0 // indirect @@ -63,6 +63,9 @@ require ( github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect github.com/onsi/ginkgo/v2 v2.7.0 // indirect github.com/pion/transport/v2 v2.0.0 // indirect + github.com/quic-go/qpack v0.4.0 // indirect + github.com/quic-go/qtls-go1-19 v0.2.1 // indirect + github.com/quic-go/qtls-go1-20 v0.1.1 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/segmentio/fasthash v1.0.3 // indirect github.com/spf13/pflag v1.0.5 // indirect @@ -97,9 +100,6 @@ require ( github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/klauspost/cpuid/v2 v2.2.3 // indirect github.com/klauspost/reedsolomon v1.11.5 // indirect - github.com/marten-seemann/qpack v0.3.0 // indirect - github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect - github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect github.com/mattn/go-isatty v0.0.17 // indirect github.com/mattn/go-sqlite3 v1.14.16 github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect @@ -141,8 +141,8 @@ require ( gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect gitlab.com/yawning/edwards25519-extra.git v0.0.0-20220726154925-def713fd18e4 // indirect golang.org/x/mod v0.9.0 // indirect - golang.org/x/term v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect + golang.org/x/term v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect golang.org/x/tools v0.7.0 // indirect google.golang.org/protobuf v1.28.2-0.20230118093459-a9481185b34d // indirect ) diff --git a/go.sum b/go.sum index 62d36d866..997f495c1 100644 --- a/go.sum +++ b/go.sum @@ -69,14 +69,14 @@ github.com/Psiphon-Labs/bolt v0.0.0-20200624191537-23cedaef7ad7 h1:Hx/NCZTnvoKZu github.com/Psiphon-Labs/bolt v0.0.0-20200624191537-23cedaef7ad7/go.mod h1:alTtZBo3j4AWFvUrAH6F5ZaHcTj4G5Y01nHz8dkU6vU= github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464 h1:VmnMMMheFXwLV0noxYhbJbLmkV4iaVW3xNnj6xcCNHo= github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464/go.mod h1:Pe5BqN2DdIdChorAXl6bDaQd/wghpCleJfid2NoSli0= -github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20230109152509-df9b786ba0f4 h1:Z+I4JTLZbvIOHQykeNmHRznPxCWY98utrQnC3TRgU+c= -github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20230109152509-df9b786ba0f4/go.mod h1:dSa3K4KRmcWV7RXUy5CeGPiNBF09Ft4NLZX63hY01ug= +github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20230418182520-830177ebde85 h1:jrSZ81X/M3nZCtoSBqZX/WogKTXESsPWzCQFrNOfPxY= +github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20230418182520-830177ebde85/go.mod h1:ZqtRlpd0qHKS8bN3NzZR39si6RuHyVEeZUL67lMAE8w= github.com/Psiphon-Labs/qtls-go1-18 v0.0.0-20221014170512-3bdc7291c091 h1:Kv0LQQ3joUp8s2z36aigpNgNyiLiExT/OS9KOC/L/gI= github.com/Psiphon-Labs/qtls-go1-18 v0.0.0-20221014170512-3bdc7291c091/go.mod h1:0IvfcPDkLvBkir+WGq3E0shsx+TLasdcl8ojVWWTflE= github.com/Psiphon-Labs/qtls-go1-19 v0.0.0-20221014165721-ed28749db082 h1:arVlc3JYvckFXGyB8N30ul8AmA+rDuLolPRYMDHzgTU= github.com/Psiphon-Labs/qtls-go1-19 v0.0.0-20221014165721-ed28749db082/go.mod h1:mHM/QFYc02W9MKJ/Ux5XGOKP4OImosPeQUO7XAaXs0E= -github.com/Psiphon-Labs/quic-go v0.0.0-20221014165902-1b7c3975fcf3 h1:BKSZdSkhOGV23vBl4cYPabzkRlWk5Zm7Snpo4i0lSXQ= -github.com/Psiphon-Labs/quic-go v0.0.0-20221014165902-1b7c3975fcf3/go.mod h1:llhtSl7dUXTssUN4m4MjUDJrULGNxgZBMKYjExuk6EM= +github.com/Psiphon-Labs/quic-go v0.0.0-20230215230806-9b1ddbf778cc h1:FUmGSvMiMbf1tFXWbK0+N7+5zBhOol8CHQdpB4ZQlDg= +github.com/Psiphon-Labs/quic-go v0.0.0-20230215230806-9b1ddbf778cc/go.mod h1:cu4yhfHkyt+uQ9FFFjTpjCjcQYf52ntEAyoV4Zg0+fg= github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad h1:m6HS84+b5xDPLj7D/ya1CeixyaHOCZoMbBilJ48y+Ts= github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad/go.mod h1:v3y9GXFo9Sf2mO6auD2ExGG7oDgrK8TI7eb49ZnUxrE= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -218,7 +218,6 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -518,8 +517,6 @@ github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4= -github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= @@ -529,12 +526,6 @@ github.com/markbates/oncer v1.0.0 h1:E83IaVAHygyndzPimgUYJjbshhDTALZyXxvk9FOlQRY github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2aSZ0mcI= github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= -github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE= -github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g= -github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its= -github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= -github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE= -github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= github.com/marusama/semaphore v0.0.0-20171214154724-565ffd8e868a h1:6SRny9FLB1eWasPyDUqBQnMi9NhXU01XIlB0ao89YoI= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= @@ -614,7 +605,6 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= @@ -624,7 +614,6 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.7.0 h1:/XxtEV3I3Eif/HobnVx9YmJgk8ENdRsuUmM+fLCFNow= github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= @@ -638,10 +627,10 @@ github.com/ooni/go-libtor v1.1.7 h1:ooVcdEPBqDox5OfeXAfXIeQFCbqMLJVfIpO+Irr7N9A= github.com/ooni/go-libtor v1.1.7/go.mod h1:q1YyLwRD9GeMyeerVvwc0vJ2YgwDLTp2bdVcrh/JXyI= github.com/ooni/netem v0.0.0-20230316075930-83d9720a67f9 h1:y65eJ6TWqDGYv5vM+YRO3nmBOBvK/I7ZgUT2K5anyrE= github.com/ooni/netem v0.0.0-20230316075930-83d9720a67f9/go.mod h1:AoLwHuiZDivpXv+QTyx0tK7nJ5nlm3nYbDGA9T0CnpE= -github.com/ooni/oocrypto v0.4.2 h1:D7PB97EBfCgS/GlXoiWlS523oniqYn7sPVWSRk6kfW0= -github.com/ooni/oocrypto v0.4.2/go.mod h1:D/yqWldJfw/4LKFJ0+2t0gDQ0cXVsHx2v45ODmna5SY= -github.com/ooni/oohttp v0.5.2 h1:2U5OKi2tQTs9okdEV9FYZTzegI6OIJ86i9WsMDCfTq4= -github.com/ooni/oohttp v0.5.2/go.mod h1:XRJVx6aCswQrE7Fp3j4d8SjHNh1rPEdhpTyPu3zkyBw= +github.com/ooni/oocrypto v0.5.1 h1:7LD07H2LA7mAQIVhZ1k6eHlRxN7ux/mHhoFdBUgWFSQ= +github.com/ooni/oocrypto v0.5.1/go.mod h1:lqrqVa4E9D0tCMmprzbwuokAIvX949HAlUs5crZne3c= +github.com/ooni/oohttp v0.6.1 h1:lftBsmunh6pzAReLyaSwdez10cJtYRlpC2fa0062HJQ= +github.com/ooni/oohttp v0.6.1/go.mod h1:/7fPgmXNkMSXBpLOdARkhyn3vsNAtmZ0C3G5C/KLd6Q= github.com/ooni/probe-assets v0.15.0 h1:VFOnVO4rypeI6Qfn25Uck1YhAlu3BJQqC9Vrp8nL8C0= github.com/ooni/probe-assets v0.15.0/go.mod h1:+otUATjJ8T7NsTKhmkXAKLW9oy0NhbcggXhlKzZHqVI= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= @@ -768,6 +757,14 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= +github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= +github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A= +github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= +github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk= +github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= +github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0= +github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/refraction-networking/gotapdance v1.3.4 h1:fJ3wJ0FPmznME2g46huJAsyw21kf8xCC/F9uBg/wkeI= github.com/refraction-networking/gotapdance v1.3.4/go.mod h1:kOwC9BjrcdGi60OAxInZ5rTomVXJDoP5BssI1NSyNcU= @@ -989,8 +986,8 @@ golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/exp v0.0.0-20181106170214-d68db9428509/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1092,8 +1089,8 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1204,8 +1201,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= @@ -1214,8 +1211,8 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= -golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1228,8 +1225,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1440,7 +1437,6 @@ gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= diff --git a/internal/cmd/jafar/README.md b/internal/cmd/jafar/README.md index 932d4c71c..01081bdfc 100644 --- a/internal/cmd/jafar/README.md +++ b/internal/cmd/jafar/README.md @@ -8,7 +8,7 @@ any system but it really only works on Linux. ## Building -We use Go >= 1.19. Jafar also needs the C library headers, +We use Go >= 1.20. Jafar also needs the C library headers, iptables installed, and root permissions. With Linux Alpine edge, you can compile Jafar with: diff --git a/internal/cmd/oohelperd/quic.go b/internal/cmd/oohelperd/quic.go index 320dcc9b6..842ffc506 100644 --- a/internal/cmd/oohelperd/quic.go +++ b/internal/cmd/oohelperd/quic.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/measurexlite" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go" ) // ctrlQUICResult is the result of the QUIC check performed by the test helper. diff --git a/internal/dslx/connpool_test.go b/internal/dslx/connpool_test.go index 5b10d6802..daba7799f 100644 --- a/internal/dslx/connpool_test.go +++ b/internal/dslx/connpool_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/mocks" + "github.com/quic-go/quic-go" ) /* diff --git a/internal/dslx/quic.go b/internal/dslx/quic.go index be74af55f..e0677280b 100644 --- a/internal/dslx/quic.go +++ b/internal/dslx/quic.go @@ -13,10 +13,10 @@ import ( "sync/atomic" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/measurexlite" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" + "github.com/quic-go/quic-go" ) // QUICHandshakeOption is an option you can pass to QUICHandshake. diff --git a/internal/dslx/quic_test.go b/internal/dslx/quic_test.go index 44fec90bb..7e0a30cf9 100644 --- a/internal/dslx/quic_test.go +++ b/internal/dslx/quic_test.go @@ -10,9 +10,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/mocks" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go" ) /* diff --git a/internal/experiment/quicping/crypto.go b/internal/experiment/quicping/crypto.go index e41b830f4..27efe524b 100644 --- a/internal/experiment/quicping/crypto.go +++ b/internal/experiment/quicping/crypto.go @@ -45,8 +45,8 @@ func aeadAESGCMTLS13(key, nonceMask []byte) aead { } // SPDX-License-Identifier: MIT -// This code is borrowed from https://github.com/lucas-clemente/quic-go/ -// https://github.com/lucas-clemente/quic-go/blob/f3b098775e40f96486c0065204145ddc8675eb7c/internal/handshake/initial_aead.go#L60 +// This code is borrowed from https://github.com/quic-go/quic-go/ +// https://github.com/quic-go/quic-go/blob/f3b098775e40f96486c0065204145ddc8675eb7c/internal/handshake/initial_aead.go#L60 // https://www.rfc-editor.org/rfc/rfc9001.html#protection-keys // // computeInitialKeyAndIV derives the packet protection key and Initialization Vector (IV) from the initial secret. @@ -65,8 +65,8 @@ func computeHP(secret []byte) (hp []byte) { } // SPDX-License-Identifier: MIT -// This code is borrowed from https://github.com/lucas-clemente/quic-go/ -// https://github.com/lucas-clemente/quic-go/blob/f3b098775e40f96486c0065204145ddc8675eb7c/internal/handshake/initial_aead.go#L53 +// This code is borrowed from https://github.com/quic-go/quic-go/ +// https://github.com/quic-go/quic-go/blob/f3b098775e40f96486c0065204145ddc8675eb7c/internal/handshake/initial_aead.go#L53 // https://www.rfc-editor.org/rfc/rfc9001.html#name-initial-secrets // // computeSecrets computes the initial secrets based on the destination connection ID. @@ -121,8 +121,8 @@ func encryptPayload(payload, destConnID connectionID, clientSecret []byte) []byt } // SPDX-License-Identifier: MIT -// This code is borrowed from https://github.com/lucas-clemente/quic-go/ -// https://github.com/lucas-clemente/quic-go/blob/master/internal/handshake/hkdf.go +// This code is borrowed from https://github.com/quic-go/quic-go/ +// https://github.com/quic-go/quic-go/blob/master/internal/handshake/hkdf.go // // hkdfExpandLabel HKDF expands a label. func hkdfExpandLabel(hash crypto.Hash, secret, context []byte, label string, length int) []byte { diff --git a/internal/experiment/simplequicping/simplequicping.go b/internal/experiment/simplequicping/simplequicping.go index 4459af6eb..1e91a7281 100644 --- a/internal/experiment/simplequicping/simplequicping.go +++ b/internal/experiment/simplequicping/simplequicping.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/measurexlite" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" + "github.com/quic-go/quic-go" ) const ( diff --git a/internal/experiment/simplequicping/simplequicping_test.go b/internal/experiment/simplequicping/simplequicping_test.go index 6e5e409b9..8d833fbc1 100644 --- a/internal/experiment/simplequicping/simplequicping_test.go +++ b/internal/experiment/simplequicping/simplequicping_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go" ) func TestConfig_alpn(t *testing.T) { @@ -131,7 +131,7 @@ func TestMeasurer_run(t *testing.T) { // // SPDX-License-Identifier: MIT // -// See https://github.com/lucas-clemente/quic-go/blob/v0.27.0/example/echo/echo.go#L34 +// See https://github.com/quic-go/quic-go/blob/v0.27.0/example/echo/echo.go#L34 func startEchoServer() (string, quic.Listener, error) { listener, err := quic.ListenAddr("127.0.0.1:0", generateTLSConfig(), nil) if err != nil { @@ -150,7 +150,7 @@ func startEchoServer() (string, quic.Listener, error) { // // SPDX-License-Identifier: MIT // -// See https://github.com/lucas-clemente/quic-go/blob/v0.27.0/example/echo/echo.go#L34 +// See https://github.com/quic-go/quic-go/blob/v0.27.0/example/echo/echo.go#L34 func echoWorkerMain(listener quic.Listener) { for { conn, err := listener.Accept(context.Background()) @@ -169,7 +169,7 @@ func echoWorkerMain(listener quic.Listener) { // // SPDX-License-Identifier: MIT // -// See https://github.com/lucas-clemente/quic-go/blob/v0.27.0/example/echo/echo.go#L91 +// See https://github.com/quic-go/quic-go/blob/v0.27.0/example/echo/echo.go#L91 func generateTLSConfig() *tls.Config { key, err := rsa.GenerateKey(rand.Reader, 1024) if err != nil { diff --git a/internal/measurex/http.go b/internal/measurex/http.go index d4ce3869a..a2853129a 100644 --- a/internal/measurex/http.go +++ b/internal/measurex/http.go @@ -25,10 +25,10 @@ import ( "time" "unicode/utf8" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/runtimex" + "github.com/quic-go/quic-go" "golang.org/x/net/publicsuffix" ) diff --git a/internal/measurex/measurer.go b/internal/measurex/measurer.go index 974f9e31a..8b47d176f 100644 --- a/internal/measurex/measurer.go +++ b/internal/measurex/measurer.go @@ -20,9 +20,9 @@ import ( "time" "github.com/apex/log" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" + "github.com/quic-go/quic-go" ) // Measurer performs measurements. If you don't use a factory diff --git a/internal/measurex/quic.go b/internal/measurex/quic.go index 7112ae2cd..d53bd80ee 100644 --- a/internal/measurex/quic.go +++ b/internal/measurex/quic.go @@ -12,9 +12,9 @@ import ( "net" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" + "github.com/quic-go/quic-go" ) type quicListenerDB struct { diff --git a/internal/measurexlite/conn.go b/internal/measurexlite/conn.go index 57ec71caa..af208156d 100644 --- a/internal/measurexlite/conn.go +++ b/internal/measurexlite/conn.go @@ -96,7 +96,7 @@ func (tx *Trace) MaybeWrapUDPLikeConn(conn model.UDPLikeConn) model.UDPLikeConn // udpLikeConnTrace is a trace-aware model.UDPLikeConn. type udpLikeConnTrace struct { // Implementation note: it seems ~safe to use embedding here because model.UDPLikeConn - // contains fields deriving from how lucas-clemente/quic-go uses the standard library + // contains fields deriving from how quic-go/quic-go uses the standard library model.UDPLikeConn tx *Trace } diff --git a/internal/measurexlite/quic.go b/internal/measurexlite/quic.go index d2f4f2002..bbec9758a 100644 --- a/internal/measurexlite/quic.go +++ b/internal/measurexlite/quic.go @@ -9,9 +9,9 @@ import ( "crypto/tls" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" + "github.com/quic-go/quic-go" ) // NewQUICDialerWithoutResolver is equivalent to netxlite.NewQUICDialerWithoutResolver diff --git a/internal/measurexlite/quic_test.go b/internal/measurexlite/quic_test.go index c28fdf1ab..daebfca9e 100644 --- a/internal/measurexlite/quic_test.go +++ b/internal/measurexlite/quic_test.go @@ -10,12 +10,12 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/mocks" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/netxlite/quictesting" "github.com/ooni/probe-cli/v3/internal/testingx" + "github.com/quic-go/quic-go" ) func TestNewQUICDialerWithoutResolver(t *testing.T) { diff --git a/internal/measurexlite/trace_test.go b/internal/measurexlite/trace_test.go index 0eb033cf6..bbcb46096 100644 --- a/internal/measurexlite/trace_test.go +++ b/internal/measurexlite/trace_test.go @@ -11,11 +11,11 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/mocks" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/testingx" + "github.com/quic-go/quic-go" utls "gitlab.com/yawning/utls.git" ) diff --git a/internal/mocks/quic.go b/internal/mocks/quic.go index 873c3dd8d..3e90d54d0 100644 --- a/internal/mocks/quic.go +++ b/internal/mocks/quic.go @@ -7,8 +7,8 @@ import ( "syscall" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go" ) // QUICListener is a mockable netxlite.QUICListener. diff --git a/internal/mocks/quic_test.go b/internal/mocks/quic_test.go index 40870fdc8..d27544820 100644 --- a/internal/mocks/quic_test.go +++ b/internal/mocks/quic_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go" ) func TestQUICListenerListen(t *testing.T) { diff --git a/internal/mocks/trace.go b/internal/mocks/trace.go index bf9132bee..051b3a1b7 100644 --- a/internal/mocks/trace.go +++ b/internal/mocks/trace.go @@ -9,8 +9,8 @@ import ( "net" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go" ) // Trace allows mocking model.Trace. diff --git a/internal/mocks/trace_test.go b/internal/mocks/trace_test.go index 3b294ffb7..83ee2b4fd 100644 --- a/internal/mocks/trace_test.go +++ b/internal/mocks/trace_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go" ) func TestTrace(t *testing.T) { diff --git a/internal/model/netx.go b/internal/model/netx.go index d0221f1d5..0f014316c 100644 --- a/internal/model/netx.go +++ b/internal/model/netx.go @@ -13,7 +13,7 @@ import ( "syscall" "time" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) // DNSResponse is a parsed DNS response ready for further processing. @@ -455,7 +455,7 @@ type Trace interface { } // UDPLikeConn is a net.PacketConn with some extra functions -// required to convince the QUIC library (lucas-clemente/quic-go) +// required to convince the QUIC library (quic-go/quic-go) // to inflate the receive buffer of the connection. // // The QUIC library will treat this connection as a "dumb" diff --git a/internal/netemx/netemx_test.go b/internal/netemx/netemx_test.go index 35699254e..2d144fab8 100644 --- a/internal/netemx/netemx_test.go +++ b/internal/netemx/netemx_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/lucas-clemente/quic-go/http3" "github.com/ooni/netem" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netemx" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/runtimex" + "github.com/quic-go/quic-go/http3" ) // Environment is the [netem] QA environment we use in this package. diff --git a/internal/netxlite/classify.go b/internal/netxlite/classify.go index f0304304a..13667d7eb 100644 --- a/internal/netxlite/classify.go +++ b/internal/netxlite/classify.go @@ -11,8 +11,8 @@ import ( "fmt" "strings" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/scrubber" + "github.com/quic-go/quic-go" ) // FailureUnknown is the prefix used for unknown failures diff --git a/internal/netxlite/classify_test.go b/internal/netxlite/classify_test.go index 26ba239df..cfc59e3e7 100644 --- a/internal/netxlite/classify_test.go +++ b/internal/netxlite/classify_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/lucas-clemente/quic-go" "github.com/pion/stun" + "github.com/quic-go/quic-go" ) func TestClassifyGenericError(t *testing.T) { diff --git a/internal/netxlite/http3.go b/internal/netxlite/http3.go index 2457fc9f3..4d35e8c5f 100644 --- a/internal/netxlite/http3.go +++ b/internal/netxlite/http3.go @@ -9,8 +9,8 @@ import ( "io" "net/http" - "github.com/lucas-clemente/quic-go/http3" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go/http3" ) // http3RoundTripper is the abstract type of quic-go/http3.RoundTripper. diff --git a/internal/netxlite/http3_test.go b/internal/netxlite/http3_test.go index 4d3dac48e..3f1038ab5 100644 --- a/internal/netxlite/http3_test.go +++ b/internal/netxlite/http3_test.go @@ -6,9 +6,9 @@ import ( "net/http" "testing" - "github.com/lucas-clemente/quic-go/http3" "github.com/ooni/probe-cli/v3/internal/mocks" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go/http3" ) func TestHTTP3Transport(t *testing.T) { diff --git a/internal/netxlite/integration_test.go b/internal/netxlite/integration_test.go index 1aa8fd761..b24137312 100644 --- a/internal/netxlite/integration_test.go +++ b/internal/netxlite/integration_test.go @@ -12,13 +12,13 @@ import ( "time" "github.com/apex/log" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/netxlite/filtering" "github.com/ooni/probe-cli/v3/internal/netxlite/quictesting" "github.com/ooni/probe-cli/v3/internal/randx" "github.com/ooni/probe-cli/v3/internal/runtimex" + "github.com/quic-go/quic-go" utls "gitlab.com/yawning/utls.git" ) diff --git a/internal/netxlite/quic.go b/internal/netxlite/quic.go index 16721b12b..b4fdf1f42 100644 --- a/internal/netxlite/quic.go +++ b/internal/netxlite/quic.go @@ -12,8 +12,8 @@ import ( "strconv" "sync" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go" ) // NewQUICListener creates a new QUICListener using the standard @@ -84,7 +84,7 @@ func NewQUICDialerWithoutResolver(listener model.QUICListener, return NewQUICDialerWithResolver(listener, logger, &NullResolver{}, wrappers...) } -// quicDialerQUICGo dials using the lucas-clemente/quic-go library. +// quicDialerQUICGo dials using the quic-go/quic-go library. type quicDialerQUICGo struct { // QUICListener is the underlying QUICListener to use. QUICListener model.QUICListener diff --git a/internal/netxlite/quic_test.go b/internal/netxlite/quic_test.go index 924c1957f..fd7911950 100644 --- a/internal/netxlite/quic_test.go +++ b/internal/netxlite/quic_test.go @@ -11,9 +11,9 @@ import ( "github.com/apex/log" "github.com/google/go-cmp/cmp" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/mocks" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go" ) func TestNewQUICListener(t *testing.T) { diff --git a/internal/netxlite/trace.go b/internal/netxlite/trace.go index 313ad8e3c..7b5091360 100644 --- a/internal/netxlite/trace.go +++ b/internal/netxlite/trace.go @@ -10,9 +10,9 @@ import ( "net" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" + "github.com/quic-go/quic-go" ) // traceKey is the private type used to set/retrieve the context's trace. diff --git a/internal/tracex/quic.go b/internal/tracex/quic.go index 58ddf9e1f..faf684ac7 100644 --- a/internal/tracex/quic.go +++ b/internal/tracex/quic.go @@ -10,9 +10,9 @@ import ( "net" "time" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" + "github.com/quic-go/quic-go" ) // QUICDialerSaver saves events occurring during the QUIC handshake. diff --git a/internal/tracex/quic_test.go b/internal/tracex/quic_test.go index a6757390e..7afe85d15 100644 --- a/internal/tracex/quic_test.go +++ b/internal/tracex/quic_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/mocks" "github.com/ooni/probe-cli/v3/internal/model" + "github.com/quic-go/quic-go" ) func TestQUICDialerSaver(t *testing.T) { diff --git a/internal/tutorial/netxlite/chapter04/README.md b/internal/tutorial/netxlite/chapter04/README.md index ea981b26c..7cc4c74c7 100644 --- a/internal/tutorial/netxlite/chapter04/README.md +++ b/internal/tutorial/netxlite/chapter04/README.md @@ -29,8 +29,8 @@ import ( "time" "github.com/apex/log" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/netxlite" + "github.com/quic-go/quic-go" ) func main() { diff --git a/internal/tutorial/netxlite/chapter04/main.go b/internal/tutorial/netxlite/chapter04/main.go index b68006ecf..4ba85bf58 100644 --- a/internal/tutorial/netxlite/chapter04/main.go +++ b/internal/tutorial/netxlite/chapter04/main.go @@ -30,8 +30,8 @@ import ( "time" "github.com/apex/log" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/netxlite" + "github.com/quic-go/quic-go" ) func main() { diff --git a/internal/tutorial/netxlite/chapter08/README.md b/internal/tutorial/netxlite/chapter08/README.md index 4b281971c..77aa77ec0 100644 --- a/internal/tutorial/netxlite/chapter08/README.md +++ b/internal/tutorial/netxlite/chapter08/README.md @@ -32,8 +32,8 @@ import ( "time" "github.com/apex/log" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/netxlite" + "github.com/quic-go/quic-go" ) func main() { diff --git a/internal/tutorial/netxlite/chapter08/main.go b/internal/tutorial/netxlite/chapter08/main.go index aed627606..efc582f1b 100644 --- a/internal/tutorial/netxlite/chapter08/main.go +++ b/internal/tutorial/netxlite/chapter08/main.go @@ -33,8 +33,8 @@ import ( "time" "github.com/apex/log" - "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/netxlite" + "github.com/quic-go/quic-go" ) func main() {