d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
77 lines
1.8 KiB
Go
77 lines
1.8 KiB
Go
package resolver_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/resolver"
|
|
)
|
|
|
|
var ErrUnexpectedPunycode = errors.New("unexpected punycode value")
|
|
|
|
type CheckIDNAResolver struct {
|
|
Addresses []string
|
|
Error error
|
|
Expect string
|
|
}
|
|
|
|
func (resolv CheckIDNAResolver) LookupHost(ctx context.Context, hostname string) ([]string, error) {
|
|
if resolv.Error != nil {
|
|
return nil, resolv.Error
|
|
}
|
|
if hostname != resolv.Expect {
|
|
return nil, ErrUnexpectedPunycode
|
|
}
|
|
return resolv.Addresses, nil
|
|
}
|
|
|
|
func (r CheckIDNAResolver) Network() string {
|
|
return "checkidna"
|
|
}
|
|
|
|
func (r CheckIDNAResolver) Address() string {
|
|
return ""
|
|
}
|
|
|
|
func TestIDNAResolverSuccess(t *testing.T) {
|
|
expectedIPs := []string{"77.88.55.66"}
|
|
resolv := resolver.IDNAResolver{Resolver: CheckIDNAResolver{
|
|
Addresses: expectedIPs,
|
|
Expect: "xn--d1acpjx3f.xn--p1ai",
|
|
}}
|
|
addrs, err := resolv.LookupHost(context.Background(), "яндекс.рф")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if diff := cmp.Diff(expectedIPs, addrs); diff != "" {
|
|
t.Fatal(diff)
|
|
}
|
|
}
|
|
|
|
func TestIDNAResolverFailure(t *testing.T) {
|
|
resolv := resolver.IDNAResolver{Resolver: CheckIDNAResolver{
|
|
Error: errors.New("we should not arrive here"),
|
|
}}
|
|
// See https://www.farsightsecurity.com/blog/txt-record/punycode-20180711/
|
|
addrs, err := resolv.LookupHost(context.Background(), "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")
|
|
}
|
|
}
|
|
|
|
func TestIDNAResolverTransportOK(t *testing.T) {
|
|
resolv := resolver.IDNAResolver{Resolver: CheckIDNAResolver{}}
|
|
if resolv.Network() != "idna" {
|
|
t.Fatal("invalid network")
|
|
}
|
|
if resolv.Address() != "" {
|
|
t.Fatal("invalid address")
|
|
}
|
|
}
|