fix(all): introduce and use iox.ReadAllContext (#379)

* fix(all): introduce and use iox.ReadAllContext

This improvement over the ioutil.ReadAll utility returns early
if the context expires. This enables us to unblock stuck code in
case there's censorship confounding the TCP stack.

See https://github.com/ooni/probe/issues/1417.

Compared to the functionality postulated in the above mentioned
issue, I choose to be more generic and separate limiting the
maximum body size (not implemented here) from using the context
to return early when reading a body (or any other reader).

After implementing iox.ReadAllContext, I made sure we always
use it everywhere in the tree instead of ioutil.ReadAll.

This includes many parts of the codebase where in theory we don't
need iox.ReadAllContext. Though, changing all the places makes
checking whether we're not using ioutil.ReadAll where we should
not be using it easy: `git grep` should return no lines.

* Update internal/iox/iox_test.go

* fix(ndt7): treat context errors as non-errors

The rationale is explained by the comment documenting reduceErr.

* Update internal/engine/experiment/ndt7/download.go

internal/cmd/jafar/badproxy/badproxy.go

@@ -6,16 +6,17 @@
 package badproxy
 
 import (
+	"context"
 	"crypto/rsa"
 	"crypto/tls"
 	"crypto/x509"
 	"io"
-	"io/ioutil"
 	"net"
 	"strings"
 	"time"
 
 	"github.com/google/martian/v3/mitm"
+	"github.com/ooni/probe-cli/v3/internal/iox"
 )
 
 // CensoringProxy is a proxy that does not behave correctly.
@@ -56,7 +57,7 @@ func (p *CensoringProxy) serve(conn net.Conn) {
 	} else {
 		const maxread = 1 << 17
 		reader := io.LimitReader(conn, maxread)
-		ioutil.ReadAll(reader)
+		iox.ReadAllContext(context.Background(), reader)
 	}
 	conn.Close()
 }

internal/cmd/jafar/httpproxy/httpproxy_test.go

@@ -3,12 +3,12 @@ package httpproxy
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"testing"
 
 	"github.com/ooni/probe-cli/v3/internal/cmd/jafar/uncensored"
