TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-07-28 14:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/dns: make debian_resolvconf correctly clear DNS configs.

Browse Source 
More of #1720.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2021-04-20 15:51:14 -07:00
parent 3b1ab78954
commit 53213114ec
3 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/dns/debian_resolvconf.go
View File

@ -89,6 +89,15 @@ func newDebianResolvconfManager(logf logger.Logf) (*resolvconfManager, error) {
return ret, nil return ret, nil
} }
func (m *resolvconfManager) deleteTailscaleConfig() error {
cmd := exec.Command("resolvconf", "-d", resolvconfConfigName)
out, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("running %s: %s", cmd, out)
}
return nil
}
func (m *resolvconfManager) SetDNS(config OSConfig) error { func (m *resolvconfManager) SetDNS(config OSConfig) error {
if !m.scriptInstalled { if !m.scriptInstalled {
m.logf("injecting resolvconf workaround script") m.logf("injecting resolvconf workaround script")
@ -101,19 +110,25 @@ func (m *resolvconfManager) SetDNS(config OSConfig) error {
m.scriptInstalled = true m.scriptInstalled = true
} }
if config.IsZero() {
if err := m.deleteTailscaleConfig(); err != nil {
return err
}
} else {
stdin := new(bytes.Buffer) stdin := new(bytes.Buffer)
writeResolvConf(stdin, config.Nameservers, config.SearchDomains) // dns_direct.go writeResolvConf(stdin, config.Nameservers, config.SearchDomains) // dns_direct.go
// This resolvconf implementation doesn't support exclusive mode // This resolvconf implementation doesn't support exclusive
// or interface priorities, so it will end up blending our // mode or interface priorities, so it will end up blending
// configuration with other sources. However, this will get fixed // our configuration with other sources. However, this will
// up by the script we injected above. // get fixed up by the script we injected above.
cmd := exec.Command("resolvconf", "-a", resolvconfConfigName) cmd := exec.Command("resolvconf", "-a", resolvconfConfigName)
cmd.Stdin = stdin cmd.Stdin = stdin
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("running %s: %s", cmd, out) return fmt.Errorf("running %s: %s", cmd, out)
} }
}
return nil return nil
} }
@ -156,10 +171,8 @@ func (m *resolvconfManager) GetBaseConfig() (OSConfig, error) {
} }
func (m *resolvconfManager) Close() error { func (m *resolvconfManager) Close() error {
cmd := exec.Command("resolvconf", "-d", resolvconfConfigName) if err := m.deleteTailscaleConfig(); err != nil {
out, err := cmd.CombinedOutput() return err
if err != nil {
return fmt.Errorf("running %s: %s", cmd, out)
} }
if m.scriptInstalled { if m.scriptInstalled {

2
net/dns/direct.go
View File

@ -234,7 +234,7 @@ func (m directManager) restoreBackup() error {
} }
func (m directManager) SetDNS(config OSConfig) error { func (m directManager) SetDNS(config OSConfig) error {
if config.Equal(OSConfig{}) { if config.IsZero() {
if err := m.restoreBackup(); err != nil { if err := m.restoreBackup(); err != nil {
return err return err
} }

4
net/dns/osconfig.go
View File

@ -52,6 +52,10 @@ type OSConfig struct {
MatchDomains []dnsname.FQDN MatchDomains []dnsname.FQDN
} }
func (o OSConfig) IsZero() bool {
return len(o.Nameservers) == 0 && len(o.SearchDomains) == 0 && len(o.MatchDomains) == 0
}
func (a OSConfig) Equal(b OSConfig) bool { func (a OSConfig) Equal(b OSConfig) bool {
if len(a.Nameservers) != len(b.Nameservers) { if len(a.Nameservers) != len(b.Nameservers) {
return false return false