mirror of
https://github.com/netbirdio/netbird.git
synced 2025-06-04 00:55:58 +02:00
7ebe58f20a
* Add DNS list argument for mobile client * Write testable code Many places are checked the wgInterface != nil condition. It is doing it just because to avoid the real wgInterface creation for tests. Instead of this involve a wgInterface interface what is moc-able. * Refactor the DNS server internal code structure With the fake resolver has been involved several if-else statement and generated some unused variables to distinguish the listener and fake resolver solutions at running time. With this commit the fake resolver and listener based solution has been moved into two separated structure. Name of this layer is the 'service'. With this modification the unit test looks simpler and open the option to add new logic for the permanent DNS service usage for mobile systems. * Remove is running check in test We can not ensure the state well so remove this check. The test will fail if the server is not running well.
91 lines
2.3 KiB
Go
91 lines
2.3 KiB
Go
//go:build !android
|
|
|
|
package dns
|
|
|
|
import (
|
|
"fmt"
|
|
"os/exec"
|
|
"strings"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
)
|
|
|
|
const resolvconfCommand = "resolvconf"
|
|
|
|
type resolvconf struct {
|
|
ifaceName string
|
|
}
|
|
|
|
func newResolvConfConfigurator(wgInterface WGIface) (hostManager, error) {
|
|
return &resolvconf{
|
|
ifaceName: wgInterface.Name(),
|
|
}, nil
|
|
}
|
|
|
|
func (r *resolvconf) supportCustomPort() bool {
|
|
return false
|
|
}
|
|
|
|
func (r *resolvconf) applyDNSConfig(config hostDNSConfig) error {
|
|
var err error
|
|
if !config.routeAll {
|
|
err = r.restoreHostDNS()
|
|
if err != nil {
|
|
log.Error(err)
|
|
}
|
|
return fmt.Errorf("unable to configure DNS for this peer using resolvconf manager without a nameserver group with all domains configured")
|
|
}
|
|
|
|
var searchDomains string
|
|
appendedDomains := 0
|
|
for _, dConf := range config.domains {
|
|
if dConf.matchOnly || dConf.disabled {
|
|
continue
|
|
}
|
|
|
|
if appendedDomains >= fileMaxNumberOfSearchDomains {
|
|
// lets log all skipped domains
|
|
log.Infof("already appended %d domains to search list. Skipping append of %s domain", fileMaxNumberOfSearchDomains, dConf.domain)
|
|
continue
|
|
}
|
|
|
|
if fileSearchLineBeginCharCount+len(searchDomains) > fileMaxLineCharsLimit {
|
|
// lets log all skipped domains
|
|
log.Infof("search list line is larger than %d characters. Skipping append of %s domain", fileMaxLineCharsLimit, dConf.domain)
|
|
continue
|
|
}
|
|
|
|
searchDomains += " " + dConf.domain
|
|
appendedDomains++
|
|
}
|
|
|
|
content := fmt.Sprintf(fileGeneratedResolvConfContentFormat, fileDefaultResolvConfBackupLocation, config.serverIP, searchDomains)
|
|
|
|
err = r.applyConfig(content)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
log.Infof("added %d search domains. Search list: %s", appendedDomains, searchDomains)
|
|
return nil
|
|
}
|
|
|
|
func (r *resolvconf) restoreHostDNS() error {
|
|
cmd := exec.Command(resolvconfCommand, "-f", "-d", r.ifaceName)
|
|
_, err := cmd.Output()
|
|
if err != nil {
|
|
return fmt.Errorf("got an error while removing resolvconf configuration for %s interface, error: %s", r.ifaceName, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (r *resolvconf) applyConfig(content string) error {
|
|
cmd := exec.Command(resolvconfCommand, "-x", "-a", r.ifaceName)
|
|
cmd.Stdin = strings.NewReader(content)
|
|
_, err := cmd.Output()
|
|
if err != nil {
|
|
return fmt.Errorf("got an error while appying resolvconf configuration for %s interface, error: %s", r.ifaceName, err)
|
|
}
|
|
return nil
|
|
}
|