314c3c934d
This diff replaces engine/netx code with netxlite code in the engine/session.go file. To this end, we needed to move some code from engine/netx to netxlite. While there, we did review and improve the unit tests. A notable change in this diff is (or seems to be) that in engine/session.go we're not filtering for bogons anymore so that, in principle, we could believe a resolver returning to us bogon IP addresses for OONI services. However, I did not bother with changing bogons filtering because the sessionresolver package is already filtering for bogons, so it is actually okay to avoid doing that again the session.go code. See: https://github.com/ooni/probe-cli/blob/v3.15.0-alpha.1/internal/engine/internal/sessionresolver/resolvermaker.go#L88 There are two reference issues for this cleanup: 1. https://github.com/ooni/probe/issues/2115 2. https://github.com/ooni/probe/issues/2121
105 lines
2.5 KiB
Go
105 lines
2.5 KiB
Go
package netxlite
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
"net/url"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model/mocks"
|
|
)
|
|
|
|
func TestMaybeProxyDialer(t *testing.T) {
|
|
t.Run("DialContext", func(t *testing.T) {
|
|
t.Run("missing proxy URL", func(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
d := &MaybeProxyDialer{
|
|
Dialer: &mocks.Dialer{MockDialContext: func(ctx context.Context, network string, address string) (net.Conn, error) {
|
|
return nil, expected
|
|
}},
|
|
ProxyURL: nil,
|
|
}
|
|
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")
|
|
}
|
|
})
|
|
|
|
t.Run("invalid scheme", func(t *testing.T) {
|
|
child := &mocks.Dialer{}
|
|
URL := &url.URL{Scheme: "antani"}
|
|
d := NewMaybeProxyDialer(child, URL)
|
|
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")
|
|
}
|
|
})
|
|
|
|
t.Run("underlying dial fails with EOF", func(t *testing.T) {
|
|
const expect = "10.0.0.1:9050"
|
|
d := &MaybeProxyDialer{
|
|
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")
|
|
}
|
|
})
|
|
})
|
|
|
|
t.Run("CloseIdleConnections", func(t *testing.T) {
|
|
var called bool
|
|
child := &mocks.Dialer{
|
|
MockCloseIdleConnections: func() {
|
|
called = true
|
|
},
|
|
}
|
|
URL := &url.URL{}
|
|
dialer := NewMaybeProxyDialer(child, URL)
|
|
dialer.CloseIdleConnections()
|
|
if !called {
|
|
t.Fatal("not called")
|
|
}
|
|
})
|
|
|
|
t.Run("proxyDialerWrapper", func(t *testing.T) {
|
|
t.Run("Dial panics", func(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)
|
|
}
|
|
})
|
|
})
|
|
}
|