+	"github.com/ooni/probe-cli/v3/internal/iox"
 )
 
 func TestPass(t *testing.T) {
@@ -89,7 +89,7 @@ func checkrequest(
 		t.Fatal("unexpected value of status code")
 	}
 	t.Log(resp)
-	values, _ := resp.Header["Via"]
+	values := resp.Header["Via"]
 	var foundProduct bool
 	for _, value := range values {
 		if value == product {
@@ -102,7 +102,7 @@ func checkrequest(
 	if !foundProduct && expectVia {
 		t.Fatal("Via header not found")
 	}
-	proxiedData, err := ioutil.ReadAll(resp.Body)
+	proxiedData, err := iox.ReadAllContext(context.Background(), resp.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -120,7 +120,7 @@ func checkbody(t *testing.T, proxiedData []byte, host string) {
 		t.Fatal("unexpected status code")
 	}
 	defer resp.Body.Close()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := iox.ReadAllContext(context.Background(), resp.Body)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/cmd/jafar/uncensored/uncensored_test.go

@@ -3,10 +3,11 @@ package uncensored
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"testing"
+
+	"github.com/ooni/probe-cli/v3/internal/iox"
 )
 
 func TestGood(t *testing.T) {
@@ -55,7 +56,7 @@ func TestGood(t *testing.T) {
 	if resp.StatusCode != 200 {
 		t.Fatal("invalid status-code")
 	}
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := iox.ReadAllContext(context.Background(), resp.Body)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/cmd/oohelper/internal/client.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
@@ -15,6 +14,7 @@ import (
 	"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
 	"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx"
+	"github.com/ooni/probe-cli/v3/internal/iox"
 	"github.com/ooni/probe-cli/v3/internal/runtimex"
 	"github.com/ooni/probe-cli/v3/internal/version"
 )
@@ -126,7 +126,7 @@ func (oo OOClient) Do(ctx context.Context, config OOConfig) (*CtrlResponse, erro
 	if resp.StatusCode != 200 {
 		return nil, ErrHTTPStatusCode
 	}
-	data, err = ioutil.ReadAll(resp.Body)
+	data, err = iox.ReadAllContext(ctx, resp.Body)
 	if err != nil {
 		return nil, err
 	}

internal/cmd/oohelper/internal/fake_test.go

@@ -3,13 +3,13 @@ package internal
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"time"
 
 	"github.com/ooni/probe-cli/v3/internal/atomicx"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx"
+	"github.com/ooni/probe-cli/v3/internal/iox"
 )
 
 type FakeResolver struct {
@@ -63,7 +63,7 @@ func (txp FakeTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 		return txp.Func(req)
 	}
 	if req.Body != nil {
-		ioutil.ReadAll(req.Body)
+		iox.ReadAllContext(req.Context(), req.Body)
 		req.Body.Close()
 	}
 	if txp.Err != nil {

internal/cmd/oohelperd/internal/fake_test.go

@@ -3,13 +3,13 @@ package internal
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"time"
 
 	"github.com/ooni/probe-cli/v3/internal/atomicx"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx"
+	"github.com/ooni/probe-cli/v3/internal/iox"
 )
 
 type FakeResolver struct {
@@ -63,7 +63,7 @@ func (txp FakeTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 		return txp.Func(req)
 	}
 	if req.Body != nil {
-		ioutil.ReadAll(req.Body)
+		iox.ReadAllContext(req.Context(), req.Body)
 		req.Body.Close()
 	}
 	if txp.Err != nil {

internal/cmd/oohelperd/internal/http.go

@@ -3,12 +3,12 @@ package internal
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"strings"
 	"sync"
 
 	"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
+	"github.com/ooni/probe-cli/v3/internal/iox"
 )
 
 // CtrlHTTPResponse is the result of the HTTP check performed by
@@ -56,7 +56,7 @@ func HTTPDo(ctx context.Context, config *HTTPConfig) {
 		headers[k] = resp.Header.Get(k)
 	}
 	reader := &io.LimitedReader{R: resp.Body, N: config.MaxAcceptableBody}
-	data, err := ioutil.ReadAll(reader)
+	data, err := iox.ReadAllContext(ctx, reader)
 	config.Out <- CtrlHTTPResponse{
 		BodyLength: int64(len(data)),
 		Failure:    newfailure(err),

internal/cmd/oohelperd/internal/internal.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 
 	"github.com/ooni/probe-cli/v3/internal/engine/netx"
+	"github.com/ooni/probe-cli/v3/internal/iox"
 	"github.com/ooni/probe-cli/v3/internal/version"
 )
 
@@ -32,7 +32,7 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 	reader := &io.LimitedReader{R: req.Body, N: h.MaxAcceptableBody}
-	data, err := ioutil.ReadAll(reader)
+	data, err := iox.ReadAllContext(req.Context(), reader)
 	if err != nil {
 		w.WriteHeader(400)
 		return
@@ -42,12 +42,7 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		w.WriteHeader(400)
 		return
 	}
-	measureConfig := MeasureConfig{
-		Client:            h.Client,
-		Dialer:            h.Dialer,
-		MaxAcceptableBody: h.MaxAcceptableBody,
-		Resolver:          h.Resolver,
-	}
+	measureConfig := MeasureConfig(h)
 	cresp, err := Measure(req.Context(), measureConfig, &creq)
 	if err != nil {
 		w.WriteHeader(400)

internal/cmd/oohelperd/internal/internal_test.go

@@ -1,9 +1,9 @@
 package internal_test
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -12,6 +12,7 @@ import (
 
 	"github.com/ooni/probe-cli/v3/internal/cmd/oohelperd/internal"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx/resolver"
+	"github.com/ooni/probe-cli/v3/internal/iox"
 )
 
 const simplerequest = `{
@@ -126,7 +127,7 @@ func TestWorkingAsIntended(t *testing.T) {
 			if v := resp.Header.Get("content-type"); v != expect.respContentType {
 				t.Fatalf("unexpected content-type: %s", v)
 			}
-			data, err := ioutil.ReadAll(resp.Body)
+			data, err := iox.ReadAllContext(context.Background(), resp.Body)
 			if err != nil {
 				t.Fatal(err)
 			}