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
156 lines
3.6 KiB
Go
156 lines
3.6 KiB
Go
package errorsx
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/lucas-clemente/quic-go"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/mocks"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/quicx"
|
|
)
|
|
|
|
func TestErrorWrapperQUICListenerSuccess(t *testing.T) {
|
|
ql := &ErrorWrapperQUICListener{
|
|
QUICListener: &mocks.QUICListener{
|
|
MockListen: func(addr *net.UDPAddr) (quicx.UDPLikeConn, error) {
|
|
return &net.UDPConn{}, nil
|
|
},
|
|
},
|
|
}
|
|
pconn, err := ql.Listen(&net.UDPAddr{})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
pconn.Close()
|
|
}
|
|
|
|
func TestErrorWrapperQUICListenerFailure(t *testing.T) {
|
|
ql := &ErrorWrapperQUICListener{
|
|
QUICListener: &mocks.QUICListener{
|
|
MockListen: func(addr *net.UDPAddr) (quicx.UDPLikeConn, error) {
|
|
return nil, io.EOF
|
|
},
|
|
},
|
|
}
|
|
pconn, err := ql.Listen(&net.UDPAddr{})
|
|
if err.Error() != "eof_error" {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if pconn != nil {
|
|
t.Fatal("expected nil pconn here")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperUDPConnWriteToSuccess(t *testing.T) {
|
|
quc := &errorWrapperUDPConn{
|
|
UDPLikeConn: &mocks.QUICUDPConn{
|
|
MockWriteTo: func(p []byte, addr net.Addr) (int, error) {
|
|
return 10, nil
|
|
},
|
|
},
|
|
}
|
|
pkt := make([]byte, 128)
|
|
addr := &net.UDPAddr{}
|
|
cnt, err := quc.WriteTo(pkt, addr)
|
|
if err != nil {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if cnt != 10 {
|
|
t.Fatal("expected 10 here")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperUDPConnWriteToFailure(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
quc := &errorWrapperUDPConn{
|
|
UDPLikeConn: &mocks.QUICUDPConn{
|
|
MockWriteTo: func(p []byte, addr net.Addr) (int, error) {
|
|
return 0, expected
|
|
},
|
|
},
|
|
}
|
|
pkt := make([]byte, 128)
|
|
addr := &net.UDPAddr{}
|
|
cnt, err := quc.WriteTo(pkt, addr)
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if cnt != 0 {
|
|
t.Fatal("expected 0 here")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperUDPConnReadFromSuccess(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
quc := &errorWrapperUDPConn{
|
|
UDPLikeConn: &mocks.QUICUDPConn{
|
|
MockReadFrom: func(b []byte) (int, net.Addr, error) {
|
|
return 0, nil, expected
|
|
},
|
|
},
|
|
}
|
|
b := make([]byte, 128)
|
|
n, addr, err := quc.ReadFrom(b)
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if n != 0 {
|
|
t.Fatal("expected 0 here")
|
|
}
|
|
if addr != nil {
|
|
t.Fatal("expected nil here")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperUDPConnReadFromFailure(t *testing.T) {
|
|
quc := &errorWrapperUDPConn{
|
|
UDPLikeConn: &mocks.QUICUDPConn{
|
|
MockReadFrom: func(b []byte) (int, net.Addr, error) {
|
|
return 10, nil, nil
|
|
},
|
|
},
|
|
}
|
|
b := make([]byte, 128)
|
|
n, addr, err := quc.ReadFrom(b)
|
|
if err != nil {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if n != 10 {
|
|
t.Fatal("expected 10 here")
|
|
}
|
|
if addr != nil {
|
|
t.Fatal("expected nil here")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperQUICDialerFailure(t *testing.T) {
|
|
ctx := context.Background()
|
|
d := &ErrorWrapperQUICDialer{Dialer: &mocks.QUICContextDialer{
|
|
MockDialContext: func(ctx context.Context, network, address string, tlsConfig *tls.Config, quicConfig *quic.Config) (quic.EarlySession, error) {
|
|
return nil, io.EOF
|
|
},
|
|
}}
|
|
sess, err := d.DialContext(
|
|
ctx, "udp", "www.google.com:443", &tls.Config{}, &quic.Config{})
|
|
if sess != nil {
|
|
t.Fatal("expected a nil sess here")
|
|
}
|
|
if !errors.Is(err, io.EOF) {
|
|
t.Fatal("expected another error here")
|
|
}
|
|
var errWrapper *ErrWrapper
|
|
if !errors.As(err, &errWrapper) {
|
|
t.Fatal("cannot cast to ErrWrapper")
|
|
}
|
|
if errWrapper.Operation != QUICHandshakeOperation {
|
|
t.Fatal("unexpected Operation")
|
|
}
|
|
if errWrapper.Failure != FailureEOFError {
|
|
t.Fatal("unexpected failure")
|
|
}
|
|
}
|