Pull request: all: support multiple dns hosts

Updates #1401. Squashed commit of the following: commit a18c3f062a88ad7d7fbfacaedb893f1ca660b6dc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 22 21:55:26 2021 +0300 home: imp code commit 2b4a28cbf379fbc5fb168af6d8d078cab2b8bd64 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 22 20:55:08 2021 +0300 all: rm unused field commit 5766a97dafff4acff6b909eb6303459f7991c81e Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 22 16:40:14 2021 +0300 all: support multiple dns hosts
2021-03-23 12:32:07 +03:00
parent 3b2f5d7842
commit 5d0d32b926
11 changed files with 272 additions and 196 deletions
--- a/internal/home/config.go
+++ b/internal/home/config.go
@@ -76,8 +76,8 @@ type configuration struct {

 // field ordering is important -- yaml fields will mirror ordering from here
 type dnsConfig struct {
-	BindHost net.IP `yaml:"bind_host"`
-	Port     int    `yaml:"port"`
+	BindHosts []net.IP `yaml:"bind_hosts"`
+	Port      int      `yaml:"port"`

 	// time interval for statistics (in days)
 	StatsInterval uint32 `yaml:"statistics_interval"`
@@ -101,7 +101,7 @@ type tlsConfigSettings struct {
 	ForceHTTPS      bool   `yaml:"force_https" json:"force_https,omitempty"`               // ForceHTTPS: if true, forces HTTP->HTTPS redirect
 	PortHTTPS       int    `yaml:"port_https" json:"port_https,omitempty"`                 // HTTPS port. If 0, HTTPS will be disabled
 	PortDNSOverTLS  int    `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"`   // DNS-over-TLS port. If 0, DOT will be disabled
-	PortDNSOverQUIC uint16 `yaml:"port_dns_over_quic" json:"port_dns_over_quic,omitempty"` // DNS-over-QUIC port. If 0, DoQ will be disabled
+	PortDNSOverQUIC int    `yaml:"port_dns_over_quic" json:"port_dns_over_quic,omitempty"` // DNS-over-QUIC port. If 0, DoQ will be disabled

 	// PortDNSCrypt is the port for DNSCrypt requests.  If it's zero,
 	// DNSCrypt is disabled.
@@ -125,7 +125,7 @@ var config = configuration{
 	BetaBindPort: 0,
 	BindHost:     net.IP{0, 0, 0, 0},
 	DNS: dnsConfig{
-		BindHost:      net.IP{0, 0, 0, 0},
+		BindHosts:     []net.IP{{0, 0, 0, 0}},
 		Port:          53,
 		StatsInterval: 1,
 		FilteringConfig: dnsforward.FilteringConfig{
--- a/internal/home/controlinstall.go
+++ b/internal/home/controlinstall.go
@@ -17,7 +17,6 @@ import (

 	"github.com/AdguardTeam/AdGuardHome/internal/agherr"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
-
 	"github.com/AdguardTeam/golibs/log"
 )

@@ -264,7 +263,7 @@ func copyInstallSettings(dst, src *configuration) {
 	dst.BindHost = src.BindHost
 	dst.BindPort = src.BindPort
 	dst.BetaBindPort = src.BetaBindPort
-	dst.DNS.BindHost = src.DNS.BindHost
+	dst.DNS.BindHosts = src.DNS.BindHosts
 	dst.DNS.Port = src.DNS.Port
 }

@@ -335,7 +334,7 @@ func (web *Web) handleInstallConfigure(w http.ResponseWriter, r *http.Request) {
 	Context.firstRun = false
 	config.BindHost = newSettings.Web.IP
 	config.BindPort = newSettings.Web.Port
-	config.DNS.BindHost = newSettings.DNS.IP
+	config.DNS.BindHosts = []net.IP{newSettings.DNS.IP}
 	config.DNS.Port = newSettings.DNS.Port

 	// TODO(e.burkov): StartMods() should be put in a separate goroutine at
--- a/internal/home/dns.go
+++ b/internal/home/dns.go
@@ -56,11 +56,6 @@ func initDNSServer() error {
 	Context.queryLog = querylog.New(conf)

 	filterConf := config.DNS.DnsfilterConf
-	bindhost := config.DNS.BindHost
-	if config.DNS.BindHost.IsUnspecified() {
-		bindhost = net.IPv4(127, 0, 0, 1)
-	}
-	filterConf.ResolverAddress = net.JoinHostPort(bindhost.String(), strconv.Itoa(config.DNS.Port))
 	filterConf.AutoHosts = &Context.autoHosts
 	filterConf.ConfigModified = onConfigModified
 	filterConf.HTTPRegister = httpRegister
@@ -114,11 +109,51 @@ func onDNSRequest(d *proxy.DNSContext) {
 	}
 }

-func generateServerConfig() (newconfig dnsforward.ServerConfig, err error) {
-	newconfig = dnsforward.ServerConfig{
-		UDPListenAddr:   &net.UDPAddr{IP: config.DNS.BindHost, Port: config.DNS.Port},
-		TCPListenAddr:   &net.TCPAddr{IP: config.DNS.BindHost, Port: config.DNS.Port},
-		FilteringConfig: config.DNS.FilteringConfig,
+func ipsToTCPAddrs(ips []net.IP, port int) (tcpAddrs []*net.TCPAddr) {
+	if ips == nil {
+		return nil
+	}
+
+	tcpAddrs = make([]*net.TCPAddr, len(ips))
+	for i, ip := range ips {
+		tcpAddrs[i] = &net.TCPAddr{
+			IP:   ip,
+			Port: port,
+		}
+	}
+
+	return tcpAddrs
+}
+
+func ipsToUDPAddrs(ips []net.IP, port int) (udpAddrs []*net.UDPAddr) {
+	if ips == nil {
+		return nil
+	}
+
+	udpAddrs = make([]*net.UDPAddr, len(ips))
+	for i, ip := range ips {
+		udpAddrs[i] = &net.UDPAddr{
+			IP:   ip,
+			Port: port,
+		}
+	}
+
+	return udpAddrs
+}
+
+func generateServerConfig() (newConf dnsforward.ServerConfig, err error) {
+	dnsConf := config.DNS
+	hosts := dnsConf.BindHosts
+	for i, h := range hosts {
+		if h.IsUnspecified() {
+			hosts[i] = net.IP{127, 0, 0, 1}
+		}
+	}
+
+	newConf = dnsforward.ServerConfig{
+		UDPListenAddrs:  ipsToUDPAddrs(hosts, dnsConf.Port),
+		TCPListenAddrs:  ipsToTCPAddrs(hosts, dnsConf.Port),
+		FilteringConfig: dnsConf.FilteringConfig,
 		ConfigModified:  onConfigModified,
 		HTTPRegister:    httpRegister,
 		OnDNSRequest:    onDNSRequest,
@@ -127,25 +162,19 @@ func generateServerConfig() (newconfig dnsforward.ServerConfig, err error) {
 	tlsConf := tlsConfigSettings{}
 	Context.tls.WriteDiskConfig(&tlsConf)
 	if tlsConf.Enabled {
-		newconfig.TLSConfig = tlsConf.TLSConfig
-		newconfig.TLSConfig.ServerName = tlsConf.ServerName
+		newConf.TLSConfig = tlsConf.TLSConfig
+		newConf.TLSConfig.ServerName = tlsConf.ServerName

 		if tlsConf.PortDNSOverTLS != 0 {
-			newconfig.TLSListenAddr = &net.TCPAddr{
-				IP:   config.DNS.BindHost,
-				Port: tlsConf.PortDNSOverTLS,
-			}
+			newConf.TLSListenAddrs = ipsToTCPAddrs(hosts, tlsConf.PortDNSOverTLS)
 		}

 		if tlsConf.PortDNSOverQUIC != 0 {
-			newconfig.QUICListenAddr = &net.UDPAddr{
-				IP:   config.DNS.BindHost,
-				Port: int(tlsConf.PortDNSOverQUIC),
-			}
+			newConf.QUICListenAddrs = ipsToUDPAddrs(hosts, tlsConf.PortDNSOverQUIC)
 		}

 		if tlsConf.PortDNSCrypt != 0 {
-			newconfig.DNSCryptConfig, err = newDNSCrypt(config.DNS.BindHost, tlsConf)
+			newConf.DNSCryptConfig, err = newDNSCrypt(hosts, tlsConf)
 			if err != nil {
 				// Don't wrap the error, because it's already
 				// wrapped by newDNSCrypt.
@@ -154,17 +183,17 @@ func generateServerConfig() (newconfig dnsforward.ServerConfig, err error) {
 		}
 	}

-	newconfig.TLSv12Roots = Context.tlsRoots
-	newconfig.TLSCiphers = Context.tlsCiphers
-	newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH
+	newConf.TLSv12Roots = Context.tlsRoots
+	newConf.TLSCiphers = Context.tlsCiphers
+	newConf.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH

-	newconfig.FilterHandler = applyAdditionalFiltering
-	newconfig.GetCustomUpstreamByClient = Context.clients.FindUpstreams
+	newConf.FilterHandler = applyAdditionalFiltering
+	newConf.GetCustomUpstreamByClient = Context.clients.FindUpstreams

-	return newconfig, nil
+	return newConf, nil
 }

-func newDNSCrypt(bindHost net.IP, tlsConf tlsConfigSettings) (dnscc dnsforward.DNSCryptConfig, err error) {
+func newDNSCrypt(hosts []net.IP, tlsConf tlsConfigSettings) (dnscc dnsforward.DNSCryptConfig, err error) {
 	if tlsConf.DNSCryptConfigFile == "" {
 		return dnscc, agherr.Error("no dnscrypt_config_file")
 	}
@@ -186,21 +215,12 @@ func newDNSCrypt(bindHost net.IP, tlsConf tlsConfigSettings) (dnscc dnsforward.D
 		return dnscc, fmt.Errorf("creating dnscrypt cert: %w", err)
 	}

-	udpAddr := &net.UDPAddr{
-		IP:   bindHost,
-		Port: tlsConf.PortDNSCrypt,
-	}
-	tcpAddr := &net.TCPAddr{
-		IP:   bindHost,
-		Port: tlsConf.PortDNSCrypt,
-	}
-
 	return dnsforward.DNSCryptConfig{
-		UDPListenAddr: udpAddr,
-		TCPListenAddr: tcpAddr,
-		ResolverCert:  cert,
-		ProviderName:  rc.ProviderName,
-		Enabled:       true,
+		UDPListenAddrs: ipsToUDPAddrs(hosts, tlsConf.PortDNSCrypt),
+		TCPListenAddrs: ipsToTCPAddrs(hosts, tlsConf.PortDNSCrypt),
+		ResolverCert:   cert,
+		ProviderName:   rc.ProviderName,
+		Enabled:        true,
 	}, nil
 }

@@ -249,10 +269,8 @@ func getDNSEncryption() (de dnsEncryption) {
 }

 // Get the list of DNS addresses the server is listening on
-func getDNSAddresses() []string {
-	dnsAddresses := []string{}
-
-	if config.DNS.BindHost.IsUnspecified() {
+func getDNSAddresses() (dnsAddrs []string) {
+	if hosts := config.DNS.BindHosts; len(hosts) == 0 || hosts[0].IsUnspecified() {
 		ifaces, e := aghnet.GetValidNetInterfacesForWeb()
 		if e != nil {
 			log.Error("Couldn't get network interfaces: %v", e)
@@ -261,25 +279,29 @@ func getDNSAddresses() []string {

 		for _, iface := range ifaces {
 			for _, addr := range iface.Addresses {
-				addDNSAddress(&dnsAddresses, addr)
+				addDNSAddress(&dnsAddrs, addr)
 			}
 		}
 	} else {
-		addDNSAddress(&dnsAddresses, config.DNS.BindHost)
+		for _, h := range hosts {
+			addDNSAddress(&dnsAddrs, h)
+		}
 	}

 	de := getDNSEncryption()
 	if de.https != "" {
-		dnsAddresses = append(dnsAddresses, de.https)
-	}
-	if de.tls != "" {
-		dnsAddresses = append(dnsAddresses, de.tls)
-	}
-	if de.quic != "" {
-		dnsAddresses = append(dnsAddresses, de.quic)
+		dnsAddrs = append(dnsAddrs, de.https)
 	}

-	return dnsAddresses
+	if de.tls != "" {
+		dnsAddrs = append(dnsAddrs, de.tls)
+	}
+
+	if de.quic != "" {
+		dnsAddrs = append(dnsAddrs, de.quic)
+	}
+
+	return dnsAddrs
 }

 // applyAdditionalFiltering adds additional client information and settings if
@@ -353,13 +375,13 @@ func startDNSServer() error {
 }

 func reconfigureDNSServer() (err error) {
-	var newconfig dnsforward.ServerConfig
-	newconfig, err = generateServerConfig()
+	var newConf dnsforward.ServerConfig
+	newConf, err = generateServerConfig()
 	if err != nil {
 		return fmt.Errorf("generating forwarding dns server config: %w", err)
 	}

-	err = Context.dnsServer.Reconfigure(&newconfig)
+	err = Context.dnsServer.Reconfigure(&newConf)
 	if err != nil {
 		return fmt.Errorf("starting forwarding dns server: %w", err)
 	}
--- a/internal/home/upgrade.go
+++ b/internal/home/upgrade.go
@@ -13,12 +13,20 @@ import (
 	yaml "gopkg.in/yaml.v2"
 )

-const currentSchemaVersion = 7 // used for upgrading from old configs to new config
+// currentSchemaVersion is the current schema version.
+const currentSchemaVersion = 8
+
+// These aliases are provided for convenience.
+type (
+	any  = interface{}
+	yarr = []any
+	yobj = map[any]any
+)

 // Performs necessary upgrade operations if needed
 func upgradeConfig() error {
 	// read a config file into an interface map, so we can manipulate values without losing any
-	diskConfig := map[string]interface{}{}
+	diskConfig := yobj{}
 	body, err := readConfigFile()
 	if err != nil {
 		return err
@@ -53,7 +61,7 @@ func upgradeConfig() error {
 }

 // Upgrade from oldVersion to newVersion
-func upgradeConfigSchema(oldVersion int, diskConfig *map[string]interface{}) error {
+func upgradeConfigSchema(oldVersion int, diskConfig *yobj) error {
 	switch oldVersion {
 	case 0:
 		err := upgradeSchema0to1(diskConfig)
@@ -96,6 +104,11 @@ func upgradeConfigSchema(oldVersion int, diskConfig *map[string]interface{}) err
 		if err != nil {
 			return err
 		}
+	case 7:
+		err := upgradeSchema7to8(diskConfig)
+		if err != nil {
+			return err
+		}
 	default:
 		err := fmt.Errorf("configuration file contains unknown schema_version, abort")
 		log.Println(err)
@@ -121,7 +134,7 @@ func upgradeConfigSchema(oldVersion int, diskConfig *map[string]interface{}) err

 // The first schema upgrade:
 // No more "dnsfilter.txt", filters are now kept in data/filters/
-func upgradeSchema0to1(diskConfig *map[string]interface{}) error {
+func upgradeSchema0to1(diskConfig *yobj) error {
 	log.Printf("%s(): called", funcName())

 	dnsFilterPath := filepath.Join(Context.workDir, "dnsfilter.txt")
@@ -142,7 +155,7 @@ func upgradeSchema0to1(diskConfig *map[string]interface{}) error {
 // Second schema upgrade:
 // coredns is now dns in config
 // delete 'Corefile', since we don't use that anymore
-func upgradeSchema1to2(diskConfig *map[string]interface{}) error {
+func upgradeSchema1to2(diskConfig *yobj) error {
 	log.Printf("%s(): called", funcName())

 	coreFilePath := filepath.Join(Context.workDir, "Corefile")
@@ -166,7 +179,7 @@ func upgradeSchema1to2(diskConfig *map[string]interface{}) error {

 // Third schema upgrade:
 // Bootstrap DNS becomes an array
-func upgradeSchema2to3(diskConfig *map[string]interface{}) error {
+func upgradeSchema2to3(diskConfig *yobj) error {
 	log.Printf("%s(): called", funcName())

 	// Let's read dns configuration from diskConfig
@@ -175,8 +188,8 @@ func upgradeSchema2to3(diskConfig *map[string]interface{}) error {
 		return fmt.Errorf("no DNS configuration in config file")
 	}

-	// Convert interface{} to map[string]interface{}
-	newDNSConfig := make(map[string]interface{})
+	// Convert interface{} to yobj
+	newDNSConfig := make(yobj)

 	switch v := dnsConfig.(type) {
 	case map[interface{}]interface{}:
@@ -204,7 +217,7 @@ func upgradeSchema2to3(diskConfig *map[string]interface{}) error {
 }

 // Add use_global_blocked_services=true setting for existing "clients" array
-func upgradeSchema3to4(diskConfig *map[string]interface{}) error {
+func upgradeSchema3to4(diskConfig *yobj) error {
 	log.Printf("%s(): called", funcName())

 	(*diskConfig)["schema_version"] = 4
@@ -240,7 +253,7 @@ func upgradeSchema3to4(diskConfig *map[string]interface{}) error {
 // - name: "..."
 //   password: "..."
 // ...
-func upgradeSchema4to5(diskConfig *map[string]interface{}) error {
+func upgradeSchema4to5(diskConfig *yobj) error {
 	log.Printf("%s(): called", funcName())

 	(*diskConfig)["schema_version"] = 5
@@ -295,7 +308,7 @@ func upgradeSchema4to5(diskConfig *map[string]interface{}) error {
 //   ids:
 //   - 127.0.0.1
 //   - ...
-func upgradeSchema5to6(diskConfig *map[string]interface{}) error {
+func upgradeSchema5to6(diskConfig *yobj) error {
 	log.Printf("%s(): called", funcName())

 	(*diskConfig)["schema_version"] = 6
@@ -365,7 +378,7 @@ func upgradeSchema5to6(diskConfig *map[string]interface{}) error {
 //   dhcpv4:
 //     gateway_ip: 192.168.56.1
 //     ...
-func upgradeSchema6to7(diskConfig *map[string]interface{}) error {
+func upgradeSchema6to7(diskConfig *yobj) error {
 	log.Printf("Upgrade yaml: 6 to 7")

 	(*diskConfig)["schema_version"] = 7
@@ -384,7 +397,7 @@ func upgradeSchema6to7(diskConfig *map[string]interface{}) error {
 			return nil
 		}

-		dhcpv4 := map[string]interface{}{
+		dhcpv4 := yobj{
 			"gateway_ip": str,
 		}
 		delete(dhcp, "gateway_ip")
@@ -438,6 +451,44 @@ func upgradeSchema6to7(diskConfig *map[string]interface{}) error {
 	return nil
 }

+// upgradeSchema7to8 performs the following changes:
+//
+//   # BEFORE:
+//   'dns':
+//     'bind_host': '127.0.0.1'
+//
+//   # AFTER:
+//   'dns':
+//     'bind_hosts':
+//     - '127.0.0.1'
+//
+func upgradeSchema7to8(diskConfig *yobj) (err error) {
+	log.Printf("Upgrade yaml: 7 to 8")
+
+	(*diskConfig)["schema_version"] = 8
+
+	dnsVal, ok := (*diskConfig)["dns"]
+	if !ok {
+		return nil
+	}
+
+	dns, ok := dnsVal.(yobj)
+	if !ok {
+		return fmt.Errorf("unexpected type of dns: %T", dnsVal)
+	}
+
+	bindHostVal := dns["bind_host"]
+	bindHost, ok := bindHostVal.(string)
+	if !ok {
+		return fmt.Errorf("undexpected type of dns.bind_host: %T", bindHostVal)
+	}
+
+	delete(dns, "bind_host")
+	dns["bind_hosts"] = yarr{bindHost}
+
+	return nil
+}
+
 // TODO(a.garipov): Replace with log.Output when we port it to our logging
 // package.
 func funcName() string {
--- a/internal/home/upgrade_test.go
+++ b/internal/home/upgrade_test.go
@@ -1,18 +1,13 @@
 package home

 import (
-	"fmt"
 	"testing"

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

-// any is a convenient alias for interface{}.
-type any = interface{}
-
-// object is a convenient alias for map[string]interface{}.
-type object = map[string]any
+// TODO(a.garipov): Cover all migrations, use a testdata/ dir.

 func TestUpgradeSchema1to2(t *testing.T) {
 	diskConf := testDiskConf(1)
@@ -25,11 +20,10 @@ func TestUpgradeSchema1to2(t *testing.T) {
 	_, ok := diskConf["coredns"]
 	require.False(t, ok)

-	dnsMap, ok := diskConf["dns"]
+	newDNSConf, ok := diskConf["dns"]
 	require.True(t, ok)

-	oldDNSConf := convertToObject(t, testDNSConf(1))
-	newDNSConf := convertToObject(t, dnsMap)
+	oldDNSConf := testDNSConf(1)
 	assert.Equal(t, oldDNSConf, newDNSConf)

 	oldExcludedEntries := []string{"coredns", "schema_version"}
@@ -49,7 +43,9 @@ func TestUpgradeSchema2to3(t *testing.T) {
 	dnsMap, ok := diskConf["dns"]
 	require.True(t, ok)

-	newDNSConf := convertToObject(t, dnsMap)
+	newDNSConf, ok := dnsMap.(yobj)
+	require.True(t, ok)
+
 	bootstrapDNS := newDNSConf["bootstrap_dns"]
 	switch v := bootstrapDNS.(type) {
 	case []string:
@@ -60,7 +56,7 @@ func TestUpgradeSchema2to3(t *testing.T) {
 	}

 	excludedEntries := []string{"bootstrap_dns"}
-	oldDNSConf := convertToObject(t, testDNSConf(2))
+	oldDNSConf := testDNSConf(2)
 	assertEqualExcept(t, oldDNSConf, newDNSConf, excludedEntries, excludedEntries)

 	excludedEntries = []string{"dns", "schema_version"}
@@ -68,29 +64,34 @@ func TestUpgradeSchema2to3(t *testing.T) {
 	assertEqualExcept(t, oldDiskConf, diskConf, excludedEntries, excludedEntries)
 }

-func convertToObject(t *testing.T, oldConf any) (newConf object) {
-	t.Helper()
-
-	switch v := oldConf.(type) {
-	case map[any]any:
-		newConf = make(object, len(v))
-		for key, value := range v {
-			newConf[fmt.Sprint(key)] = value
-		}
-	case object:
-		newConf = make(object, len(v))
-		for key, value := range v {
-			newConf[key] = value
-		}
-	default:
-		t.Fatalf("dns configuration is not a map, got %T", oldConf)
+func TestUpgradeSchema7to8(t *testing.T) {
+	const host = "1.2.3.4"
+	oldConf := yobj{
+		"dns": yobj{
+			"bind_host": host,
+		},
+		"schema_version": 7,
 	}

-	return newConf
+	err := upgradeSchema7to8(&oldConf)
+	require.Nil(t, err)
+
+	require.Equal(t, oldConf["schema_version"], 8)
+
+	dnsVal, ok := oldConf["dns"]
+	require.True(t, ok)
+
+	newDNSConf, ok := dnsVal.(yobj)
+	require.True(t, ok)
+
+	newBindHosts, ok := newDNSConf["bind_hosts"].(yarr)
+	require.True(t, ok)
+	require.Len(t, newBindHosts, 1)
+	assert.Equal(t, host, newBindHosts[0])
 }

 // assertEqualExcept removes entries from configs and compares them.
-func assertEqualExcept(t *testing.T, oldConf, newConf object, oldKeys, newKeys []string) {
+func assertEqualExcept(t *testing.T, oldConf, newConf yobj, oldKeys, newKeys []string) {
 	t.Helper()

 	for _, k := range oldKeys {
@@ -103,20 +104,17 @@ func assertEqualExcept(t *testing.T, oldConf, newConf object, oldKeys, newKeys [
 	assert.Equal(t, oldConf, newConf)
 }

-func testDiskConf(schemaVersion int) (diskConf object) {
-	filters := []filter{
-		{
-			URL:        "https://filters.adtidy.org/android/filters/111_optimized.txt",
-			Name:       "Latvian filter",
-			RulesCount: 100,
-		},
-		{
-			URL:        "https://easylist.to/easylistgermany/easylistgermany.txt",
-			Name:       "Germany filter",
-			RulesCount: 200,
-		},
-	}
-	diskConf = object{
+func testDiskConf(schemaVersion int) (diskConf yobj) {
+	filters := []filter{{
+		URL:        "https://filters.adtidy.org/android/filters/111_optimized.txt",
+		Name:       "Latvian filter",
+		RulesCount: 100,
+	}, {
+		URL:        "https://easylist.to/easylistgermany/easylistgermany.txt",
+		Name:       "Germany filter",
+		RulesCount: 200,
+	}}
+	diskConf = yobj{
 		"language":       "en",
 		"filters":        filters,
 		"user_rules":     []string{},
@@ -139,8 +137,8 @@ func testDiskConf(schemaVersion int) (diskConf object) {

 // testDNSConf creates a DNS config for test the way gopkg.in/yaml.v2 would
 // unmarshal it.  In YAML, keys aren't guaranteed to always only be strings.
-func testDNSConf(schemaVersion int) (dnsConf map[any]any) {
-	dnsConf = map[any]any{
+func testDNSConf(schemaVersion int) (dnsConf yobj) {
+	dnsConf = yobj{
 		"port":                 53,
 		"blocked_response_ttl": 10,
 		"querylog_enabled":     true,