mirror of
https://github.com/netbirdio/netbird.git
synced 2026-07-23 17:01:29 +02:00
a4d0f242b4
- Use netip.Addr instead of string IPs in the local resolver's PeerConnectivity and PeerActivator interfaces; extract record addresses as netip.Addr (v4-mapped forms unmapped) and convert to string only at the peer.Status boundary. - Scope warm-up to match-only (non-authoritative) zones so the synthesized private-service records keep warming while plain peer-name lookups in the authoritative peer zone no longer wake every idle peer. - Parse NB_DNS_LAZY_WARMUP_TIMEOUT once in the resolver constructor instead of on every request, and log invalid values. - Stop reusing engine.syncMsgMux on the DNS path: ConnMgr.ActivatePeer is now safe for concurrent use (lazy manager pointer guarded by a dedicated RWMutex; the manager itself is internally synchronized), so network-map processing no longer blocks DNS resolution. - Add SetPeerActivator to the dns.Server interface (no-op on the mock) and drop the *dns.DefaultServer type assertion in the engine. - Drop WireGuard wording from dns/local comments; the layer is transport-agnostic. Tests: authoritative zones never trigger warm-up; warm-up timeout env parsing (valid/invalid/non-positive); extractRecordAddr unmaps v4-mapped record data; dnsPeerActivator skips connected/unknown/ conn-less peers, returns on connect, and releases at the budget when the peer stays idle; ConnMgr.ActivatePeer races the manager lifecycle cleanly under -race.
115 lines
3.1 KiB
Go
115 lines
3.1 KiB
Go
package dns
|
|
|
|
import (
|
|
"fmt"
|
|
"net/netip"
|
|
"net/url"
|
|
|
|
"github.com/miekg/dns"
|
|
|
|
dnsconfig "github.com/netbirdio/netbird/client/internal/dns/config"
|
|
"github.com/netbirdio/netbird/client/internal/dns/local"
|
|
nbdns "github.com/netbirdio/netbird/dns"
|
|
"github.com/netbirdio/netbird/route"
|
|
"github.com/netbirdio/netbird/shared/management/domain"
|
|
)
|
|
|
|
// MockServer is the mock instance of a dns server
|
|
type MockServer struct {
|
|
InitializeFunc func() error
|
|
StopFunc func()
|
|
UpdateDNSServerFunc func(serial uint64, update nbdns.Config) error
|
|
RegisterHandlerFunc func(domain.List, dns.Handler, int)
|
|
DeregisterHandlerFunc func(domain.List, int)
|
|
UpdateServerConfigFunc func(domains dnsconfig.ServerDomains) error
|
|
}
|
|
|
|
func (m *MockServer) RegisterHandler(domains domain.List, handler dns.Handler, priority int) {
|
|
if m.RegisterHandlerFunc != nil {
|
|
m.RegisterHandlerFunc(domains, handler, priority)
|
|
}
|
|
}
|
|
|
|
func (m *MockServer) DeregisterHandler(domains domain.List, priority int) {
|
|
if m.DeregisterHandlerFunc != nil {
|
|
m.DeregisterHandlerFunc(domains, priority)
|
|
}
|
|
}
|
|
|
|
// Initialize mock implementation of Initialize from Server interface
|
|
func (m *MockServer) Initialize() error {
|
|
if m.InitializeFunc != nil {
|
|
return m.InitializeFunc()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Stop mock implementation of Stop from Server interface
|
|
func (m *MockServer) Stop() {
|
|
if m.StopFunc != nil {
|
|
m.StopFunc()
|
|
}
|
|
}
|
|
|
|
func (m *MockServer) DnsIP() netip.Addr {
|
|
return netip.MustParseAddr("100.10.254.255")
|
|
}
|
|
|
|
func (m *MockServer) OnUpdatedHostDNSServer(addrs []netip.AddrPort) {
|
|
// TODO implement me
|
|
panic("implement me")
|
|
}
|
|
|
|
// UpdateDNSServer mock implementation of UpdateDNSServer from Server interface
|
|
func (m *MockServer) UpdateDNSServer(serial uint64, update nbdns.Config) error {
|
|
if m.UpdateDNSServerFunc != nil {
|
|
return m.UpdateDNSServerFunc(serial, update)
|
|
}
|
|
return fmt.Errorf("method UpdateDNSServer is not implemented")
|
|
}
|
|
|
|
func (m *MockServer) SearchDomains() []string {
|
|
return make([]string, 0)
|
|
}
|
|
|
|
func (m *MockServer) UpdateServerConfig(domains dnsconfig.ServerDomains) error {
|
|
if m.UpdateServerConfigFunc != nil {
|
|
return m.UpdateServerConfigFunc(domains)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (m *MockServer) PopulateManagementDomain(mgmtURL *url.URL) error {
|
|
return nil
|
|
}
|
|
|
|
// SetRouteSources mock implementation of SetRouteSources from Server interface
|
|
func (m *MockServer) SetRouteSources(selected, active func() route.HAMap) {
|
|
// Mock implementation - no-op
|
|
}
|
|
|
|
// SetFirewall mock implementation of SetFirewall from Server interface
|
|
func (m *MockServer) SetFirewall(Firewall) {
|
|
// Mock implementation - no-op
|
|
}
|
|
|
|
// SetPeerActivator mock implementation of SetPeerActivator from Server interface
|
|
func (m *MockServer) SetPeerActivator(local.PeerActivator) {
|
|
// Mock implementation - no-op
|
|
}
|
|
|
|
// BeginBatch mock implementation of BeginBatch from Server interface
|
|
func (m *MockServer) BeginBatch() {
|
|
// Mock implementation - no-op
|
|
}
|
|
|
|
// EndBatch mock implementation of EndBatch from Server interface
|
|
func (m *MockServer) EndBatch() {
|
|
// Mock implementation - no-op
|
|
}
|
|
|
|
// CancelBatch mock implementation of CancelBatch from Server interface
|
|
func (m *MockServer) CancelBatch() {
|
|
// Mock implementation - no-op
|
|
}
|