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
276 lines
8.3 KiB
Go
276 lines
8.3 KiB
Go
package oldhttptransport
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"crypto/tls"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httptrace"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/atomicx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/connid"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/dialid"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/modelx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/transactionid"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
|
|
"github.com/ooni/probe-cli/v3/internal/iox"
|
|
)
|
|
|
|
// TraceTripper performs single HTTP transactions.
|
|
type TraceTripper struct {
|
|
readAllErrs *atomicx.Int64
|
|
readAllContext func(ctx context.Context, r io.Reader) ([]byte, error)
|
|
roundTripper http.RoundTripper
|
|
}
|
|
|
|
// NewTraceTripper creates a new Transport.
|
|
func NewTraceTripper(roundTripper http.RoundTripper) *TraceTripper {
|
|
return &TraceTripper{
|
|
readAllErrs: &atomicx.Int64{},
|
|
readAllContext: iox.ReadAllContext,
|
|
roundTripper: roundTripper,
|
|
}
|
|
}
|
|
|
|
type readCloseWrapper struct {
|
|
closer io.Closer
|
|
reader io.Reader
|
|
}
|
|
|
|
func newReadCloseWrapper(
|
|
reader io.Reader, closer io.ReadCloser,
|
|
) *readCloseWrapper {
|
|
return &readCloseWrapper{
|
|
closer: closer,
|
|
reader: reader,
|
|
}
|
|
}
|
|
|
|
func (c *readCloseWrapper) Read(p []byte) (int, error) {
|
|
return c.reader.Read(p)
|
|
}
|
|
|
|
func (c *readCloseWrapper) Close() error {
|
|
return c.closer.Close()
|
|
}
|
|
|
|
func readSnap(
|
|
ctx context.Context, source *io.ReadCloser, limit int64,
|
|
readAllContext func(ctx context.Context, r io.Reader) ([]byte, error),
|
|
) (data []byte, err error) {
|
|
data, err = readAllContext(ctx, io.LimitReader(*source, limit))
|
|
if err == nil {
|
|
*source = newReadCloseWrapper(
|
|
io.MultiReader(bytes.NewReader(data), *source),
|
|
*source,
|
|
)
|
|
}
|
|
return
|
|
}
|
|
|
|
// RoundTrip executes a single HTTP transaction, returning
|
|
// a Response for the provided Request.
|
|
func (t *TraceTripper) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
root := modelx.ContextMeasurementRootOrDefault(req.Context())
|
|
|
|
tid := transactionid.ContextTransactionID(req.Context())
|
|
root.Handler.OnMeasurement(modelx.Measurement{
|
|
HTTPRoundTripStart: &modelx.HTTPRoundTripStartEvent{
|
|
DialID: dialid.ContextDialID(req.Context()),
|
|
DurationSinceBeginning: time.Since(root.Beginning),
|
|
Method: req.Method,
|
|
TransactionID: tid,
|
|
URL: req.URL.String(),
|
|
},
|
|
})
|
|
|
|
var (
|
|
err error
|
|
majorOp = errorx.HTTPRoundTripOperation
|
|
majorOpMu sync.Mutex
|
|
requestBody []byte
|
|
requestHeaders = http.Header{}
|
|
requestHeadersMu sync.Mutex
|
|
snapSize = modelx.ComputeBodySnapSize(root.MaxBodySnapSize)
|
|
)
|
|
|
|
// Save a snapshot of the request body
|
|
if req.Body != nil {
|
|
requestBody, err = readSnap(req.Context(), &req.Body, snapSize, t.readAllContext)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
// Prepare a tracer for delivering events
|
|
tracer := &httptrace.ClientTrace{
|
|
TLSHandshakeStart: func() {
|
|
majorOpMu.Lock()
|
|
majorOp = errorx.TLSHandshakeOperation
|
|
majorOpMu.Unlock()
|
|
// Event emitted by net/http when DialTLS is not
|
|
// configured in the http.Transport
|
|
root.Handler.OnMeasurement(modelx.Measurement{
|
|
TLSHandshakeStart: &modelx.TLSHandshakeStartEvent{
|
|
DurationSinceBeginning: time.Since(root.Beginning),
|
|
TransactionID: tid,
|
|
},
|
|
})
|
|
},
|
|
TLSHandshakeDone: func(state tls.ConnectionState, err error) {
|
|
// Wrapping the error even if we're not returning it because it may
|
|
// less confusing to users to see the wrapped name
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
Error: err,
|
|
Operation: errorx.TLSHandshakeOperation,
|
|
TransactionID: tid,
|
|
}.MaybeBuild()
|
|
durationSinceBeginning := time.Since(root.Beginning)
|
|
// Event emitted by net/http when DialTLS is not
|
|
// configured in the http.Transport
|
|
root.Handler.OnMeasurement(modelx.Measurement{
|
|
TLSHandshakeDone: &modelx.TLSHandshakeDoneEvent{
|
|
ConnectionState: modelx.NewTLSConnectionState(state),
|
|
Error: err,
|
|
DurationSinceBeginning: durationSinceBeginning,
|
|
TransactionID: tid,
|
|
},
|
|
})
|
|
},
|
|
GotConn: func(info httptrace.GotConnInfo) {
|
|
majorOpMu.Lock()
|
|
majorOp = errorx.HTTPRoundTripOperation
|
|
majorOpMu.Unlock()
|
|
root.Handler.OnMeasurement(modelx.Measurement{
|
|
HTTPConnectionReady: &modelx.HTTPConnectionReadyEvent{
|
|
ConnID: connid.Compute(
|
|
info.Conn.LocalAddr().Network(),
|
|
info.Conn.LocalAddr().String(),
|
|
),
|
|
DurationSinceBeginning: time.Since(root.Beginning),
|
|
TransactionID: tid,
|
|
},
|
|
})
|
|
},
|
|
WroteHeaderField: func(key string, values []string) {
|
|
requestHeadersMu.Lock()
|
|
// Important: do not set directly into the headers map using
|
|
// the [] operator because net/http expects to be able to
|
|
// perform normalization of header names!
|
|
for _, value := range values {
|
|
requestHeaders.Add(key, value)
|
|
}
|
|
requestHeadersMu.Unlock()
|
|
root.Handler.OnMeasurement(modelx.Measurement{
|
|
HTTPRequestHeader: &modelx.HTTPRequestHeaderEvent{
|
|
DurationSinceBeginning: time.Since(root.Beginning),
|
|
Key: key,
|
|
TransactionID: tid,
|
|
Value: values,
|
|
},
|
|
})
|
|
},
|
|
WroteHeaders: func() {
|
|
root.Handler.OnMeasurement(modelx.Measurement{
|
|
HTTPRequestHeadersDone: &modelx.HTTPRequestHeadersDoneEvent{
|
|
DurationSinceBeginning: time.Since(root.Beginning),
|
|
Headers: requestHeaders, // [*]
|
|
Method: req.Method, // [*]
|
|
TransactionID: tid,
|
|
URL: req.URL, // [*]
|
|
},
|
|
})
|
|
},
|
|
WroteRequest: func(info httptrace.WroteRequestInfo) {
|
|
// Wrapping the error even if we're not returning it because it may
|
|
// less confusing to users to see the wrapped name
|
|
err := errorx.SafeErrWrapperBuilder{
|
|
Error: info.Err,
|
|
Operation: errorx.HTTPRoundTripOperation,
|
|
TransactionID: tid,
|
|
}.MaybeBuild()
|
|
root.Handler.OnMeasurement(modelx.Measurement{
|
|
HTTPRequestDone: &modelx.HTTPRequestDoneEvent{
|
|
DurationSinceBeginning: time.Since(root.Beginning),
|
|
Error: err,
|
|
TransactionID: tid,
|
|
},
|
|
})
|
|
},
|
|
GotFirstResponseByte: func() {
|
|
root.Handler.OnMeasurement(modelx.Measurement{
|
|
HTTPResponseStart: &modelx.HTTPResponseStartEvent{
|
|
DurationSinceBeginning: time.Since(root.Beginning),
|
|
TransactionID: tid,
|
|
},
|
|
})
|
|
},
|
|
}
|
|
|
|
// If we don't have already a tracer this is a toplevel request, so just
|
|
// set the tracer. Otherwise, we're doing DoH. We cannot set anothert trace
|
|
// because they'd be merged. Instead, replace the existing trace content
|
|
// with the new trace and then remember to reset it.
|
|
origtracer := httptrace.ContextClientTrace(req.Context())
|
|
if origtracer != nil {
|
|
bkp := *origtracer
|
|
*origtracer = *tracer
|
|
defer func() {
|
|
*origtracer = bkp
|
|
}()
|
|
} else {
|
|
req = req.WithContext(httptrace.WithClientTrace(req.Context(), tracer))
|
|
}
|
|
|
|
resp, err := t.roundTripper.RoundTrip(req)
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
Error: err,
|
|
Operation: majorOp,
|
|
TransactionID: tid,
|
|
}.MaybeBuild()
|
|
// [*] Require less event joining work by providing info that
|
|
// makes this event alone actionable for OONI
|
|
event := &modelx.HTTPRoundTripDoneEvent{
|
|
DurationSinceBeginning: time.Since(root.Beginning),
|
|
Error: err,
|
|
RequestBodySnap: requestBody,
|
|
RequestHeaders: requestHeaders, // [*]
|
|
RequestMethod: req.Method, // [*]
|
|
RequestURL: req.URL.String(), // [*]
|
|
MaxBodySnapSize: snapSize,
|
|
TransactionID: tid,
|
|
}
|
|
if resp != nil {
|
|
event.ResponseHeaders = resp.Header
|
|
event.ResponseStatusCode = int64(resp.StatusCode)
|
|
event.ResponseProto = resp.Proto
|
|
// Save a snapshot of the response body
|
|
var data []byte
|
|
data, err = readSnap(req.Context(), &resp.Body, snapSize, t.readAllContext)
|
|
if err != nil {
|
|
t.readAllErrs.Add(1)
|
|
resp = nil // this is how net/http likes it
|
|
} else {
|
|
event.ResponseBodySnap = data
|
|
}
|
|
}
|
|
root.Handler.OnMeasurement(modelx.Measurement{
|
|
HTTPRoundTripDone: event,
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
// CloseIdleConnections closes the idle connections.
|
|
func (t *TraceTripper) CloseIdleConnections() {
|
|
// Adapted from net/http code
|
|
type closeIdler interface {
|
|
CloseIdleConnections()
|
|
}
|
|
if tr, ok := t.roundTripper.(closeIdler); ok {
|
|
tr.CloseIdleConnections()
|
|
}
|
|
}
|