Просмотр исходного кода

DNS outbound: Set "reject" as the default value for `nonIPQuery`

https://github.com/XTLS/Xray-core/pull/4903#issuecomment-3091367130
RPRX 10 месяцев назад
Родитель
Сommit
de23e51077
3 измененных файлов с 4 добавлено и 4 удалено
  1. 1 3
      infra/conf/dns_proxy.go
  2. 0 1
      infra/conf/dns_proxy_test.go
  3. 3 0
      proxy/dns/dns.go

+ 1 - 3
infra/conf/dns_proxy.go

@@ -28,9 +28,7 @@ func (c *DNSOutboundConfig) Build() (proto.Message, error) {
 		config.Server.Address = c.Address.Build()
 	}
 	switch c.NonIPQuery {
-	case "":
-		c.NonIPQuery = "drop"
-	case "drop", "skip", "reject":
+	case "", "reject", "drop", "skip":
 	default:
 		return nil, errors.New(`unknown "nonIPQuery": `, c.NonIPQuery)
 	}

+ 0 - 1
infra/conf/dns_proxy_test.go

@@ -27,7 +27,6 @@ func TestDnsProxyConfig(t *testing.T) {
 					Address: net.NewIPOrDomain(net.IPAddress([]byte{8, 8, 8, 8})),
 					Port:    53,
 				},
-				Non_IPQuery: "drop",
 			},
 		},
 	})

+ 3 - 0
proxy/dns/dns.go

@@ -65,6 +65,9 @@ func (h *Handler) Init(config *Config, dnsClient dns.Client, policyManager polic
 		h.server = config.Server.AsDestination()
 	}
 	h.nonIPQuery = config.Non_IPQuery
+	if h.nonIPQuery == "" {
+		h.nonIPQuery = "reject"
+	}
 	h.blockTypes = config.BlockTypes
 	return nil
 }