vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 02:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #220 from safing/feature/configurable-nameserver-listen-address

Browse source 
Make DNS Server listen address configurable
This commit is contained in:
Daniel 2020-12-21 19:18:26 +01:00 • committed by GitHub
commit 1e6ed33101
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 69 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
nameserver/config.go Normal file
View file

@ -0,0 +1,61 @@
package nameserver
import (
"flag"
"github.com/safing/portbase/config"
"github.com/safing/portbase/log"
)
// Config Keys
const (
CfgDefaultNameserverAddressKey = "dns/listenAddress"
)
var (
nameserverAddressFlag string
nameserverAddressConfig config.StringOption
)
func init() {
flag.StringVar(&nameserverAddressFlag, "nameserver-address", "", "override nameserver listen address")
}
func logFlagOverrides() {
if nameserverAddressFlag != "" {
log.Warning("nameserver: dns/listenAddress default config is being overridden by the -nameserver-address flag")
}
}
func getDefaultNameserverAddress() string {
// check if overridden
if nameserverAddressFlag != "" {
return nameserverAddressFlag
}
// return internal default
return defaultNameserverAddress
}
func registerConfig() error {
err := config.Register(&config.Option{
Name: "Internal DNS Server Listen Address",
Key: CfgDefaultNameserverAddressKey,
Description: "Defines the IP address and port on which the internal DNS Server listens.",
OptType: config.OptTypeString,
ExpertiseLevel: config.ExpertiseLevelDeveloper,
ReleaseLevel: config.ReleaseLevelStable,
DefaultValue: getDefaultNameserverAddress(),
ValidationRegex: "^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:[0-9]{1,5}|\\[[:0-9A-Fa-f]+\\]:[0-9]{1,5})$",
RequiresRestart: true,
Annotations: config.Annotations{
config.DisplayOrderAnnotation: 514,
config.CategoryAnnotation: "Development",
},
})
if err != nil {
return err
}
nameserverAddressConfig = config.GetAsString(CfgDefaultNameserverAddressKey, getDefaultNameserverAddress())
return nil
}

11
nameserver/nameserver.go
View file

@ -26,11 +26,11 @@ var (
module *modules.Module
dnsServer *dns.Server
listenAddress = "0.0.0.0:53"
defaultNameserverAddress = "0.0.0.0:53"
)
func init() {
module = modules.Register("nameserver", nil, start, stop, "core", "resolver")
module = modules.Register("nameserver", prep, start, stop, "core", "resolver")
subsystems.Register(
"dns",
"Secure DNS",
@ -41,8 +41,13 @@ func init() {
)
}
func prep() error {
return registerConfig()
}
func start() error {
dnsServer = &dns.Server{Addr: listenAddress, Net: "udp"}
logFlagOverrides()
dnsServer = &dns.Server{Addr: nameserverAddressConfig(), Net: "udp"}
dns.HandleFunc(".", handleRequestAsWorker)
module.StartServiceWorker("dns resolver", 0, func(ctx context.Context) error {