Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync with probe-cli v3.23.0 #1211

Merged
merged 1 commit into from
Aug 8, 2024
Merged

chore: sync with probe-cli v3.23.0 #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.21.10"
go-version: "1.21.11"
- run: go build ./...
2 changes: 1 addition & 1 deletion UPSTREAM
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.22.0-alpha
v3.23.0
30 changes: 15 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ module github.com/ooni/probe-engine

go 1.21

toolchain go1.21.10
toolchain go1.21.11

require (
filippo.io/age v1.1.1
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20240424194431-3612a5a6fb4c
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20240705153833-eea9ace08cd1
github.com/apex/log v1.9.0
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
github.com/cloudflare/circl v1.3.8
Expand All @@ -21,25 +21,26 @@ require (
github.com/hexops/gotextdiff v1.0.3
github.com/miekg/dns v1.1.59
github.com/montanaflynn/stats v0.7.1
github.com/ooni/minivpn v0.0.6
github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8
github.com/ooni/oocrypto v0.6.1
github.com/ooni/oohttp v0.7.2
github.com/ooni/probe-assets v0.23.0
github.com/ooni/oocrypto v0.6.2
github.com/ooni/oohttp v0.7.3
github.com/ooni/probe-assets v0.24.0
github.com/pborman/getopt/v2 v2.1.0
github.com/pion/stun v0.6.1
github.com/pkg/errors v0.9.1
github.com/quic-go/quic-go v0.43.1
github.com/rogpeppe/go-internal v1.12.0
github.com/rubenv/sql-migrate v1.6.1
github.com/rubenv/sql-migrate v1.7.0
github.com/schollz/progressbar/v3 v3.14.2
github.com/upper/db/v4 v4.7.0
github.com/upper/db/v4 v4.8.0
gitlab.com/yawning/obfs4.git v0.0.0-20231012084234-c3e2d44b1033
gitlab.com/yawning/utls.git v0.0.12-1
gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0
gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2 v2.6.1
golang.org/x/crypto v0.23.0
golang.org/x/crypto v0.24.0
golang.org/x/net v0.25.0
golang.org/x/sys v0.20.0
golang.org/x/sys v0.21.0
)

require (
Expand All @@ -57,6 +58,7 @@ require (
github.com/gaukas/godicttls v0.0.4 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/pprof v0.0.0-20240509144519-723abb6459b7 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand Down Expand Up @@ -105,13 +107,11 @@ require (
github.com/golang/glog v1.2.1 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/grafov/m3u8 v0.12.0 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/juju/ratelimit v1.0.2 // indirect
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
github.com/klauspost/reedsolomon v1.11.8 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-sqlite3 v1.14.22
github.com/oschwald/maxminddb-golang v1.12.0
github.com/oschwald/maxminddb-golang v1.13.1
github.com/pion/datachannel v1.5.6 // indirect
github.com/pion/dtls/v2 v2.2.11 // indirect
github.com/pion/ice/v2 v2.3.24 // indirect
Expand Down Expand Up @@ -145,8 +145,8 @@ require (
github.com/xtaci/smux v1.5.24 // indirect
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/tools v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/protobuf v1.34.1 // indirect
)
78 changes: 48 additions & 30 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions pkg/cmd/buildtool/android_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,12 +702,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.3.0.tar.gz",
"tar", "-xf", "openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -757,12 +757,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.3.0.tar.gz",
"tar", "-xf", "openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -812,12 +812,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.3.0.tar.gz",
"tar", "-xf", "openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -867,12 +867,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.3.0.tar.gz",
"tar", "-xf", "openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1738,12 +1738,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.11.tar.gz",
"tar", "-xf", "tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1827,12 +1827,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.11.tar.gz",
"tar", "-xf", "tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1916,12 +1916,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.11.tar.gz",
"tar", "-xf", "tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -2005,12 +2005,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.11.tar.gz",
"tar", "-xf", "tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Expand Down
10 changes: 5 additions & 5 deletions pkg/cmd/buildtool/cdepsopenssl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie
defer restore()

// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/o/openssl@3.rb
cdepsMustFetch("https://www.openssl.org/source/openssl-3.3.0.tar.gz")
cdepsMustFetch("https://www.openssl.org/source/openssl-3.3.1.tar.gz")
deps.VerifySHA256( // must be mockable
"53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02",
"openssl-3.3.0.tar.gz",
"777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e",
"openssl-3.3.1.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "openssl-3.3.0.tar.gz")
_ = deps.MustChdir("openssl-3.3.0") // must be mockable
must.Run(log.Log, "tar", "-xf", "openssl-3.3.1.tar.gz")
_ = deps.MustChdir("openssl-3.3.1") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "openssl")
for _, patch := range cdepsMustListPatches(mydir) {
Expand Down
10 changes: 5 additions & 5 deletions pkg/cmd/buildtool/cdepstor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ func cdepsTorBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies) {
defer restore()

// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/t/tor.rb
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.11.tar.gz")
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.12.tar.gz")
deps.VerifySHA256( // must be mockable
"8f2bdf90e63380781235aa7d604e159570f283ecee674670873d8bb7052c8e07",
"tor-0.4.8.11.tar.gz",
"ca7cc735d98e3747b58f2f3cc14f804dd789fa0fb333a84dcb6bd70adbb8c874",
"tor-0.4.8.12.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.11.tar.gz")
_ = deps.MustChdir("tor-0.4.8.11") // must be mockable
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.12.tar.gz")
_ = deps.MustChdir("tor-0.4.8.12") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "tor")
for _, patch := range cdepsMustListPatches(mydir) {
Expand Down
24 changes: 12 additions & 12 deletions pkg/cmd/buildtool/ios_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,12 +349,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.3.0.tar.gz",
"tar", "-xf", "openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -399,12 +399,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.3.0.tar.gz",
"tar", "-xf", "openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -449,12 +449,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.3.0.tar.gz",
"tar", "-xf", "openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1142,12 +1142,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.11.tar.gz",
"tar", "-xf", "tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1232,12 +1232,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.11.tar.gz",
"tar", "-xf", "tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1322,12 +1322,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.11.tar.gz",
"tar", "-xf", "tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Expand Down
8 changes: 4 additions & 4 deletions pkg/cmd/buildtool/linuxcdeps_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.3.0.tar.gz",
"tar", "-xf", "openssl-3.3.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -322,12 +322,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.11.tar.gz",
"tar", "-xf", "tor-0.4.8.12.tar.gz",
},
}, {
Env: []string{},
Expand Down
Loading
Loading