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

netxlite: do not call netgo the CGO_ENABLED=0 resolver (#766)

Browse Source 
In https://github.com/ooni/probe/issues/2029#issuecomment-1140805266, we
explained why calling it "netgo" would be incorrect.

In other words, we can get the platform's `getaddrinfo` as long as
we're not cross compiling. We do cross compile `ooniprobe`, actually
it's not even possible to cross compile it.

For increased accuracy, we should stop cross compiling `miniooni`
as well, so it would also directly use `getaddrinfo`.

This diff fixes at the same time ooni/probe-cli and ooni/spec
and we'll open two pull requests in parallel.
This commit is contained in:
Simone Basso 2022-05-30 10:06:53 +02:00 committed by GitHub
parent f3912188e1
commit 595d0744db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/model/netx.go
View File

@ -201,10 +201,11 @@ type SimpleResolver interface {
// Network returns the resolver type. It should be one of: // Network returns the resolver type. It should be one of:
// //
// - netgo: means we're using golang's "netgo" UDP resolver, which // - go: means we're using whatever resolver the Go stdlib uses
// reads /etc/resolv.conf and only works on Unix systems; // depending on the current build configuration;
// //
// - system: means we're calling getaddrinfo; // - system: means we've been compiled with `CGO_ENABLED=1`
// so we can bypass the go resolver and call getaddrinfo directly;
// //
// - udp: is a custom DNS-over-UDP resolver; // - udp: is a custom DNS-over-UDP resolver;
// //
@ -215,6 +216,10 @@ type SimpleResolver interface {
// - doh: is a custom DNS-over-HTTPS resolver; // - doh: is a custom DNS-over-HTTPS resolver;
// //
// - doh3: is a custom DNS-over-HTTP3 resolver. // - doh3: is a custom DNS-over-HTTP3 resolver.
//
// See https://github.com/ooni/probe/issues/2029#issuecomment-1140805266
// for an explanation of why it would not be proper to call "netgo" the
// resolver we get by default from the standard library.
Network() string Network() string
} }

9
internal/netxlite/getaddrinfo_otherwise.go
View File

@ -11,10 +11,13 @@ import (
// been used to implement the getaddrinfo resolver. // been used to implement the getaddrinfo resolver.
// //
// This is the CGO_ENABLED=0 implementation of this function, which // This is the CGO_ENABLED=0 implementation of this function, which
// always returns the string "netgo", because in this scenario we // always returns the string "go", because in this scenario we are actually
// are actually using the netgo implementation of net.Resolver. // using whatever resolver is used under the hood by the stdlib.
//
// See https://github.com/ooni/probe/issues/2029#issuecomment-1140805266
// for an explanation of why calling this resolver "netgo" is wrong.
func getaddrinfoResolverNetwork() string { func getaddrinfoResolverNetwork() string {
return "netgo" return "go"
} }
// getaddrinfoLookupANY attempts to perform an ANY lookup using getaddrinfo. // getaddrinfoLookupANY attempts to perform an ANY lookup using getaddrinfo.