c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: fully move IDNAResolver to netxlite (#433)

Browse source 
We started doing this in https://github.com/ooni/probe-cli/pull/432.

This work is part of https://github.com/ooni/probe/issues/1733.
This commit is contained in:
Simone Basso 2021-08-17 11:02:12 +02:00 • committed by GitHub
commit bef5b87a8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 84 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

13
internal/netxlite/resolver.go
View file

@ -83,14 +83,15 @@ func (r *ResolverLogger) Address() string {
return ""
}
// IDNAResolver is to support resolving Internationalized Domain Names.
// ResolverIDNA supports resolving Internationalized Domain Names.
//
// See RFC3492 for more information.
type IDNAResolver struct {
type ResolverIDNA struct {
Resolver
}
// LookupHost implements Resolver.LookupHost
func (r *IDNAResolver) LookupHost(ctx context.Context, hostname string) ([]string, error) {
// LookupHost implements Resolver.LookupHost.
func (r *ResolverIDNA) LookupHost(ctx context.Context, hostname string) ([]string, error) {
host, err := idna.ToASCII(hostname)
if err != nil {
return nil, err
@ -99,7 +100,7 @@ func (r *IDNAResolver) LookupHost(ctx context.Context, hostname string) ([]strin
}
// Network implements Resolver.Network.
func (r *IDNAResolver) Network() string {
func (r *ResolverIDNA) Network() string {
if rn, ok := r.Resolver.(resolverNetworker); ok {
return rn.Network()
}
@ -107,7 +108,7 @@ func (r *IDNAResolver) Network() string {
}
// Address implements Resolver.Address.
func (r *IDNAResolver) Address() string {
func (r *ResolverIDNA) Address() string {
if ra, ok := r.Resolver.(resolverAddresser); ok {
return ra.Address()
}