allow overriding implicit defaults with the default resolver

vyzo · vyzo · commit d78cb680c746 · 2021-04-15T12:26:07.000+03:00
License: MIT
Signed-off-by: vyzo &lt;vyzo@hackzen.org&gt;
diff --git a/core/node/dns.go b/core/node/dns.go
@@ -36,6 +36,12 @@ func DNSResolver(cfg *config.Config) (*madns.Resolver, error) {
 			return nil, fmt.Errorf("invalid domain %s; must be FQDN", domain)
 		}
 
+		domains[domain] = struct{}{}
+		if url == "" {
+			// allow overriding of implicit defaults with the default resolver
+			continue
+		}
+
 		rslv, ok := rslvrs[url]
 		if !ok {
 			rslv, err = newResolver(url)
@@ -50,8 +56,6 @@ func DNSResolver(cfg *config.Config) (*madns.Resolver, error) {
 		} else {
 			opts = append(opts, madns.WithDefaultResolver(rslv))
 		}
-
-		domains[domain] = struct{}{}
 	}
 
 	// fill in defaults if not overriden by the user

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,12 @@ func DNSResolver(cfg config.Config) (madns.Resolver, error) {`
`36`	`36`	`return nil, fmt.Errorf("invalid domain %s; must be FQDN", domain)`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ domains[domain] = struct{}{}`
	`40`	`+ if url == "" {`
	`41`	`+ // allow overriding of implicit defaults with the default resolver`
	`42`	`+ continue`
	`43`	`+ }`
	`44`	`+`
`39`	`45`	`rslv, ok := rslvrs[url]`
`40`	`46`	`if !ok {`
`41`	`47`	`rslv, err = newResolver(url)`
`@@ -50,8 +56,6 @@ func DNSResolver(cfg config.Config) (madns.Resolver, error) {`
`50`	`56`	`} else {`
`51`	`57`	`opts = append(opts, madns.WithDefaultResolver(rslv))`
`52`	`58`	`}`
`53`		`-`
`54`		`- domains[domain] = struct{}{}`
`55`	`59`	`}`
`56`	`60`
`57`	`61`	`// fill in defaults if not overriden by the user`