feat: add dns.ipset_file setting

AdguardTeam · Jun 23, 2022 · e7bdbeb · e7bdbeb
1 parent ce1b2bc
commit e7bdbeb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/internal/dnsforward/config.go b/internal/dnsforward/config.go
@@ -129,7 +129,8 @@ type FilteringConfig struct {
 	//
 	//   DOMAIN[,DOMAIN].../IPSET_NAME
 	//
-	IpsetList []string `yaml:"ipset"`
+	IpsetList         []string `yaml:"ipset"`
+	IpsetListFileName string   `yaml:"ipset_file"`
 }
 
 // TLSConfig is the TLS configuration for HTTPS, DNS-over-HTTPS, and DNS-over-TLS

diff --git a/internal/dnsforward/dnsforward.go b/internal/dnsforward/dnsforward.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"os"
 	"runtime"
 	"strings"
 	"sync"
@@ -480,7 +481,21 @@ func (s *Server) Prepare(config *ServerConfig) error {
 
 	// Initialize ipset configuration
 	// --
-	err := s.ipset.init(s.conf.IpsetList)
+	var ipsets []string
+	if s.conf.IpsetListFileName != "" {
+		data, err := os.ReadFile(s.conf.IpsetListFileName)
+		if err != nil {
+			return err
+		}
+
+		ipsets = stringutil.SplitTrimmed(string(data), "\n")
+
+		log.Debug("dns: using %d ipset list from file %s", len(ipsets), s.conf.IpsetListFileName)
+	} else {
+		ipsets = s.conf.IpsetList
+	}
+
+	err := s.ipset.init(ipsets)
 	if err != nil {
 		return err
 	}