chore: upgrade to go1.19.4

This includes upgrading oocrypto and oohttp. Closes ooni/probe#2211 See ooni/probe#2273
ooni · Jan 5, 2023 · 70f50ce · 70f50ce
1 parent 0ac038d
commit 70f50ce
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 62 deletions.
diff --git a/.github/workflows/go1.19.yml b/.github/workflows/go1.19.yml
diff --git a/GOVERSION b/GOVERSION
@@ -1 +1 @@
-1.18.9
+1.19.4
diff --git a/Readme.md b/Readme.md
@@ -57,11 +57,6 @@ Be sure you have:
 
 2. a C compiler (Mingw-w64 for Windows).
 
-### Caveats
-
-As of 2022-08-22, building with go1.19 will not include [Psiphon](https://psiphon.ca/) as
-a dependency. Fixing this issue is TODO(https://github.com/ooni/probe/issues/2222).
-
 ### ooniprobe
 
 Ooniprobe is the official CLI client. Compile using:

diff --git a/go.mod b/go.mod
@@ -27,8 +27,8 @@ require (
 	github.com/mitchellh/go-wordwrap v1.0.1
 	github.com/montanaflynn/stats v0.6.6
 	github.com/ooni/go-libtor v1.1.6
-	github.com/ooni/oocrypto v0.3.0
-	github.com/ooni/oohttp v0.4.0
+	github.com/ooni/oocrypto v0.4.0
+	github.com/ooni/oohttp v0.5.0
 	github.com/ooni/probe-assets v0.14.0
 	github.com/pborman/getopt/v2 v2.1.0
 	github.com/pion/stun v0.3.5

diff --git a/go.sum b/go.sum
@@ -614,10 +614,10 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl
 github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
 github.com/ooni/go-libtor v1.1.6 h1:hf4xq2vS5E5bBC5BdG+D8orrPo81FRLXAVTDIpL4rzY=
 github.com/ooni/go-libtor v1.1.6/go.mod h1:q1YyLwRD9GeMyeerVvwc0vJ2YgwDLTp2bdVcrh/JXyI=
-github.com/ooni/oocrypto v0.3.0 h1:lYsgDKkmLDhg0dvfp2MNsyKkl91bjV4uAbv3xgFlfk4=
-github.com/ooni/oocrypto v0.3.0/go.mod h1:D/yqWldJfw/4LKFJ0+2t0gDQ0cXVsHx2v45ODmna5SY=
-github.com/ooni/oohttp v0.4.0 h1:I8ZJ1nxf+JTwvINlqgcOSR4aLc2avOGX63bS11mb/qk=
-github.com/ooni/oohttp v0.4.0/go.mod h1:XRJVx6aCswQrE7Fp3j4d8SjHNh1rPEdhpTyPu3zkyBw=
+github.com/ooni/oocrypto v0.4.0 h1:q73mb9MTA9y7EQQf9BU1MT2j9CYoGLcAl+cwjGYLZxA=
+github.com/ooni/oocrypto v0.4.0/go.mod h1:D/yqWldJfw/4LKFJ0+2t0gDQ0cXVsHx2v45ODmna5SY=
+github.com/ooni/oohttp v0.5.0 h1:LvEVRoUJX2VUSu4PrRVaJG53bp2mAuUQAvikWrcmE7Y=
+github.com/ooni/oohttp v0.5.0/go.mod h1:XRJVx6aCswQrE7Fp3j4d8SjHNh1rPEdhpTyPu3zkyBw=
 github.com/ooni/probe-assets v0.14.0 h1:E/kn2CXDvZXdOFGZ217HXmK4nhj4eUsgaudT9H1FJ+I=
 github.com/ooni/probe-assets v0.14.0/go.mod h1:+otUATjJ8T7NsTKhmkXAKLW9oy0NhbcggXhlKzZHqVI=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=

diff --git a/internal/engine/experiment/urlgetter/getter_integration_test.go b/internal/engine/experiment/urlgetter/getter_integration_test.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"net/http"
 	"net/http/httptest"
-	"runtime"
 	"strings"
 	"testing"
 
@@ -277,9 +276,6 @@ func TestGetterWithCancelledContextNoFollowRedirects(t *testing.T) {
 }
 
 func TestGetterWithCancelledContextCannotStartTunnel(t *testing.T) {
-	if strings.HasPrefix(runtime.Version(), "go1.19") {
-		t.Skip("TODO(https://github.com/ooni/probe/issues/2222)")
-	}
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel() // fail immediately
 	g := urlgetter.Getter{

diff --git a/internal/netxlite/utls_test.go b/internal/netxlite/utls_test.go
@@ -101,12 +101,7 @@ func TestUTLSConn(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		// TODO(https://github.com/ooni/probe/issues/2222): we cannot avoid
-		// castedTconn until we use oocrypto >= v0.2 which uses go1.19. In turn,
-		// we cannot use go1.19 as our main version until we upgrade psiphon
-		// such that it builds using go1.19, which is the issue in #2222.
-		castedTconn := tconn.(*utlsConn)
-		if castedTconn.NetConn() != conn {
+		if tconn.NetConn() != conn {
 			t.Fatal("NetConn is not WAI")
 		}
 	})

diff --git a/internal/tunnel/psiphon_integration_test.go b/internal/tunnel/psiphon_integration_test.go
@@ -1,11 +1,5 @@
-//go:build !go1.19
-
 package tunnel_test
 
-//
-// Psiphon not working with go1.19: TODO(https://github.com/ooni/probe/issues/2222)
-//
-
 import (
 	"context"
 	"io/ioutil"

diff --git a/internal/tunnel/tunnel_test.go b/internal/tunnel/tunnel_test.go
@@ -3,8 +3,6 @@ package tunnel_test
 import (
 	"context"
 	"errors"
-	"runtime"
-	"strings"
 	"testing"
 
 	"github.com/ooni/probe-cli/v3/internal/tunnel"
@@ -25,9 +23,6 @@ func TestStartNoTunnel(t *testing.T) {
 }
 
 func TestStartPsiphonWithCancelledContext(t *testing.T) {
-	if strings.HasPrefix(runtime.Version(), "go1.19") {
-		t.Skip("TODO(https://github.com/ooni/probe/issues/2222)")
-	}
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel() // fail immediately
 	tun, _, err := tunnel.Start(ctx, &tunnel.Config{