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
35 lines
697 B
Go
35 lines
697 B
Go
package resolver
|
|
|
|
import (
|
|
"context"
|
|
|
|
"golang.org/x/net/idna"
|
|
)
|
|
|
|
// IDNAResolver is to support resolving Internationalized Domain Names.
|
|
// See RFC3492 for more information.
|
|
type IDNAResolver struct {
|
|
Resolver
|
|
}
|
|
|
|
// LookupHost implements Resolver.LookupHost
|
|
func (r IDNAResolver) LookupHost(ctx context.Context, hostname string) ([]string, error) {
|
|
host, err := idna.ToASCII(hostname)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return r.Resolver.LookupHost(ctx, host)
|
|
}
|
|
|
|
// Network implements Resolver.Network.
|
|
func (r IDNAResolver) Network() string {
|
|
return "idna"
|
|
}
|
|
|
|
// Address implements Resolver.Address.
|
|
func (r IDNAResolver) Address() string {
|
|
return ""
|
|
}
|
|
|
|
var _ Resolver = IDNAResolver{}
|