TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-21 06:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/dns/resolver, ipnlocal: fix ExitDNS on Android and iOS

Browse Source 
Advertise it on Android (it looks like it already works once advertised).

And both advertise & likely fix it on iOS. Yet untested.

Updates #9672

Change-Id: If3b7e97f011dea61e7e75aff23dcc178b6cf9123
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2023-10-05 12:18:21 -07:00 committed by Brad Fitzpatrick
parent b4816e19b6
commit 7868393200
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/ipnlocal/local.go
View File

@ -3060,7 +3060,7 @@ func (b *LocalBackend) peerAPIServicesLocked() (ret []tailcfg.Service) {
}) })
} }
switch runtime.GOOS { switch runtime.GOOS {
case "linux", "freebsd", "openbsd", "illumos", "darwin", "windows": case "linux", "freebsd", "openbsd", "illumos", "darwin", "windows", "android", "ios":
// These are the platforms currently supported by // These are the platforms currently supported by
// net/dns/resolver/tsdns.go:Resolver.HandleExitNodeDNSQuery. // net/dns/resolver/tsdns.go:Resolver.HandleExitNodeDNSQuery.
ret = append(ret, tailcfg.Service{ ret = append(ret, tailcfg.Service{

17
net/dns/resolver/tsdns.go
View File

@ -350,7 +350,7 @@ func (r *Resolver) HandleExitNodeDNSQuery(ctx context.Context, q []byte, from ne
// but for now that's probably good enough. Later we'll // but for now that's probably good enough. Later we'll
// want to blend in everything from scutil --dns. // want to blend in everything from scutil --dns.
fallthrough fallthrough
case "linux", "freebsd", "openbsd", "illumos": case "linux", "freebsd", "openbsd", "illumos", "ios":
nameserver, err := stubResolverForOS() nameserver, err := stubResolverForOS()
if err != nil { if err != nil {
r.logf("stubResolverForOS: %v", err) r.logf("stubResolverForOS: %v", err)
@ -360,12 +360,15 @@ func (r *Resolver) HandleExitNodeDNSQuery(ctx context.Context, q []byte, from ne
// TODO: more than 1 resolver from /etc/resolv.conf? // TODO: more than 1 resolver from /etc/resolv.conf?
var resolvers []resolverAndDelay var resolvers []resolverAndDelay
if nameserver == tsaddr.TailscaleServiceIP() || nameserver == tsaddr.TailscaleServiceIPv6() { switch nameserver {
case tsaddr.TailscaleServiceIP(), tsaddr.TailscaleServiceIPv6():
// If resolv.conf says 100.100.100.100, it's coming right back to us anyway // If resolv.conf says 100.100.100.100, it's coming right back to us anyway
// so avoid the loop through the kernel and just do what we // so avoid the loop through the kernel and just do what we
// would've done anyway. By not passing any resolvers, the forwarder // would've done anyway. By not passing any resolvers, the forwarder
// will use its default ones from our DNS config. // will use its default ones from our DNS config.
} else { case netip.Addr{}:
// Likewise, if the platform has no resolv.conf, just use our defaults.
default:
resolvers = []resolverAndDelay{{ resolvers = []resolverAndDelay{{
name: &dnstype.Resolver{Addr: net.JoinHostPort(nameserver.String(), "53")}, name: &dnstype.Resolver{Addr: net.JoinHostPort(nameserver.String(), "53")},
}} }}
@ -392,7 +395,7 @@ var debugExitNodeDNSNetPkg = envknob.RegisterBool("TS_DEBUG_EXIT_NODE_DNS_NET_PK
// handleExitNodeDNSQueryWithNetPkg takes a DNS query message in q and // handleExitNodeDNSQueryWithNetPkg takes a DNS query message in q and
// return a reply (for the ExitDNS DoH service) using the net package's // return a reply (for the ExitDNS DoH service) using the net package's
// native APIs. This is only used on Windows for now. // native APIs.
// //
// If resolver is nil, the net.Resolver zero value is used. // If resolver is nil, the net.Resolver zero value is used.
// //
@ -531,7 +534,13 @@ var errEmptyResolvConf = errors.New("resolv.conf has no nameservers")
// stubResolverForOS returns the IP address of the first nameserver in // stubResolverForOS returns the IP address of the first nameserver in
// /etc/resolv.conf. // /etc/resolv.conf.
//
// It may also return the netip.Addr zero value and a nil error to mean
// that the platform has no resolv.conf.
func stubResolverForOS() (ip netip.Addr, err error) { func stubResolverForOS() (ip netip.Addr, err error) {
if runtime.GOOS == "ios" {
return netip.Addr{}, nil // no resolv.conf on iOS
}
fi, err := os.Stat(resolvconffile.Path) fi, err := os.Stat(resolvconffile.Path)
if err != nil { if err != nil {
return netip.Addr{}, err return netip.Addr{}, err