refactor: start pivoting netx (#396)
What do I mean by pivoting? Netx is currently organized by row:
```
| dialer | quicdialer | resolver | ...
saving | | | | ...
errorwrapping | | | | ...
logging | | | | ...
mocking/sys | | | | ...
```
Every row needs to implement saving, errorwrapping, logging, mocking (or
adapting to the system or to some underlying library).
This causes cross package dependencies and, in turn, complexity. For
example, we need the `trace` package for supporting saving.
And `dialer`, `quickdialer`, et al. need to depend on such a package.
The same goes for errorwrapping.
This arrangement further complicates testing. For example, I am
currently working on https://github.com/ooni/probe/issues/1505 and
I realize it need to repeat integration tests in multiple places.
Let's say instead we pivot the above matrix as follows:
```
| saving | errorwrapping | logging | ...
dialer | | | | ...
quicdialer | | | | ...
logging | | | | ...
mocking/sys | | | | ...
...
```
In this way, now every row contains everything related to a specific
action to perform. We can now share code without relying on extra
support packages. What's more, we can write tests and, judding from
the way in which things are made, it seems we only need integration
testing in `errorwrapping` because it's where data quality matters
whereas, in all other cases, unit testing is fine.
I am going, therefore, to proceed with these changes and "pivot"
`netx`. Hopefully, it won't be too painful.
2021-06-23 15:53:12 +02:00
|
|
|
package netxlite
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2021-06-23 17:00:44 +02:00
|
|
|
"errors"
|
2021-09-07 19:56:42 +02:00
|
|
|
"io"
|
2021-08-17 11:02:12 +02:00
|
|
|
"strings"
|
2021-09-05 18:50:05 +02:00
|
|
|
"sync"
|
refactor: start pivoting netx (#396)
What do I mean by pivoting? Netx is currently organized by row:
```
| dialer | quicdialer | resolver | ...
saving | | | | ...
errorwrapping | | | | ...
logging | | | | ...
mocking/sys | | | | ...
```
Every row needs to implement saving, errorwrapping, logging, mocking (or
adapting to the system or to some underlying library).
This causes cross package dependencies and, in turn, complexity. For
example, we need the `trace` package for supporting saving.
And `dialer`, `quickdialer`, et al. need to depend on such a package.
The same goes for errorwrapping.
This arrangement further complicates testing. For example, I am
currently working on https://github.com/ooni/probe/issues/1505 and
I realize it need to repeat integration tests in multiple places.
Let's say instead we pivot the above matrix as follows:
```
| saving | errorwrapping | logging | ...
dialer | | | | ...
quicdialer | | | | ...
logging | | | | ...
mocking/sys | | | | ...
...
```
In this way, now every row contains everything related to a specific
action to perform. We can now share code without relying on extra
support packages. What's more, we can write tests and, judding from
the way in which things are made, it seems we only need integration
testing in `errorwrapping` because it's where data quality matters
whereas, in all other cases, unit testing is fine.
I am going, therefore, to proceed with these changes and "pivot"
`netx`. Hopefully, it won't be too painful.
2021-06-23 15:53:12 +02:00
|
|
|
"testing"
|
2021-09-05 18:50:05 +02:00
|
|
|
"time"
|
refactor: start pivoting netx (#396)
What do I mean by pivoting? Netx is currently organized by row:
```
| dialer | quicdialer | resolver | ...
saving | | | | ...
errorwrapping | | | | ...
logging | | | | ...
mocking/sys | | | | ...
```
Every row needs to implement saving, errorwrapping, logging, mocking (or
adapting to the system or to some underlying library).
This causes cross package dependencies and, in turn, complexity. For
example, we need the `trace` package for supporting saving.
And `dialer`, `quickdialer`, et al. need to depend on such a package.
The same goes for errorwrapping.
This arrangement further complicates testing. For example, I am
currently working on https://github.com/ooni/probe/issues/1505 and
I realize it need to repeat integration tests in multiple places.
Let's say instead we pivot the above matrix as follows:
```
| saving | errorwrapping | logging | ...
dialer | | | | ...
quicdialer | | | | ...
logging | | | | ...
mocking/sys | | | | ...
...
```
In this way, now every row contains everything related to a specific
action to perform. We can now share code without relying on extra
support packages. What's more, we can write tests and, judding from
the way in which things are made, it seems we only need integration
testing in `errorwrapping` because it's where data quality matters
whereas, in all other cases, unit testing is fine.
I am going, therefore, to proceed with these changes and "pivot"
`netx`. Hopefully, it won't be too painful.
2021-06-23 15:53:12 +02:00
|
|
|
|
|
|
|
"github.com/apex/log"
|
2021-06-23 17:00:44 +02:00
|
|
|
"github.com/google/go-cmp/cmp"
|
2021-09-07 19:56:42 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/errorsx"
|
2021-09-05 14:49:38 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/mocks"
|
refactor: start pivoting netx (#396)
What do I mean by pivoting? Netx is currently organized by row:
```
| dialer | quicdialer | resolver | ...
saving | | | | ...
errorwrapping | | | | ...
logging | | | | ...
mocking/sys | | | | ...
```
Every row needs to implement saving, errorwrapping, logging, mocking (or
adapting to the system or to some underlying library).
This causes cross package dependencies and, in turn, complexity. For
example, we need the `trace` package for supporting saving.
And `dialer`, `quickdialer`, et al. need to depend on such a package.
The same goes for errorwrapping.
This arrangement further complicates testing. For example, I am
currently working on https://github.com/ooni/probe/issues/1505 and
I realize it need to repeat integration tests in multiple places.
Let's say instead we pivot the above matrix as follows:
```
| saving | errorwrapping | logging | ...
dialer | | | | ...
quicdialer | | | | ...
logging | | | | ...
mocking/sys | | | | ...
...
```
In this way, now every row contains everything related to a specific
action to perform. We can now share code without relying on extra
support packages. What's more, we can write tests and, judding from
the way in which things are made, it seems we only need integration
testing in `errorwrapping` because it's where data quality matters
whereas, in all other cases, unit testing is fine.
I am going, therefore, to proceed with these changes and "pivot"
`netx`. Hopefully, it won't be too painful.
2021-06-23 15:53:12 +02:00
|
|
|
)
|
|
|
|
|
2021-09-08 22:48:10 +02:00
|
|
|
func TestNewResolverSystem(t *testing.T) {
|
2021-09-09 01:19:17 +02:00
|
|
|
resolver := NewResolverStdlib(log.Log)
|
2021-09-08 22:48:10 +02:00
|
|
|
idna := resolver.(*resolverIDNA)
|
|
|
|
logger := idna.Resolver.(*resolverLogger)
|
|
|
|
if logger.Logger != log.Log {
|
|
|
|
t.Fatal("invalid logger")
|
|
|
|
}
|
|
|
|
shortCircuit := logger.Resolver.(*resolverShortCircuitIPAddr)
|
|
|
|
errWrapper := shortCircuit.Resolver.(*resolverErrWrapper)
|
|
|
|
_ = errWrapper.Resolver.(*resolverSystem)
|
|
|
|
}
|
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
func TestResolverSystem(t *testing.T) {
|
|
|
|
t.Run("Network and Address", func(t *testing.T) {
|
|
|
|
r := &resolverSystem{}
|
|
|
|
if r.Network() != "system" {
|
|
|
|
t.Fatal("invalid Network")
|
|
|
|
}
|
|
|
|
if r.Address() != "" {
|
|
|
|
t.Fatal("invalid Address")
|
|
|
|
}
|
|
|
|
})
|
2021-06-23 17:00:44 +02:00
|
|
|
|
2021-09-08 22:48:10 +02:00
|
|
|
t.Run("CloseIdleConnections", func(t *testing.T) {
|
2021-09-08 11:39:27 +02:00
|
|
|
r := &resolverSystem{}
|
2021-09-08 22:48:10 +02:00
|
|
|
r.CloseIdleConnections() // to cover it
|
2021-09-08 11:39:27 +02:00
|
|
|
})
|
refactor: start pivoting netx (#396)
What do I mean by pivoting? Netx is currently organized by row:
```
| dialer | quicdialer | resolver | ...
saving | | | | ...
errorwrapping | | | | ...
logging | | | | ...
mocking/sys | | | | ...
```
Every row needs to implement saving, errorwrapping, logging, mocking (or
adapting to the system or to some underlying library).
This causes cross package dependencies and, in turn, complexity. For
example, we need the `trace` package for supporting saving.
And `dialer`, `quickdialer`, et al. need to depend on such a package.
The same goes for errorwrapping.
This arrangement further complicates testing. For example, I am
currently working on https://github.com/ooni/probe/issues/1505 and
I realize it need to repeat integration tests in multiple places.
Let's say instead we pivot the above matrix as follows:
```
| saving | errorwrapping | logging | ...
dialer | | | | ...
quicdialer | | | | ...
logging | | | | ...
mocking/sys | | | | ...
...
```
In this way, now every row contains everything related to a specific
action to perform. We can now share code without relying on extra
support packages. What's more, we can write tests and, judding from
the way in which things are made, it seems we only need integration
testing in `errorwrapping` because it's where data quality matters
whereas, in all other cases, unit testing is fine.
I am going, therefore, to proceed with these changes and "pivot"
`netx`. Hopefully, it won't be too painful.
2021-06-23 15:53:12 +02:00
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
t.Run("check default timeout", func(t *testing.T) {
|
|
|
|
r := &resolverSystem{}
|
|
|
|
if r.timeout() != 15*time.Second {
|
|
|
|
t.Fatal("unexpected default timeout")
|
|
|
|
}
|
|
|
|
})
|
2021-09-05 18:50:05 +02:00
|
|
|
|
2021-09-08 22:48:10 +02:00
|
|
|
t.Run("check default lookup host func not nil", func(t *testing.T) {
|
|
|
|
r := &resolverSystem{}
|
|
|
|
if r.lookupHost() == nil {
|
|
|
|
t.Fatal("expected non-nil func here")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
t.Run("LookupHost", func(t *testing.T) {
|
2021-09-08 22:48:10 +02:00
|
|
|
t.Run("with success", func(t *testing.T) {
|
|
|
|
r := &resolverSystem{
|
|
|
|
testableLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
return []string{"8.8.8.8"}, nil
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := r.LookupHost(ctx, "example.antani")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if len(addrs) != 1 || addrs[0] != "8.8.8.8" {
|
|
|
|
t.Fatal("invalid addrs")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
t.Run("with timeout and success", func(t *testing.T) {
|
|
|
|
wg := &sync.WaitGroup{}
|
|
|
|
wg.Add(1)
|
|
|
|
r := &resolverSystem{
|
|
|
|
testableTimeout: 1 * time.Microsecond,
|
|
|
|
testableLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
defer wg.Done()
|
|
|
|
time.Sleep(1 * time.Millisecond)
|
|
|
|
return []string{"8.8.8.8"}, nil
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := r.LookupHost(ctx, "example.antani")
|
|
|
|
if !errors.Is(err, context.DeadlineExceeded) {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if addrs != nil {
|
|
|
|
t.Fatal("invalid addrs")
|
|
|
|
}
|
|
|
|
wg.Wait()
|
|
|
|
})
|
2021-09-05 18:50:05 +02:00
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
t.Run("with timeout and failure", func(t *testing.T) {
|
|
|
|
wg := &sync.WaitGroup{}
|
|
|
|
wg.Add(1)
|
|
|
|
r := &resolverSystem{
|
|
|
|
testableTimeout: 1 * time.Microsecond,
|
|
|
|
testableLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
defer wg.Done()
|
|
|
|
time.Sleep(1 * time.Millisecond)
|
|
|
|
return nil, errors.New("no such host")
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := r.LookupHost(ctx, "example.antani")
|
|
|
|
if !errors.Is(err, context.DeadlineExceeded) {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if addrs != nil {
|
|
|
|
t.Fatal("invalid addrs")
|
|
|
|
}
|
|
|
|
wg.Wait()
|
|
|
|
})
|
2021-09-05 18:50:05 +02:00
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
t.Run("with NXDOMAIN", func(t *testing.T) {
|
|
|
|
r := &resolverSystem{
|
|
|
|
testableLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
return nil, errors.New("no such host")
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := r.LookupHost(ctx, "example.antani")
|
|
|
|
if err == nil || !strings.HasSuffix(err.Error(), "no such host") {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if addrs != nil {
|
|
|
|
t.Fatal("invalid addrs")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
2021-09-27 23:09:41 +02:00
|
|
|
|
|
|
|
t.Run("LookupHTTPS", func(t *testing.T) {
|
|
|
|
r := &resolverSystem{}
|
|
|
|
https, err := r.LookupHTTPS(context.Background(), "x.org")
|
|
|
|
if !errors.Is(err, ErrNoDNSTransport) {
|
|
|
|
t.Fatal("not the error we expected")
|
|
|
|
}
|
|
|
|
if https != nil {
|
|
|
|
t.Fatal("expected nil result")
|
|
|
|
}
|
|
|
|
})
|
2021-09-05 18:50:05 +02:00
|
|
|
}
|
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
func TestResolverLogger(t *testing.T) {
|
|
|
|
t.Run("LookupHost", func(t *testing.T) {
|
|
|
|
t.Run("with success", func(t *testing.T) {
|
2021-09-08 22:48:10 +02:00
|
|
|
var count int
|
|
|
|
lo := &mocks.Logger{
|
|
|
|
MockDebugf: func(format string, v ...interface{}) {
|
|
|
|
count++
|
|
|
|
},
|
|
|
|
}
|
2021-09-08 11:39:27 +02:00
|
|
|
expected := []string{"1.1.1.1"}
|
2021-09-27 16:48:46 +02:00
|
|
|
r := &resolverLogger{
|
2021-09-08 22:48:10 +02:00
|
|
|
Logger: lo,
|
2021-09-08 11:39:27 +02:00
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
return expected, nil
|
|
|
|
},
|
2021-09-27 16:48:46 +02:00
|
|
|
MockNetwork: func() string {
|
|
|
|
return "system"
|
|
|
|
},
|
|
|
|
MockAddress: func() string {
|
|
|
|
return ""
|
|
|
|
},
|
2021-09-08 11:39:27 +02:00
|
|
|
},
|
|
|
|
}
|
|
|
|
addrs, err := r.LookupHost(context.Background(), "dns.google")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(expected, addrs); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
2021-09-08 22:48:10 +02:00
|
|
|
if count != 2 {
|
|
|
|
t.Fatal("unexpected count")
|
|
|
|
}
|
2021-09-08 11:39:27 +02:00
|
|
|
})
|
2021-06-23 17:00:44 +02:00
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
t.Run("with failure", func(t *testing.T) {
|
2021-09-08 22:48:10 +02:00
|
|
|
var count int
|
|
|
|
lo := &mocks.Logger{
|
|
|
|
MockDebugf: func(format string, v ...interface{}) {
|
|
|
|
count++
|
|
|
|
},
|
|
|
|
}
|
2021-09-08 11:39:27 +02:00
|
|
|
expected := errors.New("mocked error")
|
2021-09-27 16:48:46 +02:00
|
|
|
r := &resolverLogger{
|
2021-09-08 22:48:10 +02:00
|
|
|
Logger: lo,
|
2021-09-08 11:39:27 +02:00
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
return nil, expected
|
|
|
|
},
|
2021-09-27 16:48:46 +02:00
|
|
|
MockNetwork: func() string {
|
|
|
|
return "system"
|
|
|
|
},
|
|
|
|
MockAddress: func() string {
|
|
|
|
return ""
|
|
|
|
},
|
2021-09-08 11:39:27 +02:00
|
|
|
},
|
|
|
|
}
|
|
|
|
addrs, err := r.LookupHost(context.Background(), "dns.google")
|
|
|
|
if !errors.Is(err, expected) {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if addrs != nil {
|
|
|
|
t.Fatal("expected nil addr here")
|
|
|
|
}
|
2021-09-08 22:48:10 +02:00
|
|
|
if count != 2 {
|
|
|
|
t.Fatal("unexpected count")
|
|
|
|
}
|
2021-09-08 11:39:27 +02:00
|
|
|
})
|
|
|
|
})
|
2021-09-27 23:09:41 +02:00
|
|
|
|
|
|
|
t.Run("LookupHTTPS", func(t *testing.T) {
|
|
|
|
t.Run("with success", func(t *testing.T) {
|
|
|
|
var count int
|
|
|
|
lo := &mocks.Logger{
|
|
|
|
MockDebugf: func(format string, v ...interface{}) {
|
|
|
|
count++
|
|
|
|
},
|
|
|
|
}
|
|
|
|
expected := &HTTPSSvc{
|
|
|
|
ALPN: []string{"h3"},
|
|
|
|
IPv4: []string{"1.1.1.1"},
|
|
|
|
}
|
|
|
|
r := &resolverLogger{
|
|
|
|
Logger: lo,
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*HTTPSSvc, error) {
|
|
|
|
return expected, nil
|
|
|
|
},
|
|
|
|
MockNetwork: func() string {
|
|
|
|
return "system"
|
|
|
|
},
|
|
|
|
MockAddress: func() string {
|
|
|
|
return ""
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
https, err := r.LookupHTTPS(context.Background(), "dns.google")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(expected, https); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
if count != 2 {
|
|
|
|
t.Fatal("unexpected count")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("with failure", func(t *testing.T) {
|
|
|
|
var count int
|
|
|
|
lo := &mocks.Logger{
|
|
|
|
MockDebugf: func(format string, v ...interface{}) {
|
|
|
|
count++
|
|
|
|
},
|
|
|
|
}
|
|
|
|
expected := errors.New("mocked error")
|
|
|
|
r := &resolverLogger{
|
|
|
|
Logger: lo,
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*HTTPSSvc, error) {
|
|
|
|
return nil, expected
|
|
|
|
},
|
|
|
|
MockNetwork: func() string {
|
|
|
|
return "system"
|
|
|
|
},
|
|
|
|
MockAddress: func() string {
|
|
|
|
return ""
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
https, err := r.LookupHTTPS(context.Background(), "dns.google")
|
|
|
|
if !errors.Is(err, expected) {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if https != nil {
|
|
|
|
t.Fatal("expected nil addr here")
|
|
|
|
}
|
|
|
|
if count != 2 {
|
|
|
|
t.Fatal("unexpected count")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
2021-06-23 17:00:44 +02:00
|
|
|
}
|
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
func TestResolverIDNA(t *testing.T) {
|
|
|
|
t.Run("LookupHost", func(t *testing.T) {
|
|
|
|
t.Run("with valid IDNA in input", func(t *testing.T) {
|
|
|
|
expectedIPs := []string{"77.88.55.66"}
|
|
|
|
r := &resolverIDNA{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
if domain != "xn--d1acpjx3f.xn--p1ai" {
|
|
|
|
return nil, errors.New("passed invalid domain")
|
|
|
|
}
|
|
|
|
return expectedIPs, nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := r.LookupHost(ctx, "яндекс.рф")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(expectedIPs, addrs); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
})
|
2021-08-17 11:02:12 +02:00
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
t.Run("with invalid punycode", func(t *testing.T) {
|
|
|
|
r := &resolverIDNA{Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
return nil, errors.New("should not happen")
|
|
|
|
},
|
|
|
|
}}
|
|
|
|
// See https://www.farsightsecurity.com/blog/txt-record/punycode-20180711/
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := r.LookupHost(ctx, "xn--0000h")
|
|
|
|
if err == nil || !strings.HasPrefix(err.Error(), "idna: invalid label") {
|
|
|
|
t.Fatal("not the error we expected")
|
|
|
|
}
|
|
|
|
if addrs != nil {
|
|
|
|
t.Fatal("expected no response here")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
2021-09-27 23:09:41 +02:00
|
|
|
|
|
|
|
t.Run("LookupHTTPS", func(t *testing.T) {
|
|
|
|
t.Run("with valid IDNA in input", func(t *testing.T) {
|
|
|
|
expected := &HTTPSSvc{
|
|
|
|
ALPN: []string{"h3"},
|
|
|
|
IPv4: []string{"1.1.1.1"},
|
|
|
|
IPv6: []string{},
|
|
|
|
}
|
|
|
|
r := &resolverIDNA{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*HTTPSSvc, error) {
|
|
|
|
if domain != "xn--d1acpjx3f.xn--p1ai" {
|
|
|
|
return nil, errors.New("passed invalid domain")
|
|
|
|
}
|
|
|
|
return expected, nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
https, err := r.LookupHTTPS(ctx, "яндекс.рф")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(expected, https); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("with invalid punycode", func(t *testing.T) {
|
|
|
|
r := &resolverIDNA{Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*HTTPSSvc, error) {
|
|
|
|
return nil, errors.New("should not happen")
|
|
|
|
},
|
|
|
|
}}
|
|
|
|
// See https://www.farsightsecurity.com/blog/txt-record/punycode-20180711/
|
|
|
|
ctx := context.Background()
|
|
|
|
https, err := r.LookupHTTPS(ctx, "xn--0000h")
|
|
|
|
if err == nil || !strings.HasPrefix(err.Error(), "idna: invalid label") {
|
|
|
|
t.Fatal("not the error we expected")
|
|
|
|
}
|
|
|
|
if https != nil {
|
|
|
|
t.Fatal("expected no response here")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
2021-08-17 11:02:12 +02:00
|
|
|
}
|
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
func TestResolverShortCircuitIPAddr(t *testing.T) {
|
|
|
|
t.Run("LookupHost", func(t *testing.T) {
|
|
|
|
t.Run("with IP addr", func(t *testing.T) {
|
|
|
|
r := &resolverShortCircuitIPAddr{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
return nil, errors.New("mocked error")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := r.LookupHost(ctx, "8.8.8.8")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if len(addrs) != 1 || addrs[0] != "8.8.8.8" {
|
|
|
|
t.Fatal("invalid result")
|
|
|
|
}
|
|
|
|
})
|
2021-09-05 20:12:05 +02:00
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
t.Run("with domain", func(t *testing.T) {
|
|
|
|
r := &resolverShortCircuitIPAddr{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
return nil, errors.New("mocked error")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := r.LookupHost(ctx, "dns.google")
|
|
|
|
if err == nil || err.Error() != "mocked error" {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if addrs != nil {
|
|
|
|
t.Fatal("invalid result")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
2021-09-05 20:12:05 +02:00
|
|
|
}
|
2021-09-05 20:41:46 +02:00
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
func TestNullResolver(t *testing.T) {
|
2021-09-27 23:09:41 +02:00
|
|
|
t.Run("LookupHost", func(t *testing.T) {
|
|
|
|
r := &nullResolver{}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := r.LookupHost(ctx, "dns.google")
|
|
|
|
if !errors.Is(err, ErrNoResolver) {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if addrs != nil {
|
|
|
|
t.Fatal("expected nil addr")
|
|
|
|
}
|
|
|
|
if r.Network() != "null" {
|
|
|
|
t.Fatal("invalid network")
|
|
|
|
}
|
|
|
|
if r.Address() != "" {
|
|
|
|
t.Fatal("invalid address")
|
|
|
|
}
|
|
|
|
r.CloseIdleConnections() // for coverage
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("LookupHTTPS", func(t *testing.T) {
|
|
|
|
r := &nullResolver{}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := r.LookupHTTPS(ctx, "dns.google")
|
|
|
|
if !errors.Is(err, ErrNoResolver) {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if addrs != nil {
|
|
|
|
t.Fatal("expected nil addr")
|
|
|
|
}
|
|
|
|
if r.Network() != "null" {
|
|
|
|
t.Fatal("invalid network")
|
|
|
|
}
|
|
|
|
if r.Address() != "" {
|
|
|
|
t.Fatal("invalid address")
|
|
|
|
}
|
|
|
|
r.CloseIdleConnections() // for coverage
|
|
|
|
})
|
2021-09-05 20:41:46 +02:00
|
|
|
}
|
2021-09-07 19:56:42 +02:00
|
|
|
|
|
|
|
func TestResolverErrWrapper(t *testing.T) {
|
|
|
|
t.Run("LookupHost", func(t *testing.T) {
|
|
|
|
t.Run("on success", func(t *testing.T) {
|
|
|
|
expected := []string{"8.8.8.8", "8.8.4.4"}
|
|
|
|
reso := &resolverErrWrapper{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
return expected, nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := reso.LookupHost(ctx, "")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(expected, addrs); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("on failure", func(t *testing.T) {
|
|
|
|
expected := io.EOF
|
|
|
|
reso := &resolverErrWrapper{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
return nil, expected
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
addrs, err := reso.LookupHost(ctx, "")
|
|
|
|
if err == nil || err.Error() != errorsx.FailureEOFError {
|
|
|
|
t.Fatal("unexpected err", err)
|
|
|
|
}
|
|
|
|
if addrs != nil {
|
|
|
|
t.Fatal("unexpected addrs")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Network", func(t *testing.T) {
|
|
|
|
expected := "foobar"
|
|
|
|
reso := &resolverErrWrapper{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockNetwork: func() string {
|
|
|
|
return expected
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
if reso.Network() != expected {
|
|
|
|
t.Fatal("invalid network")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Address", func(t *testing.T) {
|
|
|
|
expected := "foobar"
|
|
|
|
reso := &resolverErrWrapper{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockAddress: func() string {
|
|
|
|
return expected
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
if reso.Address() != expected {
|
|
|
|
t.Fatal("invalid address")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("CloseIdleConnections", func(t *testing.T) {
|
|
|
|
var called bool
|
|
|
|
reso := &resolverErrWrapper{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockCloseIdleConnections: func() {
|
|
|
|
called = true
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
reso.CloseIdleConnections()
|
|
|
|
if !called {
|
|
|
|
t.Fatal("not called")
|
|
|
|
}
|
|
|
|
})
|
2021-09-27 23:09:41 +02:00
|
|
|
|
|
|
|
t.Run("LookupHTTPS", func(t *testing.T) {
|
|
|
|
t.Run("on success", func(t *testing.T) {
|
|
|
|
expected := &HTTPSSvc{
|
|
|
|
ALPN: []string{"h3"},
|
|
|
|
}
|
|
|
|
reso := &resolverErrWrapper{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*HTTPSSvc, error) {
|
|
|
|
return expected, nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
https, err := reso.LookupHTTPS(ctx, "")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(expected, https); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("on failure", func(t *testing.T) {
|
|
|
|
expected := io.EOF
|
|
|
|
reso := &resolverErrWrapper{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*HTTPSSvc, error) {
|
|
|
|
return nil, expected
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
https, err := reso.LookupHTTPS(ctx, "")
|
|
|
|
if err == nil || err.Error() != errorsx.FailureEOFError {
|
|
|
|
t.Fatal("unexpected err", err)
|
|
|
|
}
|
|
|
|
if https != nil {
|
|
|
|
t.Fatal("unexpected addrs")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
2021-09-07 19:56:42 +02:00
|
|
|
}
|