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
82 lines
1.9 KiB
Go
82 lines
1.9 KiB
Go
package dialer
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
"net/url"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/mocks"
|
|
)
|
|
|
|
func TestProxyDialerDialContextNoProxyURL(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
d := &proxyDialer{
|
|
Dialer: &mocks.Dialer{
|
|
MockDialContext: func(ctx context.Context, network string, address string) (net.Conn, error) {
|
|
return nil, expected
|
|
},
|
|
},
|
|
}
|
|
conn, err := d.DialContext(context.Background(), "tcp", "www.google.com:443")
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal(err)
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("conn is not nil")
|
|
}
|
|
}
|
|
|
|
func TestProxyDialerDialContextInvalidScheme(t *testing.T) {
|
|
d := &proxyDialer{
|
|
ProxyURL: &url.URL{Scheme: "antani"},
|
|
}
|
|
conn, err := d.DialContext(context.Background(), "tcp", "www.google.com:443")
|
|
if !errors.Is(err, ErrProxyUnsupportedScheme) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("conn is not nil")
|
|
}
|
|
}
|
|
|
|
func TestProxyDialerDialContextWithEOF(t *testing.T) {
|
|
const expect = "10.0.0.1:9050"
|
|
d := &proxyDialer{
|
|
Dialer: &mocks.Dialer{
|
|
MockDialContext: func(ctx context.Context, network string, address string) (net.Conn, error) {
|
|
if address != expect {
|
|
return nil, errors.New("unexpected address")
|
|
}
|
|
return nil, io.EOF
|
|
},
|
|
},
|
|
ProxyURL: &url.URL{Scheme: "socks5", Host: expect},
|
|
}
|
|
conn, err := d.DialContext(context.Background(), "tcp", "www.google.com:443")
|
|
if !errors.Is(err, io.EOF) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("conn is not nil")
|
|
}
|
|
}
|
|
|
|
func TestProxyDialWrapperPanics(t *testing.T) {
|
|
d := &proxyDialerWrapper{}
|
|
err := func() (rv error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
rv = r.(error)
|
|
}
|
|
}()
|
|
d.Dial("tcp", "10.0.0.1:1234")
|
|
return
|
|
}()
|
|
if err.Error() != "proxyDialerWrapper.Dial should not be called directly" {
|
|
t.Fatal("unexpected result", err)
|
|
}
|
|
}
|