c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(netxlite): LookupHTTPS: short circuit IP addr (#725)

Browse Source 
This diff fixes the short-circuit-IP-addr resolver to
correctly handle IP addrs during LookupHTTPS.

The original diff was: 2b51d144bf

See https://github.com/ooni/probe/issues/2096

While there, add unit tests for IPv6.
This commit is contained in:
Simone Basso 2022-05-13 18:26:15 +02:00 committed by GitHub
parent ec0561ea8c
commit e126e73de7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 101 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/netxlite/resolver.go
View File

@ -209,6 +209,19 @@ func (r *resolverShortCircuitIPAddr) LookupHost(ctx context.Context, hostname st
return r.Resolver.LookupHost(ctx, hostname)
}
func (r *resolverShortCircuitIPAddr) LookupHTTPS(ctx context.Context, hostname string) (*model.HTTPSSvc, error) {
if net.ParseIP(hostname) != nil {
https := &model.HTTPSSvc{}
if isIPv6(hostname) {
https.IPv6 = append(https.IPv6, hostname)
} else {
https.IPv4 = append(https.IPv4, hostname)
}
return https, nil
}
return r.Resolver.LookupHTTPS(ctx, hostname)
}
// IsIPv6 returns true if the given candidate is a valid IP address
// representation and such representation is IPv6.
func IsIPv6(candidate string) (bool, error) {

88
internal/netxlite/resolver_test.go
View File

@ -440,6 +440,94 @@ func TestResolverShortCircuitIPAddr(t *testing.T) {
}
})
})
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")
}
})
})
}
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")
}
})
}
func TestNullResolver(t *testing.T) {