c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Simone Basso
2021-06-15 11:57:40 +02:00
committed by GitHub
parent 576e035b20
commit 0fdc9cafb5
76 changed files with 440 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ooapi/apis.go
+23 -12
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:00.422051399 +0200 CEST m=+0.000129449
// 2021-06-15 10:55:55.967236 +0200 CEST m=+0.000374501
package ooapi
@@ -59,7 +59,8 @@ func (api *simpleCheckReportIDAPI) Call(ctx context.Context, req *apimodel.Check
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
// simpleCheckInAPI implements the CheckIn API.
@@ -109,7 +110,8 @@ func (api *simpleCheckInAPI) Call(ctx context.Context, req *apimodel.CheckInRequ
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
// simpleLoginAPI implements the Login API.
@@ -159,7 +161,8 @@ func (api *simpleLoginAPI) Call(ctx context.Context, req *apimodel.LoginRequest)
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
// simpleMeasurementMetaAPI implements the MeasurementMeta API.
@@ -209,7 +212,8 @@ func (api *simpleMeasurementMetaAPI) Call(ctx context.Context, req *apimodel.Mea
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
// simpleRegisterAPI implements the Register API.
@@ -259,7 +263,8 @@ func (api *simpleRegisterAPI) Call(ctx context.Context, req *apimodel.RegisterRe
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
// simpleTestHelpersAPI implements the TestHelpers API.
@@ -309,7 +314,8 @@ func (api *simpleTestHelpersAPI) Call(ctx context.Context, req *apimodel.TestHel
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
// simplePsiphonConfigAPI implements the PsiphonConfig API.
@@ -377,7 +383,8 @@ func (api *simplePsiphonConfigAPI) Call(ctx context.Context, req *apimodel.Psiph
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
// simpleTorTargetsAPI implements the TorTargets API.
@@ -445,7 +452,8 @@ func (api *simpleTorTargetsAPI) Call(ctx context.Context, req *apimodel.TorTarge
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
// simpleURLsAPI implements the URLs API.
@@ -495,7 +503,8 @@ func (api *simpleURLsAPI) Call(ctx context.Context, req *apimodel.URLsRequest) (
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
// simpleOpenReportAPI implements the OpenReport API.
@@ -545,7 +554,8 @@ func (api *simpleOpenReportAPI) Call(ctx context.Context, req *apimodel.OpenRepo
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
// simpleSubmitMeasurementAPI implements the SubmitMeasurement API.
@@ -603,5 +613,6 @@ func (api *simpleSubmitMeasurementAPI) Call(ctx context.Context, req *apimodel.S
if api.UserAgent != "" {
httpReq.Header.Add("User-Agent", api.UserAgent)
}
return api.newResponse(api.httpClient().Do(httpReq))
httpResp, err := api.httpClient().Do(httpReq)
return api.newResponse(ctx, httpResp, err)
}
internal/ooapi/apis_test.go
+13 -13
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:01.254917327 +0200 CEST m=+0.000217025
// 2021-06-15 10:55:56.308361 +0200 CEST m=+0.000215751
package ooapi
@@ -9,7 +9,6 @@ import (
"context"
"encoding/json"
"errors"
"io/ioutil"
"net/http"
"net/http/httptest"
"net/url"
@@ -18,6 +17,7 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
"github.com/ooni/probe-cli/v3/internal/iox"
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
)
@@ -177,7 +177,7 @@ func (h *handleCheckReportID) ServeHTTP(w http.ResponseWriter, r *http.Request)
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -440,7 +440,7 @@ func (h *handleCheckIn) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -685,7 +685,7 @@ func (h *handleLogin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -912,7 +912,7 @@ func (h *handleMeasurementMeta) ServeHTTP(w http.ResponseWriter, r *http.Request
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -1175,7 +1175,7 @@ func (h *handleRegister) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -1402,7 +1402,7 @@ func (h *handleTestHelpers) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -1671,7 +1671,7 @@ func (h *handlePsiphonConfig) ServeHTTP(w http.ResponseWriter, r *http.Request)
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -1942,7 +1942,7 @@ func (h *handleTorTargets) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -2192,7 +2192,7 @@ func (h *handleURLs) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -2437,7 +2437,7 @@ func (h *handleOpenReport) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -2682,7 +2682,7 @@ func (h *handleSubmitMeasurement) ServeHTTP(w http.ResponseWriter, r *http.Reque
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
internal/ooapi/caching.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:01.869492095 +0200 CEST m=+0.000168945
// 2021-06-15 10:55:56.587245 +0200 CEST m=+0.000218959
package ooapi
internal/ooapi/caching_test.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:02.497717446 +0200 CEST m=+0.000113904
// 2021-06-15 10:55:56.851681 +0200 CEST m=+0.000186126
package ooapi
internal/ooapi/callers.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:03.02266641 +0200 CEST m=+0.000097757
// 2021-06-15 10:55:57.174427 +0200 CEST m=+0.000217876
package ooapi
internal/ooapi/clientcall.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:03.586305848 +0200 CEST m=+0.000123000
// 2021-06-15 10:55:57.445485 +0200 CEST m=+0.000219751
package ooapi
internal/ooapi/clientcall_test.go
+11 -11
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:04.198485035 +0200 CEST m=+0.000114145
// 2021-06-15 10:55:57.708833 +0200 CEST m=+0.000193418
package ooapi
@@ -8,7 +8,6 @@ package ooapi
import (
"context"
"encoding/json"
"io/ioutil"
"net/http"
"net/http/httptest"
"net/url"
@@ -16,6 +15,7 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
"github.com/ooni/probe-cli/v3/internal/iox"
"github.com/ooni/probe-cli/v3/internal/kvstore"
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
)
@@ -42,7 +42,7 @@ func (h *handleClientCallCheckReportID) ServeHTTP(w http.ResponseWriter, r *http
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -135,7 +135,7 @@ func (h *handleClientCallCheckIn) ServeHTTP(w http.ResponseWriter, r *http.Reque
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -227,7 +227,7 @@ func (h *handleClientCallMeasurementMeta) ServeHTTP(w http.ResponseWriter, r *ht
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -320,7 +320,7 @@ func (h *handleClientCallTestHelpers) ServeHTTP(w http.ResponseWriter, r *http.R
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -435,7 +435,7 @@ func (h *handleClientCallPsiphonConfig) ServeHTTP(w http.ResponseWriter, r *http
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -550,7 +550,7 @@ func (h *handleClientCallTorTargets) ServeHTTP(w http.ResponseWriter, r *http.Re
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -643,7 +643,7 @@ func (h *handleClientCallURLs) ServeHTTP(w http.ResponseWriter, r *http.Request)
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -736,7 +736,7 @@ func (h *handleClientCallOpenReport) ServeHTTP(w http.ResponseWriter, r *http.Re
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -828,7 +828,7 @@ func (h *handleClientCallSubmitMeasurement) ServeHTTP(w http.ResponseWriter, r *
}
h.count++
if r.Body != nil {
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
internal/ooapi/cloners.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:04.793154609 +0200 CEST m=+0.000108739
// 2021-06-15 10:55:57.987741 +0200 CEST m=+0.000211126
package ooapi
internal/ooapi/fake_test.go
+3 -2
View File
@@ -3,9 +3,10 @@ package ooapi
import (
"context"
"io"
"io/ioutil"
"net/http"
"time"
"github.com/ooni/probe-cli/v3/internal/iox"
)
type FakeCodec struct {
@@ -30,7 +31,7 @@ type FakeHTTPClient struct {
func (c *FakeHTTPClient) Do(req *http.Request) (*http.Response, error) {
time.Sleep(10 * time.Microsecond)
if req.Body != nil {
_, _ = ioutil.ReadAll(req.Body)
_, _ = iox.ReadAllContext(req.Context(), req.Body)
req.Body.Close()
}
if c.Err != nil {
internal/ooapi/fakeapi_test.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:05.331414434 +0200 CEST m=+0.000124504
// 2021-06-15 10:55:58.234786 +0200 CEST m=+0.000218167
package ooapi
internal/ooapi/internal/generator/apis.go
+2 -1
View File
@@ -156,7 +156,8 @@ func (d *Descriptor) genNewAPI(sb *strings.Builder) {
fmt.Fprint(sb, "\tif api.UserAgent != \"\" {\n")
fmt.Fprint(sb, "\t\thttpReq.Header.Add(\"User-Agent\", api.UserAgent)\n")
fmt.Fprint(sb, "\t}\n")
fmt.Fprint(sb, "\treturn api.newResponse(api.httpClient().Do(httpReq))\n")
fmt.Fprint(sb, "\thttpResp, err := api.httpClient().Do(httpReq)\n")
fmt.Fprint(sb, "\treturn api.newResponse(ctx, httpResp, err)\n")
fmt.Fprint(sb, "}\n\n")
}
internal/ooapi/internal/generator/apistest.go
+2 -2
View File
@@ -231,7 +231,7 @@ func (d *Descriptor) genTestRoundTrip(sb *strings.Builder) {
fmt.Fprint(sb, "\t}\n")
fmt.Fprint(sb, "\th.count++\n")
fmt.Fprint(sb, "\tif r.Body != nil {\n")
fmt.Fprint(sb, "\t\tdata, err := ioutil.ReadAll(r.Body)\n")
fmt.Fprint(sb, "\t\tdata, err := iox.ReadAllContext(r.Context(), r.Body)\n")
fmt.Fprint(sb, "\t\tif err != nil {\n")
fmt.Fprintf(sb, "\t\t\tw.WriteHeader(400)\n")
fmt.Fprintf(sb, "\t\t\treturn\n")
@@ -443,7 +443,6 @@ func GenAPIsTestGo(file string) {
fmt.Fprint(&sb, "\t\"context\"\n")
fmt.Fprint(&sb, "\t\"encoding/json\"\n")
fmt.Fprint(&sb, "\t\"errors\"\n")
fmt.Fprint(&sb, "\t\"io/ioutil\"\n")
fmt.Fprint(&sb, "\t\"net/http/httptest\"\n")
fmt.Fprint(&sb, "\t\"net/http\"\n")
fmt.Fprint(&sb, "\t\"net/url\"\n")
@@ -452,6 +451,7 @@ func GenAPIsTestGo(file string) {
fmt.Fprint(&sb, "\t\"sync\"\n")
fmt.Fprint(&sb, "\n")
fmt.Fprint(&sb, "\t\"github.com/google/go-cmp/cmp\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/iox\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel\"\n")
fmt.Fprint(&sb, ")\n")
for _, desc := range Descriptors {
internal/ooapi/internal/generator/clientcalltest.go
+2 -2
View File
@@ -57,7 +57,7 @@ func (d *Descriptor) genTestClientCallRoundTrip(sb *strings.Builder) {
fmt.Fprint(sb, "\t}\n")
fmt.Fprint(sb, "\th.count++\n")
fmt.Fprint(sb, "\tif r.Body != nil {\n")
fmt.Fprint(sb, "\t\tdata, err := ioutil.ReadAll(r.Body)\n")
fmt.Fprint(sb, "\t\tdata, err := iox.ReadAllContext(r.Context(), r.Body)\n")
fmt.Fprint(sb, "\t\tif err != nil {\n")
fmt.Fprintf(sb, "\t\t\tw.WriteHeader(400)\n")
fmt.Fprintf(sb, "\t\t\treturn\n")
@@ -161,7 +161,6 @@ func GenClientCallTestGo(file string) {
fmt.Fprint(&sb, "import (\n")
fmt.Fprint(&sb, "\t\"context\"\n")
fmt.Fprint(&sb, "\t\"encoding/json\"\n")
fmt.Fprint(&sb, "\t\"io/ioutil\"\n")
fmt.Fprint(&sb, "\t\"net/http/httptest\"\n")
fmt.Fprint(&sb, "\t\"net/http\"\n")
fmt.Fprint(&sb, "\t\"net/url\"\n")
@@ -169,6 +168,7 @@ func GenClientCallTestGo(file string) {
fmt.Fprint(&sb, "\t\"sync\"\n")
fmt.Fprint(&sb, "\n")
fmt.Fprint(&sb, "\t\"github.com/google/go-cmp/cmp\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/iox\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/kvstore\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel\"\n")
fmt.Fprint(&sb, ")\n")
internal/ooapi/internal/generator/responses.go
+4 -3
View File
@@ -9,7 +9,7 @@ import (
func (d *Descriptor) genNewResponse(sb *strings.Builder) {
fmt.Fprintf(sb,
"func (api *%s) newResponse(resp *http.Response, err error) (%s, error) {\n",
"func (api *%s) newResponse(ctx context.Context, resp *http.Response, err error) (%s, error) {\n",
d.APIStructName(), d.ResponseTypeName())
fmt.Fprint(sb, "\tif err != nil {\n")
@@ -23,7 +23,7 @@ func (d *Descriptor) genNewResponse(sb *strings.Builder) {
fmt.Fprint(sb, "\t}\n")
fmt.Fprint(sb, "\tdefer resp.Body.Close()\n")
fmt.Fprint(sb, "\treader := io.LimitReader(resp.Body, 4<<20)\n")
fmt.Fprint(sb, "\tdata, err := ioutil.ReadAll(reader)\n")
fmt.Fprint(sb, "\tdata, err := iox.ReadAllContext(ctx, reader)\n")
fmt.Fprint(sb, "\tif err != nil {\n")
fmt.Fprint(sb, "\t\treturn nil, err\n")
fmt.Fprint(sb, "\t}\n")
@@ -67,10 +67,11 @@ func GenResponsesGo(file string) {
fmt.Fprint(&sb, "package ooapi\n\n")
fmt.Fprintf(&sb, "//go:generate go run ./internal/generator -file %s\n\n", file)
fmt.Fprint(&sb, "import (\n")
fmt.Fprint(&sb, "\t\"context\"\n")
fmt.Fprint(&sb, "\t\"io\"\n")
fmt.Fprint(&sb, "\t\"io/ioutil\"\n")
fmt.Fprint(&sb, "\t\"net/http\"\n")
fmt.Fprint(&sb, "\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/iox\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel\"\n")
fmt.Fprint(&sb, ")\n\n")
for _, desc := range Descriptors {
internal/ooapi/login.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:06.213159282 +0200 CEST m=+0.000104135
// 2021-06-15 10:55:58.487888 +0200 CEST m=+0.000221710
package ooapi
internal/ooapi/login_test.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:06.893164862 +0200 CEST m=+0.000136881
// 2021-06-15 10:55:58.755431 +0200 CEST m=+0.000217917
package ooapi
internal/ooapi/loginhandler_test.go
+3 -3
View File
@@ -2,7 +2,6 @@ package ooapi
import (
"encoding/json"
"io/ioutil"
"net/http"
"strings"
"sync"
@@ -10,6 +9,7 @@ import (
"time"
"github.com/ooni/probe-cli/v3/internal/atomicx"
"github.com/ooni/probe-cli/v3/internal/iox"
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
)
@@ -72,7 +72,7 @@ func (lh *LoginHandler) register(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(400)
return
}
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -113,7 +113,7 @@ func (lh *LoginHandler) login(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(400)
return
}
data, err := ioutil.ReadAll(r.Body)
data, err := iox.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
internal/ooapi/requests.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:07.590481334 +0200 CEST m=+0.000085230
// 2021-06-15 10:55:59.020364 +0200 CEST m=+0.000217085
package ooapi
internal/ooapi/responses.go
+25 -24
View File
@@ -1,19 +1,20 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:08.237841277 +0200 CEST m=+0.000121556
// 2021-06-15 10:55:59.329509 +0200 CEST m=+0.000220043
package ooapi
//go:generate go run ./internal/generator -file responses.go
import (
"context"
"io"
"io/ioutil"
"net/http"
"github.com/ooni/probe-cli/v3/internal/iox"
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
)
func (api *simpleCheckReportIDAPI) newResponse(resp *http.Response, err error) (*apimodel.CheckReportIDResponse, error) {
func (api *simpleCheckReportIDAPI) newResponse(ctx context.Context, resp *http.Response, err error) (*apimodel.CheckReportIDResponse, error) {
if err != nil {
return nil, err
}
@@ -25,7 +26,7 @@ func (api *simpleCheckReportIDAPI) newResponse(resp *http.Response, err error) (
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -36,7 +37,7 @@ func (api *simpleCheckReportIDAPI) newResponse(resp *http.Response, err error) (
return out, nil
}
func (api *simpleCheckInAPI) newResponse(resp *http.Response, err error) (*apimodel.CheckInResponse, error) {
func (api *simpleCheckInAPI) newResponse(ctx context.Context, resp *http.Response, err error) (*apimodel.CheckInResponse, error) {
if err != nil {
return nil, err
}
@@ -48,7 +49,7 @@ func (api *simpleCheckInAPI) newResponse(resp *http.Response, err error) (*apimo
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -59,7 +60,7 @@ func (api *simpleCheckInAPI) newResponse(resp *http.Response, err error) (*apimo
return out, nil
}
func (api *simpleLoginAPI) newResponse(resp *http.Response, err error) (*apimodel.LoginResponse, error) {
func (api *simpleLoginAPI) newResponse(ctx context.Context, resp *http.Response, err error) (*apimodel.LoginResponse, error) {
if err != nil {
return nil, err
}
@@ -71,7 +72,7 @@ func (api *simpleLoginAPI) newResponse(resp *http.Response, err error) (*apimode
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -82,7 +83,7 @@ func (api *simpleLoginAPI) newResponse(resp *http.Response, err error) (*apimode
return out, nil
}
func (api *simpleMeasurementMetaAPI) newResponse(resp *http.Response, err error) (*apimodel.MeasurementMetaResponse, error) {
func (api *simpleMeasurementMetaAPI) newResponse(ctx context.Context, resp *http.Response, err error) (*apimodel.MeasurementMetaResponse, error) {
if err != nil {
return nil, err
}
@@ -94,7 +95,7 @@ func (api *simpleMeasurementMetaAPI) newResponse(resp *http.Response, err error)
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -105,7 +106,7 @@ func (api *simpleMeasurementMetaAPI) newResponse(resp *http.Response, err error)
return out, nil
}
func (api *simpleRegisterAPI) newResponse(resp *http.Response, err error) (*apimodel.RegisterResponse, error) {
func (api *simpleRegisterAPI) newResponse(ctx context.Context, resp *http.Response, err error) (*apimodel.RegisterResponse, error) {
if err != nil {
return nil, err
}
@@ -117,7 +118,7 @@ func (api *simpleRegisterAPI) newResponse(resp *http.Response, err error) (*apim
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -128,7 +129,7 @@ func (api *simpleRegisterAPI) newResponse(resp *http.Response, err error) (*apim
return out, nil
}
func (api *simpleTestHelpersAPI) newResponse(resp *http.Response, err error) (apimodel.TestHelpersResponse, error) {
func (api *simpleTestHelpersAPI) newResponse(ctx context.Context, resp *http.Response, err error) (apimodel.TestHelpersResponse, error) {
if err != nil {
return nil, err
}
@@ -140,7 +141,7 @@ func (api *simpleTestHelpersAPI) newResponse(resp *http.Response, err error) (ap
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -154,7 +155,7 @@ func (api *simpleTestHelpersAPI) newResponse(resp *http.Response, err error) (ap
return out, nil
}
func (api *simplePsiphonConfigAPI) newResponse(resp *http.Response, err error) (apimodel.PsiphonConfigResponse, error) {
func (api *simplePsiphonConfigAPI) newResponse(ctx context.Context, resp *http.Response, err error) (apimodel.PsiphonConfigResponse, error) {
if err != nil {
return nil, err
}
@@ -166,7 +167,7 @@ func (api *simplePsiphonConfigAPI) newResponse(resp *http.Response, err error) (
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -180,7 +181,7 @@ func (api *simplePsiphonConfigAPI) newResponse(resp *http.Response, err error) (
return out, nil
}
func (api *simpleTorTargetsAPI) newResponse(resp *http.Response, err error) (apimodel.TorTargetsResponse, error) {
func (api *simpleTorTargetsAPI) newResponse(ctx context.Context, resp *http.Response, err error) (apimodel.TorTargetsResponse, error) {
if err != nil {
return nil, err
}
@@ -192,7 +193,7 @@ func (api *simpleTorTargetsAPI) newResponse(resp *http.Response, err error) (api
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -206,7 +207,7 @@ func (api *simpleTorTargetsAPI) newResponse(resp *http.Response, err error) (api
return out, nil
}
func (api *simpleURLsAPI) newResponse(resp *http.Response, err error) (*apimodel.URLsResponse, error) {
func (api *simpleURLsAPI) newResponse(ctx context.Context, resp *http.Response, err error) (*apimodel.URLsResponse, error) {
if err != nil {
return nil, err
}
@@ -218,7 +219,7 @@ func (api *simpleURLsAPI) newResponse(resp *http.Response, err error) (*apimodel
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -229,7 +230,7 @@ func (api *simpleURLsAPI) newResponse(resp *http.Response, err error) (*apimodel
return out, nil
}
func (api *simpleOpenReportAPI) newResponse(resp *http.Response, err error) (*apimodel.OpenReportResponse, error) {
func (api *simpleOpenReportAPI) newResponse(ctx context.Context, resp *http.Response, err error) (*apimodel.OpenReportResponse, error) {
if err != nil {
return nil, err
}
@@ -241,7 +242,7 @@ func (api *simpleOpenReportAPI) newResponse(resp *http.Response, err error) (*ap
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -252,7 +253,7 @@ func (api *simpleOpenReportAPI) newResponse(resp *http.Response, err error) (*ap
return out, nil
}
func (api *simpleSubmitMeasurementAPI) newResponse(resp *http.Response, err error) (*apimodel.SubmitMeasurementResponse, error) {
func (api *simpleSubmitMeasurementAPI) newResponse(ctx context.Context, resp *http.Response, err error) (*apimodel.SubmitMeasurementResponse, error) {
if err != nil {
return nil, err
}
@@ -264,7 +265,7 @@ func (api *simpleSubmitMeasurementAPI) newResponse(resp *http.Response, err erro
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := ioutil.ReadAll(reader)
data, err := iox.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
internal/ooapi/swagger_test.go
+2 -2
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-05-12 09:15:08.888123159 +0200 CEST m=+0.000883704
// 2021-06-15 10:55:59.636856 +0200 CEST m=+0.000624459
package ooapi
@@ -9,7 +9,7 @@ const swagger = `{
"swagger": "2.0",
"info": {
"title": "OONI API specification",
"version": "0.20210512.5071508"
"version": "0.20210615.6085559"
},
"host": "api.ooni.io",
"basePath": "/",
internal/ooapi/swaggerdiff_test.go
+3 -2
View File
@@ -1,9 +1,9 @@
package ooapi
import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"
"net/http"
"sort"
@@ -13,6 +13,7 @@ import (
"github.com/hexops/gotextdiff"
"github.com/hexops/gotextdiff/myers"
"github.com/hexops/gotextdiff/span"
"github.com/ooni/probe-cli/v3/internal/iox"
"github.com/ooni/probe-cli/v3/internal/ooapi/internal/openapi"
)
@@ -36,7 +37,7 @@ func getServerModel(serverURL string) *openapi.Swagger {
log.Fatal(err)
}
defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body)
data, err := iox.ReadAllContext(context.Background(), resp.Body)
if err != nil {
log.Fatal(err)
}