a3654f60b7
We would like to refactor the code so that a DoH resolver owns the connections of its underlying HTTP client. To do that, we need first to incorporate CloseIdleConnections into the Resolver model. Then, we need to add the same function to all netxlite types that wrap a Resolver type. At the same time, we want the rest of the code for now to continue with the simpler definition of a Resolver, now called ResolverLegacy. We will eventually propagate this change to the rest of the tree and simplify the way in which we manage Resolvers. To make this possible, we introduce a new factory function that adapts a ResolverLegacy to become a Resolver. See https://github.com/ooni/probe/issues/1591.
151 lines
3.5 KiB
Go
151 lines
3.5 KiB
Go
package netxlite
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/atomicx"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/mocks"
|
|
)
|
|
|
|
func TestHTTPTransportLoggerFailure(t *testing.T) {
|
|
txp := &httpTransportLogger{
|
|
Logger: log.Log,
|
|
HTTPTransport: &mocks.HTTPTransport{
|
|
MockRoundTrip: func(req *http.Request) (*http.Response, error) {
|
|
return nil, io.EOF
|
|
},
|
|
},
|
|
}
|
|
client := &http.Client{Transport: txp}
|
|
resp, err := client.Get("https://www.google.com")
|
|
if !errors.Is(err, io.EOF) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if resp != nil {
|
|
t.Fatal("expected nil response here")
|
|
}
|
|
}
|
|
|
|
func TestHTTPTransportLoggerFailureWithNoHostHeader(t *testing.T) {
|
|
foundHost := &atomicx.Int64{}
|
|
txp := &httpTransportLogger{
|
|
Logger: log.Log,
|
|
HTTPTransport: &mocks.HTTPTransport{
|
|
MockRoundTrip: func(req *http.Request) (*http.Response, error) {
|
|
if req.Header.Get("Host") == "www.google.com" {
|
|
foundHost.Add(1)
|
|
}
|
|
return nil, io.EOF
|
|
},
|
|
},
|
|
}
|
|
req := &http.Request{
|
|
Header: http.Header{},
|
|
URL: &url.URL{
|
|
Scheme: "https",
|
|
Host: "www.google.com",
|
|
Path: "/",
|
|
},
|
|
}
|
|
resp, err := txp.RoundTrip(req)
|
|
if !errors.Is(err, io.EOF) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if resp != nil {
|
|
t.Fatal("expected nil response here")
|
|
}
|
|
if foundHost.Load() != 1 {
|
|
t.Fatal("host header was not added")
|
|
}
|
|
}
|
|
|
|
func TestHTTPTransportLoggerSuccess(t *testing.T) {
|
|
txp := &httpTransportLogger{
|
|
Logger: log.Log,
|
|
HTTPTransport: &mocks.HTTPTransport{
|
|
MockRoundTrip: func(req *http.Request) (*http.Response, error) {
|
|
return &http.Response{
|
|
Body: io.NopCloser(strings.NewReader("")),
|
|
Header: http.Header{
|
|
"Server": []string{"antani/0.1.0"},
|
|
},
|
|
StatusCode: 200,
|
|
}, nil
|
|
},
|
|
},
|
|
}
|
|
client := &http.Client{Transport: txp}
|
|
resp, err := client.Get("https://www.google.com")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
iox.ReadAllContext(context.Background(), resp.Body)
|
|
resp.Body.Close()
|
|
}
|
|
|
|
func TestHTTPTransportLoggerCloseIdleConnections(t *testing.T) {
|
|
calls := &atomicx.Int64{}
|
|
txp := &httpTransportLogger{
|
|
HTTPTransport: &mocks.HTTPTransport{
|
|
MockCloseIdleConnections: func() {
|
|
calls.Add(1)
|
|
},
|
|
},
|
|
Logger: log.Log,
|
|
}
|
|
txp.CloseIdleConnections()
|
|
if calls.Load() != 1 {
|
|
t.Fatal("not called")
|
|
}
|
|
}
|
|
|
|
func TestHTTPTransportWorks(t *testing.T) {
|
|
d := &dialerResolver{
|
|
Dialer: defaultDialer,
|
|
Resolver: NewResolver(&ResolverConfig{Logger: log.Log}),
|
|
}
|
|
th := &tlsHandshakerConfigurable{}
|
|
txp := NewHTTPTransport(d, &tls.Config{}, th)
|
|
client := &http.Client{Transport: txp}
|
|
resp, err := client.Get("https://www.google.com/robots.txt")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
resp.Body.Close()
|
|
txp.CloseIdleConnections()
|
|
}
|
|
|
|
func TestHTTPTransportWithFailingDialer(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
d := &dialerResolver{
|
|
Dialer: &mocks.Dialer{
|
|
MockDialContext: func(ctx context.Context,
|
|
network, address string) (net.Conn, error) {
|
|
return nil, expected
|
|
},
|
|
},
|
|
Resolver: NewResolver(&ResolverConfig{Logger: log.Log}),
|
|
}
|
|
th := &tlsHandshakerConfigurable{}
|
|
txp := NewHTTPTransport(d, &tls.Config{}, th)
|
|
client := &http.Client{Transport: txp}
|
|
resp, err := client.Get("https://www.google.com/robots.txt")
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if resp != nil {
|
|
t.Fatal("expected non-nil response here")
|
|
}
|
|
txp.CloseIdleConnections()
|
|
}
|