c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(netxlite): more abstract proxy-enabled dialer construction (#812)

Browse source 
This will help with https://github.com/ooni/probe/issues/2135
This commit is contained in:
Simone Basso 2022-06-08 23:10:06 +02:00 • committed by GitHub
commit 1a706e47bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

42
internal/netxlite/maybeproxy_test.go
View file

@ -12,28 +12,34 @@ import (
)
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("MaybeWrapWithProxyDialer", func(t *testing.T) {
t.Run("without a proxy URL", func(t *testing.T) {
underlying := &mocks.Dialer{}
dialer := MaybeWrapWithProxyDialer(underlying, nil)
if dialer != underlying {
t.Fatal("should not have wrapped")
}
})
t.Run("with a proxy URL", func(t *testing.T) {
URL := &url.URL{}
underlying := &mocks.Dialer{}
dialer := MaybeWrapWithProxyDialer(underlying, URL)
real := dialer.(*proxyDialer)
if real.Dialer != underlying {
t.Fatal("did not wrap correctly")
}
if real.ProxyURL != URL {
t.Fatal("invalid URL")
}
})
})
t.Run("DialContext", func(t *testing.T) {
t.Run("invalid scheme", func(t *testing.T) {
child := &mocks.Dialer{}
URL := &url.URL{Scheme: "antani"}
d := NewMaybeProxyDialer(child, URL)
d := MaybeWrapWithProxyDialer(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")
@ -45,7 +51,7 @@ func TestMaybeProxyDialer(t *testing.T) {
t.Run("underlying dial fails with EOF", func(t *testing.T) {
const expect = "10.0.0.1:9050"
d := &MaybeProxyDialer{
d := &proxyDialer{
Dialer: &mocks.Dialer{
MockDialContext: func(ctx context.Context, network string, address string) (net.Conn, error) {
if address != expect {
@ -77,7 +83,7 @@ func TestMaybeProxyDialer(t *testing.T) {
},
}
URL := &url.URL{}
dialer := NewMaybeProxyDialer(child, URL)
dialer := MaybeWrapWithProxyDialer(child, URL)
dialer.CloseIdleConnections()
if !called {
t.Fatal("not called")