0fdc9cafb5
* 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
159 lines
4.5 KiB
Go
159 lines
4.5 KiB
Go
// Package httpx contains http extensions.
|
|
package httpx
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/iox"
|
|
)
|
|
|
|
// Logger is the definition of Logger used by this package.
|
|
type Logger interface {
|
|
Debugf(format string, v ...interface{})
|
|
}
|
|
|
|
// Client is an extended client.
|
|
type Client struct {
|
|
// Accept contains the accept header.
|
|
Accept string
|
|
|
|
// Authorization contains the authorization header.
|
|
Authorization string
|
|
|
|
// BaseURL is the base URL of the API.
|
|
BaseURL string
|
|
|
|
// HTTPClient is the real http client to use.
|
|
HTTPClient *http.Client
|
|
|
|
// Host allows to set a specific host header. This is useful
|
|
// to implement, e.g., cloudfronting.
|
|
Host string
|
|
|
|
// Logger is the logger to use.
|
|
Logger Logger
|
|
|
|
// UserAgent is the user agent to use.
|
|
UserAgent string
|
|
}
|
|
|
|
// NewRequestWithJSONBody creates a new request with a JSON body
|
|
func (c Client) NewRequestWithJSONBody(
|
|
ctx context.Context, method, resourcePath string,
|
|
query url.Values, body interface{}) (*http.Request, error) {
|
|
data, err := json.Marshal(body)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
c.Logger.Debugf("httpx: request body: %d bytes", len(data))
|
|
request, err := c.NewRequest(
|
|
ctx, method, resourcePath, query, bytes.NewReader(data))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if body != nil {
|
|
request.Header.Set("Content-Type", "application/json")
|
|
}
|
|
return request, nil
|
|
}
|
|
|
|
// NewRequest creates a new request.
|
|
func (c Client) NewRequest(ctx context.Context, method, resourcePath string,
|
|
query url.Values, body io.Reader) (*http.Request, error) {
|
|
URL, err := url.Parse(c.BaseURL)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = resourcePath
|
|
if query != nil {
|
|
URL.RawQuery = query.Encode()
|
|
}
|
|
c.Logger.Debugf("httpx: method: %s", method)
|
|
c.Logger.Debugf("httpx: URL: %s", URL.String())
|
|
request, err := http.NewRequest(method, URL.String(), body)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
request.Host = c.Host // allow cloudfronting
|
|
if c.Authorization != "" {
|
|
request.Header.Set("Authorization", c.Authorization)
|
|
}
|
|
if c.Accept != "" {
|
|
request.Header.Set("Accept", c.Accept)
|
|
}
|
|
request.Header.Set("User-Agent", c.UserAgent)
|
|
return request.WithContext(ctx), nil
|
|
}
|
|
|
|
// Do performs the provided request and returns the response body or an error.
|
|
func (c Client) Do(request *http.Request) ([]byte, error) {
|
|
response, err := c.HTTPClient.Do(request)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer response.Body.Close()
|
|
if response.StatusCode >= 400 {
|
|
return nil, fmt.Errorf("httpx: request failed: %s", response.Status)
|
|
}
|
|
return iox.ReadAllContext(request.Context(), response.Body)
|
|
}
|
|
|
|
// DoJSON performs the provided request and unmarshals the JSON response body
|
|
// into the provided output variable.
|
|
func (c Client) DoJSON(request *http.Request, output interface{}) error {
|
|
data, err := c.Do(request)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
c.Logger.Debugf("httpx: response body: %d bytes", len(data))
|
|
return json.Unmarshal(data, output)
|
|
}
|
|
|
|
// GetJSON reads the JSON resource at resourcePath and unmarshals the
|
|
// results into output. The request is bounded by the lifetime of the
|
|
// context passed as argument. Returns the error that occurred.
|
|
func (c Client) GetJSON(ctx context.Context, resourcePath string, output interface{}) error {
|
|
return c.GetJSONWithQuery(ctx, resourcePath, nil, output)
|
|
}
|
|
|
|
// GetJSONWithQuery is like GetJSON but also has a query.
|
|
func (c Client) GetJSONWithQuery(
|
|
ctx context.Context, resourcePath string,
|
|
query url.Values, output interface{}) error {
|
|
request, err := c.NewRequest(ctx, "GET", resourcePath, query, nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return c.DoJSON(request, output)
|
|
}
|
|
|
|
// PostJSON creates a JSON subresource of the resource at resourcePath
|
|
// using the JSON document at input and returning the result into the
|
|
// JSON document at output. The request is bounded by the context's
|
|
// lifetime. Returns the error that occurred.
|
|
func (c Client) PostJSON(
|
|
ctx context.Context, resourcePath string, input, output interface{}) error {
|
|
request, err := c.NewRequestWithJSONBody(ctx, "POST", resourcePath, nil, input)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return c.DoJSON(request, output)
|
|
}
|
|
|
|
// PutJSON updates a JSON resource at a specific path and returns
|
|
// the error that occurred and possibly an output document
|
|
func (c Client) PutJSON(
|
|
ctx context.Context, resourcePath string, input, output interface{}) error {
|
|
request, err := c.NewRequestWithJSONBody(ctx, "PUT", resourcePath, nil, input)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return c.DoJSON(request, output)
|
|
}
|