sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-29 13:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert exported HostDNSConfig

Browse Source
This commit is contained in:
Pascal Fischer
2023-12-06 16:13:31 +01:00
parent f854ec9bb6
commit c88e8139c7
11 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/internal/dns/file_linux.go
View File

@@ -35,7 +35,7 @@ func (f *fileConfigurator) supportCustomPort() bool {
return false return false
} }
func (f *fileConfigurator) applyDNSConfig(config HostDNSConfig) error { func (f *fileConfigurator) applyDNSConfig(config hostDNSConfig) error {
backupFileExist := false backupFileExist := false
_, err := os.Stat(fileDefaultResolvConfBackupLocation) _, err := os.Stat(fileDefaultResolvConfBackupLocation)
if err == nil { if err == nil {
@@ -138,7 +138,7 @@ func prepareResolvConfContent(searchDomains, nameServers, others []string) bytes
return buf return buf
} }
func searchDomains(config HostDNSConfig) []string { func searchDomains(config hostDNSConfig) []string {
listOfDomains := make([]string, 0) listOfDomains := make([]string, 0)
for _, dConf := range config.domains { for _, dConf := range config.domains {
if dConf.matchOnly || dConf.disabled { if dConf.matchOnly || dConf.disabled {

14
client/internal/dns/host.go
View File

@@ -8,12 +8,12 @@ import (
) )
type hostManager interface { type hostManager interface {
applyDNSConfig(config HostDNSConfig) error applyDNSConfig(config hostDNSConfig) error
restoreHostDNS() error restoreHostDNS() error
supportCustomPort() bool supportCustomPort() bool
} }
type HostDNSConfig struct { type hostDNSConfig struct {
domains []domainConfig domains []domainConfig
routeAll bool routeAll bool
serverIP string serverIP string
@@ -27,12 +27,12 @@ type domainConfig struct {
} }
type mockHostConfigurator struct { type mockHostConfigurator struct {
applyDNSConfigFunc func(config HostDNSConfig) error applyDNSConfigFunc func(config hostDNSConfig) error
restoreHostDNSFunc func() error restoreHostDNSFunc func() error
supportCustomPortFunc func() bool supportCustomPortFunc func() bool
} }
func (m *mockHostConfigurator) applyDNSConfig(config HostDNSConfig) error { func (m *mockHostConfigurator) applyDNSConfig(config hostDNSConfig) error {
if m.applyDNSConfigFunc != nil { if m.applyDNSConfigFunc != nil {
return m.applyDNSConfigFunc(config) return m.applyDNSConfigFunc(config)
} }
@@ -55,14 +55,14 @@ func (m *mockHostConfigurator) supportCustomPort() bool {
func newNoopHostMocker() hostManager { func newNoopHostMocker() hostManager {
return &mockHostConfigurator{ return &mockHostConfigurator{
applyDNSConfigFunc: func(config HostDNSConfig) error { return nil }, applyDNSConfigFunc: func(config hostDNSConfig) error { return nil },
restoreHostDNSFunc: func() error { return nil }, restoreHostDNSFunc: func() error { return nil },
supportCustomPortFunc: func() bool { return true }, supportCustomPortFunc: func() bool { return true },
} }
} }
func dnsConfigToHostDNSConfig(dnsConfig nbdns.Config, ip string, port int) HostDNSConfig { func dnsConfigTohostDNSConfig(dnsConfig nbdns.Config, ip string, port int) hostDNSConfig {
config := HostDNSConfig{ config := hostDNSConfig{
routeAll: false, routeAll: false,
serverIP: ip, serverIP: ip,
serverPort: port, serverPort: port,

2
client/internal/dns/host_android.go
View File

@@ -7,7 +7,7 @@ func newHostManager(wgInterface WGIface, dnsManager IosDnsManager) (hostManager,
return &androidHostManager{}, nil return &androidHostManager{}, nil
} }
func (a androidHostManager) applyDNSConfig(config HostDNSConfig) error { func (a androidHostManager) applyDNSConfig(config hostDNSConfig) error {
return nil return nil
} }

2
client/internal/dns/host_darwin.go
View File

@@ -44,7 +44,7 @@ func (s *systemConfigurator) supportCustomPort() bool {
return true return true
} }
func (s *systemConfigurator) applyDNSConfig(config HostDNSConfig) error { func (s *systemConfigurator) applyDNSConfig(config hostDNSConfig) error {
var err error var err error
if config.routeAll { if config.routeAll {

4
client/internal/dns/host_ios.go
View File

@@ -9,7 +9,7 @@ import (
type iosHostManager struct { type iosHostManager struct {
dnsManager IosDnsManager dnsManager IosDnsManager
config HostDNSConfig config hostDNSConfig
} }
func newHostManager(wgInterface WGIface, dnsManager IosDnsManager) (hostManager, error) { func newHostManager(wgInterface WGIface, dnsManager IosDnsManager) (hostManager, error) {
@@ -18,7 +18,7 @@ func newHostManager(wgInterface WGIface, dnsManager IosDnsManager) (hostManager,
}, nil }, nil
} }
func (a iosHostManager) applyDNSConfig(config HostDNSConfig) error { func (a iosHostManager) applyDNSConfig(config hostDNSConfig) error {
var configAsString []string var configAsString []string
configAsString = append(configAsString, config.serverIP) configAsString = append(configAsString, config.serverIP)
configAsString = append(configAsString, strconv.Itoa(config.serverPort)) configAsString = append(configAsString, strconv.Itoa(config.serverPort))

2
client/internal/dns/host_windows.go
View File

@@ -43,7 +43,7 @@ func (s *registryConfigurator) supportCustomPort() bool {
return false return false
} }
func (r *registryConfigurator) applyDNSConfig(config HostDNSConfig) error { func (r *registryConfigurator) applyDNSConfig(config hostDNSConfig) error {
var err error var err error
if config.routeAll { if config.routeAll {
err = r.addDNSSetupForAll(config.serverIP) err = r.addDNSSetupForAll(config.serverIP)

5
client/internal/dns/network_manager_linux.go
View File

@@ -12,8 +12,9 @@ import (
"github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5"
"github.com/hashicorp/go-version" "github.com/hashicorp/go-version"
"github.com/miekg/dns" "github.com/miekg/dns"
nbversion "github.com/netbirdio/netbird/version"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
nbversion "github.com/netbirdio/netbird/version"
) )
const ( const (
@@ -93,7 +94,7 @@ func (n *networkManagerDbusConfigurator) supportCustomPort() bool {
return false return false
} }
func (n *networkManagerDbusConfigurator) applyDNSConfig(config HostDNSConfig) error { func (n *networkManagerDbusConfigurator) applyDNSConfig(config hostDNSConfig) error {
connSettings, configVersion, err := n.getAppliedConnectionSettings() connSettings, configVersion, err := n.getAppliedConnectionSettings()
if err != nil { if err != nil {
return fmt.Errorf("got an error while retrieving the applied connection settings, error: %s", err) return fmt.Errorf("got an error while retrieving the applied connection settings, error: %s", err)

2
client/internal/dns/resolvconf_linux.go
View File

@@ -39,7 +39,7 @@ func (r *resolvconf) supportCustomPort() bool {
return false return false
} }
func (r *resolvconf) applyDNSConfig(config HostDNSConfig) error { func (r *resolvconf) applyDNSConfig(config hostDNSConfig) error {
var err error var err error
if !config.routeAll { if !config.routeAll {
err = r.restoreHostDNS() err = r.restoreHostDNS()

6
client/internal/dns/server.go
View File

@@ -49,7 +49,7 @@ type DefaultServer struct {
hostManager hostManager hostManager hostManager
updateSerial uint64 updateSerial uint64
previousConfigHash uint64 previousConfigHash uint64
currentConfig HostDNSConfig currentConfig hostDNSConfig
// permanent related properties // permanent related properties
permanent bool permanent bool
@@ -101,7 +101,7 @@ func NewDefaultServerPermanentUpstream(ctx context.Context, wgInterface WGIface,
ds.permanent = true ds.permanent = true
ds.hostsDnsList = hostsDnsList ds.hostsDnsList = hostsDnsList
ds.addHostRootZone() ds.addHostRootZone()
ds.currentConfig = dnsConfigToHostDNSConfig(config, ds.service.RuntimeIP(), ds.service.RuntimePort()) ds.currentConfig = dnsConfigTohostDNSConfig(config, ds.service.RuntimeIP(), ds.service.RuntimePort())
ds.searchDomainNotifier = newNotifier(ds.SearchDomains()) ds.searchDomainNotifier = newNotifier(ds.SearchDomains())
ds.searchDomainNotifier.setListener(listener) ds.searchDomainNotifier.setListener(listener)
setServerDns(ds) setServerDns(ds)
@@ -271,7 +271,7 @@ func (s *DefaultServer) applyConfiguration(update nbdns.Config) error {
s.updateMux(muxUpdates) s.updateMux(muxUpdates)
s.updateLocalResolver(localRecords) s.updateLocalResolver(localRecords)
s.currentConfig = dnsConfigToHostDNSConfig(update, s.service.RuntimeIP(), s.service.RuntimePort()) s.currentConfig = dnsConfigTohostDNSConfig(update, s.service.RuntimeIP(), s.service.RuntimePort())
hostUpdate := s.currentConfig hostUpdate := s.currentConfig
if s.service.RuntimePort() != defaultPort && !s.hostManager.supportCustomPort() { if s.service.RuntimePort() != defaultPort && !s.hostManager.supportCustomPort() {

4
client/internal/dns/server_test.go
View File

@@ -527,7 +527,7 @@ func TestDNSServerUpstreamDeactivateCallback(t *testing.T) {
registeredMap: make(registrationMap), registeredMap: make(registrationMap),
}, },
hostManager: hostManager, hostManager: hostManager,
currentConfig: HostDNSConfig{ currentConfig: hostDNSConfig{
domains: []domainConfig{ domains: []domainConfig{
{false, "domain0", false}, {false, "domain0", false},
{false, "domain1", false}, {false, "domain1", false},
@@ -537,7 +537,7 @@ func TestDNSServerUpstreamDeactivateCallback(t *testing.T) {
} }
var domainsUpdate string var domainsUpdate string
hostManager.applyDNSConfigFunc = func(config HostDNSConfig) error { hostManager.applyDNSConfigFunc = func(config hostDNSConfig) error {
domains := []string{} domains := []string{}
for _, item := range config.domains { for _, item := range config.domains {
if item.disabled { if item.disabled {

2
client/internal/dns/systemd_linux.go
View File

@@ -81,7 +81,7 @@ func (s *systemdDbusConfigurator) supportCustomPort() bool {
return true return true
} }
func (s *systemdDbusConfigurator) applyDNSConfig(config HostDNSConfig) error { func (s *systemdDbusConfigurator) applyDNSConfig(config hostDNSConfig) error {
parsedIP, err := netip.ParseAddr(config.serverIP) parsedIP, err := netip.ParseAddr(config.serverIP)
if err != nil { if err != nil {
return fmt.Errorf("unable to parse ip address, error: %s", err) return fmt.Errorf("unable to parse ip address, error: %s", err)