2e0118d1a6
## Description This PR continues the refactoring of `netx` under the following principles: 1. do not break the rest of the tree and do not engage in extensive tree-wide refactoring yet 2. move under `netxlite` clearly related subpackages (e.g., `iox`, `netxmocks`) 3. move into `internal/netxlite/internal` stuff that is clearly private of `netxlite` 4. hide implementation details in `netxlite` pending new factories 5. refactor `tls` code in `netxlite` to clearly separate `crypto/tls` code from `utls` code After each commit, I run `go test -short -race ./...` locally. Each individual commit explains what it does. I will squash, but this operation will preserve the original commit titles, so this will give further insight on each step. ## Commits * refactor: rename netxmocks -> netxlite/mocks Part of https://github.com/ooni/probe/issues/1591 * refactor: rename quicx -> netxlite/quicx See https://github.com/ooni/probe/issues/1591 * refactor: rename iox -> netxlite/iox Regenerate sources and make sure the tests pass. See https://github.com/ooni/probe/issues/1591. * refactor(iox): move MockableReader to netxlite/mocks See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): generator is an implementation detail See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): separate tls and utls code See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): hide most types but keep old names as legacy With this change we avoid breaking the rest of the tree, but we start hiding some implementation details a bit. Factories will follow. See https://github.com/ooni/probe/issues/1591
103 lines
2.0 KiB
Go
103 lines
2.0 KiB
Go
package internal
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"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/netxlite/iox"
|
|
)
|
|
|
|
type FakeResolver struct {
|
|
NumFailures *atomicx.Int64
|
|
Err error
|
|
Result []string
|
|
}
|
|
|
|
func NewFakeResolverThatFails() FakeResolver {
|
|
return FakeResolver{NumFailures: &atomicx.Int64{}, Err: ErrNotFound}
|
|
}
|
|
|
|
func NewFakeResolverWithResult(r []string) FakeResolver {
|
|
return FakeResolver{NumFailures: &atomicx.Int64{}, Result: r}
|
|
}
|
|
|
|
var ErrNotFound = &net.DNSError{
|
|
Err: "no such host",
|
|
}
|
|
|
|
func (c FakeResolver) LookupHost(ctx context.Context, hostname string) ([]string, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
if c.Err != nil {
|
|
if c.NumFailures != nil {
|
|
c.NumFailures.Add(1)
|
|
}
|
|
return nil, c.Err
|
|
}
|
|
return c.Result, nil
|
|
}
|
|
|
|
func (c FakeResolver) Network() string {
|
|
return "fake"
|
|
}
|
|
|
|
func (c FakeResolver) Address() string {
|
|
return ""
|
|
}
|
|
|
|
var _ netx.Resolver = FakeResolver{}
|
|
|
|
type FakeTransport struct {
|
|
Err error
|
|
Func func(*http.Request) (*http.Response, error)
|
|
Resp *http.Response
|
|
}
|
|
|
|
func (txp FakeTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
if txp.Func != nil {
|
|
return txp.Func(req)
|
|
}
|
|
if req.Body != nil {
|
|
iox.ReadAllContext(req.Context(), req.Body)
|
|
req.Body.Close()
|
|
}
|
|
if txp.Err != nil {
|
|
return nil, txp.Err
|
|
}
|
|
txp.Resp.Request = req // non thread safe but it doesn't matter
|
|
return txp.Resp, nil
|
|
}
|
|
|
|
func (txp FakeTransport) CloseIdleConnections() {}
|
|
|
|
var _ netx.HTTPRoundTripper = FakeTransport{}
|
|
|
|
type FakeBody struct {
|
|
Data []byte
|
|
Err error
|
|
}
|
|
|
|
func (fb *FakeBody) Read(p []byte) (int, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
if fb.Err != nil {
|
|
return 0, fb.Err
|
|
}
|
|
if len(fb.Data) <= 0 {
|
|
return 0, io.EOF
|
|
}
|
|
n := copy(p, fb.Data)
|
|
fb.Data = fb.Data[n:]
|
|
return n, nil
|
|
}
|
|
|
|
func (fb *FakeBody) Close() error {
|
|
return nil
|
|
}
|
|
|
|
var _ io.ReadCloser = &FakeBody{}
|