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
77 lines
1.6 KiB
Go
77 lines
1.6 KiB
Go
package uncensored
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"net/http"
|
|
"net/url"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
|
)
|
|
|
|
func TestGood(t *testing.T) {
|
|
client, err := NewClient("dot://1.1.1.1:853")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer client.CloseIdleConnections()
|
|
if client.Address() != "1.1.1.1:853" {
|
|
t.Fatal("invalid address")
|
|
}
|
|
if client.Network() != "dot" {
|
|
t.Fatal("invalid network")
|
|
}
|
|
ctx := context.Background()
|
|
addrs, err := client.LookupHost(ctx, "dns.google")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
var quad8, two8two4 bool
|
|
for _, addr := range addrs {
|
|
quad8 = quad8 || (addr == "8.8.8.8")
|
|
two8two4 = two8two4 || (addr == "8.8.4.4")
|
|
}
|
|
if quad8 != true && two8two4 != true {
|
|
t.Fatal("invalid response")
|
|
}
|
|
conn, err := client.DialContext(ctx, "tcp", "8.8.8.8:853")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer conn.Close()
|
|
resp, err := client.RoundTrip(&http.Request{
|
|
Method: "GET",
|
|
URL: &url.URL{
|
|
Scheme: "https",
|
|
Host: "www.google.com",
|
|
Path: "/humans.txt",
|
|
},
|
|
Header: http.Header{},
|
|
})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != 200 {
|
|
t.Fatal("invalid status-code")
|
|
}
|
|
data, err := iox.ReadAllContext(context.Background(), resp.Body)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !bytes.HasPrefix(data, []byte("Google is built by a large team")) {
|
|
t.Fatal("not the expected body")
|
|
}
|
|
}
|
|
|
|
func TestNewClientFailure(t *testing.T) {
|
|
clnt, err := NewClient("antani:///")
|
|
if err == nil {
|
|
t.Fatal("expected an error here")
|
|
}
|
|
if clnt != nil {
|
|
t.Fatal("expected nil client here")
|
|
}
|
|
}
|