feat: reintroduce the tproxy functionality (#975)
We originally removed the TProxy in https://github.com/ooni/probe/issues/2224. Nevertheless, in https://github.com/ooni/probe-cli/pull/969, we determined that something like the previous TProxy, with small changes, was required to support https://github.com/ooni/probe/issues/2340. So, this pull request reintroduces a slightly-modified TProxy functionality that better adapts to the `--remote=REMOTE` use case.
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
package mocks
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net"
|
||||
"time"
|
||||
|
||||
"github.com/ooni/probe-cli/v3/internal/model"
|
||||
)
|
||||
|
||||
// UnderlyingNetwork allows mocking model.UnderlyingNetwork.
|
||||
type UnderlyingNetwork struct {
|
||||
MockDialContext func(ctx context.Context, timeout time.Duration, network, address string) (net.Conn, error)
|
||||
|
||||
MockListenUDP func(network string, addr *net.UDPAddr) (model.UDPLikeConn, error)
|
||||
|
||||
MockGetaddrinfoLookupANY func(ctx context.Context, domain string) ([]string, string, error)
|
||||
|
||||
MockGetaddrinfoResolverNetwork func() string
|
||||
}
|
||||
|
||||
var _ model.UnderlyingNetwork = &UnderlyingNetwork{}
|
||||
|
||||
func (un *UnderlyingNetwork) DialContext(ctx context.Context, timeout time.Duration, network, address string) (net.Conn, error) {
|
||||
return un.MockDialContext(ctx, timeout, network, address)
|
||||
}
|
||||
|
||||
func (un *UnderlyingNetwork) ListenUDP(network string, addr *net.UDPAddr) (model.UDPLikeConn, error) {
|
||||
return un.MockListenUDP(network, addr)
|
||||
}
|
||||
|
||||
func (un *UnderlyingNetwork) GetaddrinfoLookupANY(ctx context.Context, domain string) ([]string, string, error) {
|
||||
return un.MockGetaddrinfoLookupANY(ctx, domain)
|
||||
}
|
||||
|
||||
func (un *UnderlyingNetwork) GetaddrinfoResolverNetwork() string {
|
||||
return un.MockGetaddrinfoResolverNetwork()
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
package mocks
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"net"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/ooni/probe-cli/v3/internal/model"
|
||||
)
|
||||
|
||||
func TestUnderlyingNetwork(t *testing.T) {
|
||||
t.Run("DialContext", func(t *testing.T) {
|
||||
expect := errors.New("mocked error")
|
||||
un := &UnderlyingNetwork{
|
||||
MockDialContext: func(ctx context.Context, timeout time.Duration, network, address string) (net.Conn, error) {
|
||||
return nil, expect
|
||||
},
|
||||
}
|
||||
ctx := context.Background()
|
||||
conn, err := un.DialContext(ctx, time.Second, "tcp", "1.1.1.1:443")
|
||||
if !errors.Is(err, expect) {
|
||||
t.Fatal("unexpected err", err)
|
||||
}
|
||||
if conn != nil {
|
||||
t.Fatal("expected nil conn")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("ListenUDP", func(t *testing.T) {
|
||||
expect := errors.New("mocked error")
|
||||
un := &UnderlyingNetwork{
|
||||
MockListenUDP: func(network string, addr *net.UDPAddr) (model.UDPLikeConn, error) {
|
||||
return nil, expect
|
||||
},
|
||||
}
|
||||
pconn, err := un.ListenUDP("udp", &net.UDPAddr{})
|
||||
if !errors.Is(err, expect) {
|
||||
t.Fatal("unexpected err", err)
|
||||
}
|
||||
if pconn != nil {
|
||||
t.Fatal("expected nil conn")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("GetaddrinfoLookupANY", func(t *testing.T) {
|
||||
expect := errors.New("mocked error")
|
||||
un := &UnderlyingNetwork{
|
||||
MockGetaddrinfoLookupANY: func(ctx context.Context, domain string) ([]string, string, error) {
|
||||
return nil, "", expect
|
||||
},
|
||||
}
|
||||
ctx := context.Background()
|
||||
addrs, cname, err := un.GetaddrinfoLookupANY(ctx, "dns.google")
|
||||
if !errors.Is(err, expect) {
|
||||
t.Fatal("unexpected err", err)
|
||||
}
|
||||
if len(addrs) != 0 {
|
||||
t.Fatal("expected zero length addrs")
|
||||
}
|
||||
if cname != "" {
|
||||
t.Fatal("expected empty name")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("GetaddrinfoResolverNetwork", func(t *testing.T) {
|
||||
expect := "antani"
|
||||
un := &UnderlyingNetwork{
|
||||
MockGetaddrinfoResolverNetwork: func() string {
|
||||
return expect
|
||||
},
|
||||
}
|
||||
got := un.GetaddrinfoResolverNetwork()
|
||||
if got != expect {
|
||||
t.Fatal("unexpected resolver network")
|
||||
}
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user