mirror of
https://github.com/netbirdio/netbird.git
synced 2024-11-28 19:13:31 +01:00
818c6b885f
* starting engine by passing file descriptor on engine start * inject logger that does not compile * logger and first client * first working connection * support for routes and working connection * small refactor for better code quality in swift * trying to add DNS * fix * updated * fix route deletion * trying to bind the DNS resolver dialer to an interface * use dns.Client.Exchange * fix metadata send on startup * switching between client to query upstream * fix panic on no dns response * fix after merge changes * add engine ready listener * replace engine listener with connection listener * disable relay connection for iOS until proxy is refactored into bind * Extract private upstream for iOS and fix function headers for other OS * Update mock Server * Fix dns server and upstream tests * Fix engine null pointer with mobile dependencies for other OS * Revert back to disabling upstream on no response * Fix some of the remarks from the linter * Fix linter * re-arrange duration calculation * revert exported HostDNSConfig * remove unused engine listener * remove development logs * refactor dns code and interface name propagation * clean dns server test * disable upstream deactivation for iOS * remove files after merge * fix dns server darwin * fix server mock * fix build flags * move service listen back to initialize * add wgInterface to hostManager initialization on android * fix typo and remove unused function * extract upstream exchange for ios and rest * remove todo * separate upstream logic to ios file * Fix upstream test * use interface and embedded struct for upstream * set properly upstream client * remove placeholder * remove ios specific attributes * fix upstream test * merge ipc parser and wg configurer for mobile * fix build annotation * use json for DNS settings handover through gomobile * add logs for DNS json string * bring back check on ios for private upstream * remove wrong (and unused) line * fix wrongly updated comments on DNSSetting export --------- Co-authored-by: Maycon Santos <mlsmaycon@gmail.com>
95 lines
2.3 KiB
Go
95 lines
2.3 KiB
Go
package dns
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
nbdns "github.com/netbirdio/netbird/dns"
|
|
)
|
|
|
|
type hostManager interface {
|
|
applyDNSConfig(config HostDNSConfig) error
|
|
restoreHostDNS() error
|
|
supportCustomPort() bool
|
|
}
|
|
|
|
type HostDNSConfig struct {
|
|
Domains []DomainConfig `json:"domains"`
|
|
RouteAll bool `json:"routeAll"`
|
|
ServerIP string `json:"serverIP"`
|
|
ServerPort int `json:"serverPort"`
|
|
}
|
|
|
|
type DomainConfig struct {
|
|
Disabled bool `json:"disabled"`
|
|
Domain string `json:"domain"`
|
|
MatchOnly bool `json:"matchOnly"`
|
|
}
|
|
|
|
type mockHostConfigurator struct {
|
|
applyDNSConfigFunc func(config HostDNSConfig) error
|
|
restoreHostDNSFunc func() error
|
|
supportCustomPortFunc func() bool
|
|
}
|
|
|
|
func (m *mockHostConfigurator) applyDNSConfig(config HostDNSConfig) error {
|
|
if m.applyDNSConfigFunc != nil {
|
|
return m.applyDNSConfigFunc(config)
|
|
}
|
|
return fmt.Errorf("method applyDNSSettings is not implemented")
|
|
}
|
|
|
|
func (m *mockHostConfigurator) restoreHostDNS() error {
|
|
if m.restoreHostDNSFunc != nil {
|
|
return m.restoreHostDNSFunc()
|
|
}
|
|
return fmt.Errorf("method restoreHostDNS is not implemented")
|
|
}
|
|
|
|
func (m *mockHostConfigurator) supportCustomPort() bool {
|
|
if m.supportCustomPortFunc != nil {
|
|
return m.supportCustomPortFunc()
|
|
}
|
|
return false
|
|
}
|
|
|
|
func newNoopHostMocker() hostManager {
|
|
return &mockHostConfigurator{
|
|
applyDNSConfigFunc: func(config HostDNSConfig) error { return nil },
|
|
restoreHostDNSFunc: func() error { return nil },
|
|
supportCustomPortFunc: func() bool { return true },
|
|
}
|
|
}
|
|
|
|
func dnsConfigToHostDNSConfig(dnsConfig nbdns.Config, ip string, port int) HostDNSConfig {
|
|
config := HostDNSConfig{
|
|
RouteAll: false,
|
|
ServerIP: ip,
|
|
ServerPort: port,
|
|
}
|
|
for _, nsConfig := range dnsConfig.NameServerGroups {
|
|
if len(nsConfig.NameServers) == 0 {
|
|
continue
|
|
}
|
|
if nsConfig.Primary {
|
|
config.RouteAll = true
|
|
}
|
|
|
|
for _, domain := range nsConfig.Domains {
|
|
config.Domains = append(config.Domains, DomainConfig{
|
|
Domain: strings.TrimSuffix(domain, "."),
|
|
MatchOnly: !nsConfig.SearchDomainsEnabled,
|
|
})
|
|
}
|
|
}
|
|
|
|
for _, customZone := range dnsConfig.CustomZones {
|
|
config.Domains = append(config.Domains, DomainConfig{
|
|
Domain: strings.TrimSuffix(customZone.Domain, "."),
|
|
MatchOnly: false,
|
|
})
|
|
}
|
|
|
|
return config
|
|
}
|