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"
|
2022-05-16 10:46:53 +02:00
|
|
|
"net"
|
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"
|
2022-01-03 13:53:23 +01:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model/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-28 18:15:38 +02:00
|
|
|
func TestNewResolverUDP(t *testing.T) {
|
|
|
|
d := NewDialerWithoutResolver(log.Log)
|
|
|
|
resolver := NewResolverUDP(log.Log, d, "1.1.1.1:53")
|
|
|
|
idna := resolver.(*resolverIDNA)
|
|
|
|
logger := idna.Resolver.(*resolverLogger)
|
|
|
|
if logger.Logger != log.Log {
|
|
|
|
t.Fatal("invalid logger")
|
|
|
|
}
|
|
|
|
shortCircuit := logger.Resolver.(*resolverShortCircuitIPAddr)
|
|
|
|
errWrapper := shortCircuit.Resolver.(*resolverErrWrapper)
|
|
|
|
serio := errWrapper.Resolver.(*SerialResolver)
|
2022-05-14 17:38:31 +02:00
|
|
|
txp := serio.Transport().(*DNSOverUDPTransport)
|
2021-09-28 18:15:38 +02:00
|
|
|
if txp.Address() != "1.1.1.1:53" {
|
|
|
|
t.Fatal("invalid address")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-08 11:39:27 +02:00
|
|
|
func TestResolverSystem(t *testing.T) {
|
|
|
|
t.Run("Network and Address", func(t *testing.T) {
|
|
|
|
r := &resolverSystem{}
|
getaddrinfo: fix CGO_ENABLED=0 and record resolver type (#765)
After https://github.com/ooni/probe-cli/pull/764, the build for
CGO_ENABLED=0 has been broken for miniooni:
https://github.com/ooni/probe-cli/runs/6636995859?check_suite_focus=true
Likewise, it's not possible to run tests with CGO_ENABLED=0.
To make tests work with `CGO_ENABLED=0`, I needed to sacrifice some
unit tests run for the CGO case. It is not fully clear to me what was happening
here, but basically `getaddrinfo_cgo_test.go` was compiled with CGO
being disabled, even though the ``//go:build cgo` flag was specified.
Additionally, @hellais previously raised a valid point in the review
of https://github.com/ooni/probe-cli/pull/698:
> Another issue we should consider is that, if I understand how
> this works correctly, depending on whether or not we have built
> with CGO_ENABLED=0 on or not, we are going to be measuring
> things in a different way (using our cgo inspired getaddrinfo
> implementation or using netgo). This might present issues when
> analyzing or interpreting the data.
>
> Do we perhaps want to add some field to the output data format that
> gives us an indication of which DNS resolution code was used to
> generate the the metric?
This comment is relevant to the current commit because
https://github.com/ooni/probe-cli/pull/698 is the previous
iteration of https://github.com/ooni/probe-cli/pull/764.
So, while fixing the build and test issues, let us also distinguish
between the CGO_ENABLED=1 and CGO_ENABLED=0 cases.
Before this commit, OONI used "system" to indicate the case where
we were using net.DefaultResolver. This behavior dates back to the
Measurement Kit days. While it is true that ooni/probe-engine and
ooni/probe-cli could have been using netgo in the past when we
said "system" as the resolver, it also seems reasonable to continue
to use "system" top indicate getaddrinfo.
So, the choice here is basically to use "netgo" from now on to
indicate the cases in which we were built with CGO_ENABLED=0.
This change will need to be documented into ooni/spec along with
the introduction of the `android_dns_cache_no_data` error.
## Checklist
- [x] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md)
- [x] reference issue for this pull request: https://github.com/ooni/probe/issues/2029
- [x] if you changed anything related how experiments work and you need to reflect these changes in the ooni/spec repository, please link to the related ooni/spec pull request: https://github.com/ooni/spec/pull/242
2022-05-30 07:34:25 +02:00
|
|
|
if r.Network() != getaddrinfoResolverNetwork() {
|
2021-09-08 11:39:27 +02:00
|
|
|
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)
|
2021-09-29 20:33:39 +02:00
|
|
|
done := make(chan interface{})
|
2021-09-08 11:39:27 +02:00
|
|
|
r := &resolverSystem{
|
|
|
|
testableTimeout: 1 * time.Microsecond,
|
|
|
|
testableLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
defer wg.Done()
|
2021-09-29 20:33:39 +02:00
|
|
|
<-done
|
2021-09-08 11:39:27 +02:00
|
|
|
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")
|
|
|
|
}
|
2021-09-29 20:33:39 +02:00
|
|
|
close(done)
|
2021-09-08 11:39:27 +02:00
|
|
|
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)
|
2021-09-29 20:33:39 +02:00
|
|
|
done := make(chan interface{})
|
2021-09-08 11:39:27 +02:00
|
|
|
r := &resolverSystem{
|
|
|
|
testableTimeout: 1 * time.Microsecond,
|
|
|
|
testableLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
|
|
defer wg.Done()
|
2021-09-29 20:33:39 +02:00
|
|
|
<-done
|
2021-09-08 11:39:27 +02:00
|
|
|
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")
|
|
|
|
}
|
2021-09-29 20:33:39 +02:00
|
|
|
close(done)
|
2021-09-08 11:39:27 +02:00
|
|
|
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")
|
|
|
|
}
|
|
|
|
})
|
2022-05-16 10:46:53 +02:00
|
|
|
|
|
|
|
t.Run("LookupNS", func(t *testing.T) {
|
|
|
|
r := &resolverSystem{}
|
|
|
|
ns, err := r.LookupNS(context.Background(), "x.org")
|
|
|
|
if !errors.Is(err, ErrNoDNSTransport) {
|
|
|
|
t.Fatal("not the error we expected")
|
|
|
|
}
|
|
|
|
if ns != 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++
|
|
|
|
},
|
|
|
|
}
|
2022-01-03 13:53:23 +01:00
|
|
|
expected := &model.HTTPSSvc{
|
2021-09-27 23:09:41 +02:00
|
|
|
ALPN: []string{"h3"},
|
|
|
|
IPv4: []string{"1.1.1.1"},
|
|
|
|
}
|
|
|
|
r := &resolverLogger{
|
|
|
|
Logger: lo,
|
|
|
|
Resolver: &mocks.Resolver{
|
2022-01-03 13:53:23 +01:00
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*model.HTTPSSvc, error) {
|
2021-09-27 23:09:41 +02:00
|
|
|
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{
|
2022-01-03 13:53:23 +01:00
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*model.HTTPSSvc, error) {
|
2021-09-27 23:09:41 +02:00
|
|
|
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")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
2022-05-16 10:46:53 +02:00
|
|
|
t.Run("CloseIdleConnections", func(t *testing.T) {
|
|
|
|
var called bool
|
|
|
|
child := &mocks.Resolver{
|
|
|
|
MockCloseIdleConnections: func() {
|
|
|
|
called = true
|
|
|
|
},
|
|
|
|
}
|
|
|
|
reso := &resolverLogger{
|
|
|
|
Resolver: child,
|
|
|
|
Logger: model.DiscardLogger,
|
|
|
|
}
|
|
|
|
reso.CloseIdleConnections()
|
|
|
|
if !called {
|
|
|
|
t.Fatal("not called")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("LookupNS", 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 := []*net.NS{{
|
|
|
|
Host: "ns1.zdns.google.",
|
|
|
|
}}
|
|
|
|
r := &resolverLogger{
|
|
|
|
Logger: lo,
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupNS: func(ctx context.Context, domain string) ([]*net.NS, error) {
|
|
|
|
return expected, nil
|
|
|
|
},
|
|
|
|
MockNetwork: func() string {
|
|
|
|
return "system"
|
|
|
|
},
|
|
|
|
MockAddress: func() string {
|
|
|
|
return ""
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ns, err := r.LookupNS(context.Background(), "dns.google")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(expected, ns); 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{
|
|
|
|
MockLookupNS: func(ctx context.Context, domain string) ([]*net.NS, error) {
|
|
|
|
return nil, expected
|
|
|
|
},
|
|
|
|
MockNetwork: func() string {
|
|
|
|
return "system"
|
|
|
|
},
|
|
|
|
MockAddress: func() string {
|
|
|
|
return ""
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ns, err := r.LookupNS(context.Background(), "dns.google")
|
|
|
|
if !errors.Is(err, expected) {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if ns != 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) {
|
2022-01-03 13:53:23 +01:00
|
|
|
expected := &model.HTTPSSvc{
|
2021-09-27 23:09:41 +02:00
|
|
|
ALPN: []string{"h3"},
|
|
|
|
IPv4: []string{"1.1.1.1"},
|
|
|
|
IPv6: []string{},
|
|
|
|
}
|
|
|
|
r := &resolverIDNA{
|
|
|
|
Resolver: &mocks.Resolver{
|
2022-01-03 13:53:23 +01:00
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*model.HTTPSSvc, error) {
|
2021-09-27 23:09:41 +02:00
|
|
|
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{
|
2022-01-03 13:53:23 +01:00
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*model.HTTPSSvc, error) {
|
2021-09-27 23:09:41 +02:00
|
|
|
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")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
2022-05-15 19:25:27 +02:00
|
|
|
|
|
|
|
t.Run("Network", func(t *testing.T) {
|
|
|
|
child := &mocks.Resolver{
|
|
|
|
MockNetwork: func() string {
|
|
|
|
return "x"
|
|
|
|
},
|
|
|
|
}
|
|
|
|
r := &resolverIDNA{child}
|
|
|
|
if r.Network() != "x" {
|
|
|
|
t.Fatal("invalid network")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Address", func(t *testing.T) {
|
|
|
|
child := &mocks.Resolver{
|
|
|
|
MockAddress: func() string {
|
|
|
|
return "x"
|
|
|
|
},
|
|
|
|
}
|
|
|
|
r := &resolverIDNA{child}
|
|
|
|
if r.Address() != "x" {
|
|
|
|
t.Fatal("invalid address")
|
|
|
|
}
|
|
|
|
})
|
2022-05-16 10:46:53 +02:00
|
|
|
|
|
|
|
t.Run("CloseIdleConnections", func(t *testing.T) {
|
|
|
|
var called bool
|
|
|
|
child := &mocks.Resolver{
|
|
|
|
MockCloseIdleConnections: func() {
|
|
|
|
called = true
|
|
|
|
},
|
|
|
|
}
|
|
|
|
reso := &resolverIDNA{child}
|
|
|
|
reso.CloseIdleConnections()
|
|
|
|
if !called {
|
|
|
|
t.Fatal("not called")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("LookupNS", func(t *testing.T) {
|
|
|
|
t.Run("with valid IDNA in input", func(t *testing.T) {
|
|
|
|
expected := []*net.NS{{
|
|
|
|
Host: "ns1.zdns.google.",
|
|
|
|
}}
|
|
|
|
r := &resolverIDNA{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupNS: func(ctx context.Context, domain string) ([]*net.NS, error) {
|
|
|
|
if domain != "xn--d1acpjx3f.xn--p1ai" {
|
|
|
|
return nil, errors.New("passed invalid domain")
|
|
|
|
}
|
|
|
|
return expected, nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
ns, err := r.LookupNS(ctx, "яндекс.рф")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(expected, ns); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("with invalid punycode", func(t *testing.T) {
|
|
|
|
r := &resolverIDNA{Resolver: &mocks.Resolver{
|
|
|
|
MockLookupNS: func(ctx context.Context, domain string) ([]*net.NS, error) {
|
|
|
|
return nil, errors.New("should not happen")
|
|
|
|
},
|
|
|
|
}}
|
|
|
|
// See https://www.farsightsecurity.com/blog/txt-record/punycode-20180711/
|
|
|
|
ctx := context.Background()
|
|
|
|
ns, err := r.LookupNS(ctx, "xn--0000h")
|
|
|
|
if err == nil || !strings.HasPrefix(err.Error(), "idna: invalid label") {
|
|
|
|
t.Fatal("not the error we expected")
|
|
|
|
}
|
|
|
|
if ns != 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")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
2022-05-13 18:26:15 +02:00
|
|
|
|
|
|
|
t.Run("LookupHTTPS", func(t *testing.T) {
|
|
|
|
t.Run("with IPv4 addr", func(t *testing.T) {
|
|
|
|
r := &resolverShortCircuitIPAddr{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*model.HTTPSSvc, error) {
|
|
|
|
return nil, errors.New("mocked error")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
https, err := r.LookupHTTPS(ctx, "8.8.8.8")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if len(https.IPv4) != 1 || https.IPv4[0] != "8.8.8.8" {
|
|
|
|
t.Fatal("invalid result")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("with IPv6 addr", func(t *testing.T) {
|
|
|
|
r := &resolverShortCircuitIPAddr{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*model.HTTPSSvc, error) {
|
|
|
|
return nil, errors.New("mocked error")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
https, err := r.LookupHTTPS(ctx, "::1")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if len(https.IPv6) != 1 || https.IPv6[0] != "::1" {
|
|
|
|
t.Fatal("invalid result")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("with domain", func(t *testing.T) {
|
|
|
|
r := &resolverShortCircuitIPAddr{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*model.HTTPSSvc, error) {
|
|
|
|
return nil, errors.New("mocked error")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
https, err := r.LookupHTTPS(ctx, "dns.google")
|
|
|
|
if err == nil || err.Error() != "mocked error" {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if https != nil {
|
|
|
|
t.Fatal("invalid result")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
2022-05-16 10:46:53 +02:00
|
|
|
|
|
|
|
t.Run("LookupNS", func(t *testing.T) {
|
|
|
|
t.Run("with IPv4 addr", func(t *testing.T) {
|
|
|
|
r := &resolverShortCircuitIPAddr{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupNS: func(ctx context.Context, domain string) ([]*net.NS, error) {
|
|
|
|
return nil, errors.New("mocked error")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
ns, err := r.LookupNS(ctx, "8.8.8.8")
|
|
|
|
if !errors.Is(err, ErrDNSIPAddress) {
|
|
|
|
t.Fatal("unexpected error", err)
|
|
|
|
}
|
|
|
|
if len(ns) > 0 {
|
|
|
|
t.Fatal("invalid result")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("with IPv6 addr", func(t *testing.T) {
|
|
|
|
r := &resolverShortCircuitIPAddr{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupNS: func(ctx context.Context, domain string) ([]*net.NS, error) {
|
|
|
|
return nil, errors.New("mocked error")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
ns, err := r.LookupNS(ctx, "::1")
|
|
|
|
if !errors.Is(err, ErrDNSIPAddress) {
|
|
|
|
t.Fatal("unexpected error", err)
|
|
|
|
}
|
|
|
|
if len(ns) > 0 {
|
|
|
|
t.Fatal("invalid result")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("with domain", func(t *testing.T) {
|
|
|
|
r := &resolverShortCircuitIPAddr{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupNS: func(ctx context.Context, domain string) ([]*net.NS, error) {
|
|
|
|
return nil, errors.New("mocked error")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
ns, err := r.LookupNS(ctx, "dns.google")
|
|
|
|
if err == nil || err.Error() != "mocked error" {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if len(ns) > 0 {
|
|
|
|
t.Fatal("invalid result")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Network", func(t *testing.T) {
|
|
|
|
child := &mocks.Resolver{
|
|
|
|
MockNetwork: func() string {
|
|
|
|
return "x"
|
|
|
|
},
|
|
|
|
}
|
|
|
|
reso := &resolverShortCircuitIPAddr{child}
|
|
|
|
if reso.Network() != "x" {
|
|
|
|
t.Fatal("invalid result")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Address", func(t *testing.T) {
|
|
|
|
child := &mocks.Resolver{
|
|
|
|
MockAddress: func() string {
|
|
|
|
return "x"
|
|
|
|
},
|
|
|
|
}
|
|
|
|
reso := &resolverShortCircuitIPAddr{child}
|
|
|
|
if reso.Address() != "x" {
|
|
|
|
t.Fatal("invalid result")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("CloseIdleConnections", func(t *testing.T) {
|
|
|
|
var called bool
|
|
|
|
child := &mocks.Resolver{
|
|
|
|
MockCloseIdleConnections: func() {
|
|
|
|
called = true
|
|
|
|
},
|
|
|
|
}
|
|
|
|
reso := &resolverShortCircuitIPAddr{child}
|
|
|
|
reso.CloseIdleConnections()
|
|
|
|
if !called {
|
|
|
|
t.Fatal("not called")
|
|
|
|
}
|
|
|
|
})
|
2022-05-13 18:26:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestIsIPv6(t *testing.T) {
|
|
|
|
t.Run("with neither IPv4 nor IPv6 as input", func(t *testing.T) {
|
|
|
|
ipv6, err := IsIPv6("example.com")
|
|
|
|
if !errors.Is(err, ErrInvalidIP) {
|
|
|
|
t.Fatal("not the error we expected", err)
|
|
|
|
}
|
|
|
|
if ipv6 {
|
|
|
|
t.Fatal("expected false")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("with IPv4 as input", func(t *testing.T) {
|
|
|
|
ipv6, err := IsIPv6("1.2.3.4")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if ipv6 {
|
|
|
|
t.Fatal("expected false")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("with IPv6 as input", func(t *testing.T) {
|
|
|
|
ipv6, err := IsIPv6("::1")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if !ipv6 {
|
|
|
|
t.Fatal("expected true")
|
|
|
|
}
|
|
|
|
})
|
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) {
|
2022-05-31 20:02:11 +02:00
|
|
|
r := &NullResolver{}
|
2021-09-27 23:09:41 +02:00
|
|
|
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) {
|
2022-05-31 20:02:11 +02:00
|
|
|
r := &NullResolver{}
|
2021-09-27 23:09:41 +02:00
|
|
|
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
|
|
|
|
})
|
2022-05-16 10:46:53 +02:00
|
|
|
|
|
|
|
t.Run("LookupNS", func(t *testing.T) {
|
2022-05-31 20:02:11 +02:00
|
|
|
r := &NullResolver{}
|
2022-05-16 10:46:53 +02:00
|
|
|
ctx := context.Background()
|
|
|
|
ns, err := r.LookupNS(ctx, "dns.google")
|
|
|
|
if !errors.Is(err, ErrNoResolver) {
|
|
|
|
t.Fatal("unexpected error", err)
|
|
|
|
}
|
|
|
|
if len(ns) > 0 {
|
|
|
|
t.Fatal("unexpected result")
|
|
|
|
}
|
|
|
|
})
|
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, "")
|
2021-09-28 12:42:01 +02:00
|
|
|
if err == nil || err.Error() != FailureEOFError {
|
2021-09-07 19:56:42 +02:00
|
|
|
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) {
|
2022-01-03 13:53:23 +01:00
|
|
|
expected := &model.HTTPSSvc{
|
2021-09-27 23:09:41 +02:00
|
|
|
ALPN: []string{"h3"},
|
|
|
|
}
|
|
|
|
reso := &resolverErrWrapper{
|
|
|
|
Resolver: &mocks.Resolver{
|
2022-01-03 13:53:23 +01:00
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*model.HTTPSSvc, error) {
|
2021-09-27 23:09:41 +02:00
|
|
|
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{
|
2022-01-03 13:53:23 +01:00
|
|
|
MockLookupHTTPS: func(ctx context.Context, domain string) (*model.HTTPSSvc, error) {
|
2021-09-27 23:09:41 +02:00
|
|
|
return nil, expected
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
https, err := reso.LookupHTTPS(ctx, "")
|
2021-09-28 12:42:01 +02:00
|
|
|
if err == nil || err.Error() != FailureEOFError {
|
2021-09-27 23:09:41 +02:00
|
|
|
t.Fatal("unexpected err", err)
|
|
|
|
}
|
|
|
|
if https != nil {
|
|
|
|
t.Fatal("unexpected addrs")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
2022-05-16 10:46:53 +02:00
|
|
|
|
|
|
|
t.Run("LookupNS", func(t *testing.T) {
|
|
|
|
t.Run("on success", func(t *testing.T) {
|
|
|
|
expected := []*net.NS{{
|
|
|
|
Host: "antani.local.",
|
|
|
|
}}
|
|
|
|
reso := &resolverErrWrapper{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupNS: func(ctx context.Context, domain string) ([]*net.NS, error) {
|
|
|
|
return expected, nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
ns, err := reso.LookupNS(ctx, "antani.local")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(expected, ns); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("on failure", func(t *testing.T) {
|
|
|
|
expected := io.EOF
|
|
|
|
reso := &resolverErrWrapper{
|
|
|
|
Resolver: &mocks.Resolver{
|
|
|
|
MockLookupNS: func(ctx context.Context, domain string) ([]*net.NS, error) {
|
|
|
|
return nil, expected
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
ns, err := reso.LookupNS(ctx, "")
|
|
|
|
if err == nil || err.Error() != FailureEOFError {
|
|
|
|
t.Fatal("unexpected err", err)
|
|
|
|
}
|
|
|
|
if len(ns) > 0 {
|
|
|
|
t.Fatal("unexpected addrs")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
2021-09-07 19:56:42 +02:00
|
|
|
}
|