Skip to content

Commit 034f1d1

Browse files
committed
chore: disallow empty proxy-server-nameserver when proxy-server-nameserver-policy is set
1 parent dede56f commit 034f1d1

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

config/config.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,6 +1408,9 @@ func parseDNS(rawCfg *RawConfig, ruleProviders map[string]P.RuleProvider) (*DNS,
14081408
if dnsCfg.ProxyServerPolicy, err = parseNameServerPolicy(cfg.ProxyServerNameserverPolicy, ruleProviders, false, cfg.PreferH3); err != nil {
14091409
return nil, err
14101410
}
1411+
if len(dnsCfg.ProxyServerPolicy) != 0 && len(dnsCfg.ProxyServerNameserver) == 0 {
1412+
return nil, errors.New("disallow empty `proxy-server-nameserver` when `proxy-server-nameserver-policy` is set")
1413+
}
14111414

14121415
if dnsCfg.DirectNameServer, err = parseNameServer(cfg.DirectNameServer, false, cfg.PreferH3); err != nil {
14131416
return nil, err

docs/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ dns:
320320
# proxy-server-nameserver:
321321
# - https://doh.pub/dns-query
322322
# - tls://223.5.5.5:853
323-
# proxy-server-nameserver-policy: # 格式同nameserver-policy,仅用于节点域名解析
323+
# proxy-server-nameserver-policy: # 格式同nameserver-policy,仅用于节点域名解析,当且仅当proxy-server-nameserver不为空时生效
324324
# 'www.yournode.com': '114.114.114.114'
325325

326326
# 专用于direct出口域名解析的 DNS 服务器,非必要配置项,如果不填则遵循nameserver-policy、nameserver和fallback的配置

0 commit comments

Comments
 (0)