hacker07/NeoTachyon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: dns_hosts predefined rules now fall after FakeIP/section DNS rules; fix parse_text_domains for // comments

Browse Source 
- dns_hosts and hosts cache predefined DNS rules are now appended AFTER
  section-level FakeIP routing rules, preventing third-party hosts entries
  (e.g. from Unlock AI projects) from short-circuiting FakeIP for domains
  already routed through proxy via section rules
- parse_text_domains now properly handles // comments and multi-domain
  comma-separated lines from option domain
This commit is contained in:
Dushnilin
2026-08-05 10:37:21 +03:00
parent 7b6f607257
commit a21a818ea5
2 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tachyon/files/usr/lib/singbox/dns_prefetch.uc
+15 -5
View File
@@ -118,12 +118,22 @@ function list_to_array(value) {
function parse_text_domains(text) {
let result = [];
for (let line in split(common.as_string(text), /[\n\r,\s]+/)) {
for (let line in split(common.as_string(text), /[\n\r]+/)) {
// Strip full-line comments (# or // style)
line = trim(line);
// Strip leading dots (domain_suffix style) and wildcards
line = replace(line, /^\*?\./, "");
if (line != "" && substr(line, 0, 1) != "#")
push(result, line);
if (line == "" || substr(line, 0, 1) == "#" || substr(line, 0, 2) == "//")
continue;
// Strip inline comments
line = replace(line, /[ \t]+\/\/.*$/, "");
line = replace(line, /[ \t]+#.*$/, "");
// Split by comma or whitespace for multi-domain lines
for (let token in split(line, /[,\s]+/)) {
token = trim(token);
// Strip leading dots (domain_suffix style) and wildcards
token = replace(token, /^\*?\./, "");
if (token != "" && substr(token, 0, 1) != "#" && substr(token, 0, 2) != "//")
push(result, token);
}
}
return result;
}
tachyon/files/usr/lib/singbox/generator.uc
+18 -5
View File
@@ -408,6 +408,7 @@ function base_config(settings, service_address, runtime_context) {
runtime_generate_unsupported(dns_config.unsupported);
let dns_rules = [];
let dns_hosts_predefined = [];
let raw_dns_hosts = settings["dns_hosts"];
let dns_hosts_entries = [];
@@ -429,7 +430,7 @@ function base_config(settings, service_address, runtime_context) {
for (let i = 1; i < length(parts); i++) {
let d = parts[i];
if (d != "" && substr(d, 0, 1) != "#") {
push(dns_rules, {
push(dns_hosts_predefined, {
action: "predefined",
domain: [d],
answer: [d + ". 60 IN " + rr_type + " " + ip]
@@ -440,7 +441,7 @@ function base_config(settings, service_address, runtime_context) {
let domain = p1;
let ip = p2;
let rr_type = index(ip, ":") != -1 ? "AAAA" : "A";
push(dns_rules, {
push(dns_hosts_predefined, {
action: "predefined",
domain: [domain],
answer: [domain + ". 60 IN " + rr_type + " " + ip]
@@ -471,7 +472,7 @@ function base_config(settings, service_address, runtime_context) {
for (let i = 1; i < length(parts); i++) {
let d = parts[i];
if (d != "" && substr(d, 0, 1) != "#" && index(d, ":") == -1) {
push(dns_rules, {
push(dns_hosts_predefined, {
action: "predefined",
domain: [d],
answer: [d + ". 60 IN " + rr_type + " " + ip]
@@ -483,7 +484,7 @@ function base_config(settings, service_address, runtime_context) {
let ip = p2;
if (index(domain, ":") == -1) {
let rr_type = index(ip, ":") != -1 ? "AAAA" : "A";
push(dns_rules, {
push(dns_hosts_predefined, {
action: "predefined",
domain: [domain],
answer: [domain + ". 60 IN " + rr_type + " " + ip]
@@ -569,7 +570,8 @@ function base_config(settings, service_address, runtime_context) {
store_fakeip: true
},
clash_api: clash_api_config(settings, service_address)
}
},
__dns_hosts_predefined: dns_hosts_predefined
};
}
@@ -714,6 +716,17 @@ function generate_config(output_path, service_address, mwan3_active, supports_xh
for (let section in sections)
add_route_for_section(config, section);
add_server_routes(config, servers, sections);
// Append dns_hosts predefined rules AFTER section DNS rules so that
// FakeIP/section-level DNS routing takes precedence over hardcoded IPs
// from dns_hosts or hosts cache. This prevents third-party hosts entries
// (e.g. from "Unlock AI" projects) from short-circuiting FakeIP for
// domains that are already routed through proxy via section rules.
if (type(config.__dns_hosts_predefined) == "array") {
for (let rule in config.__dns_hosts_predefined)
push(config.dns.rules, rule);
}
add_service_mixed_proxy(config, settings, sections);
for (let section in sections)
add_mixed_proxy_for_section(config, section, service_address);