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

fix(geoip): запрет geoip_country для block/bypass/dns секций - предотвращение блокировки всего зарубежного трафика

Browse Source
This commit is contained in:
Dushnilin
2026-07-26 19:15:04 +03:00
parent b100d44fe5
commit 9c04276aac
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
luci-app-tachyon/htdocs/luci-static/resources/view/tachyon/section.js
+14
View File
@@ -8729,6 +8729,20 @@ function createSectionContent(section) {
o.default = "all";
o.rmempty = false;
o.modalonly = true;
// Only show for proxy sections - block/bypass/dns ignore geoip_country in the backend
// and a block+non-ru+invert:true rule would reject ALL foreign traffic
o.depends("action", "connection");
o.depends("action", "awg");
o.depends("action", "warp");
o.depends("action", "anytls");
o.depends("action", "snell");
o.depends("action", "mieru");
o.depends("action", "sudoku");
o.depends("action", "masque");
o.depends("action", "openvpn");
o.depends("action", "zapret");
o.depends("action", "zapret2");
o.depends("action", "byedpi");
addTextConditionField(section, {
key: "domain_suffix",
tachyon/files/usr/lib/singbox/generator_routes.uc
+15 -16
View File
@@ -1183,48 +1183,47 @@ function add_combined_route_for_section(config, section) {
route_rule.rule_set = single_or_array(rule_set_tags);
let geoip_country = option(section, "geoip_country", "all");
if (geoip_country == "non-ru") {
// Only apply GeoIP routing for proxy sections (those with an outbound).
// For block/bypass/dns sections geoip_country is meaningless and dangerous
// (e.g. block + non-ru + invert:true would reject all foreign traffic).
if (target.outbound && geoip_country == "non-ru") {
let ensured_ip = ensure_community_ruleset(config, section_name, "geoip_ru");
let ensured_site = ensure_community_ruleset(config, section_name, "geosite_ru");
let geoip_route_rule = {
action: target.action,
inbound: tproxy_inbound_matcher(),
rule_set: [ ensured_ip.tag, ensured_site.tag ],
invert: true
invert: true,
outbound: target.outbound
};
if (target.outbound)
geoip_route_rule.outbound = target.outbound;
push(config.route.rules, geoip_route_rule);
} else if (geoip_country == "ru") {
} else if (target.outbound && geoip_country == "ru") {
let ensured_ip = ensure_community_ruleset(config, section_name, "geoip_ru");
let ensured_site = ensure_community_ruleset(config, section_name, "geosite_ru");
let geoip_route_rule = {
action: target.action,
inbound: tproxy_inbound_matcher(),
rule_set: [ ensured_ip.tag, ensured_site.tag ]
rule_set: [ ensured_ip.tag, ensured_site.tag ],
outbound: target.outbound
};
if (target.outbound)
geoip_route_rule.outbound = target.outbound;
push(config.route.rules, geoip_route_rule);
} else if (geoip_country == "us") {
} else if (target.outbound && geoip_country == "us") {
let ensured_ip = ensure_community_ruleset(config, section_name, "geoip_us");
let geoip_route_rule = {
action: target.action,
inbound: tproxy_inbound_matcher(),
rule_set: [ ensured_ip.tag ]
rule_set: [ ensured_ip.tag ],
outbound: target.outbound
};
if (target.outbound)
geoip_route_rule.outbound = target.outbound;
push(config.route.rules, geoip_route_rule);
} else if (geoip_country == "cn") {
} else if (target.outbound && geoip_country == "cn") {
let ensured_ip = ensure_community_ruleset(config, section_name, "geoip_cn");
let geoip_route_rule = {
action: target.action,
inbound: tproxy_inbound_matcher(),
rule_set: [ ensured_ip.tag ]
rule_set: [ ensured_ip.tag ],
outbound: target.outbound
};
if (target.outbound)
geoip_route_rule.outbound = target.outbound;
push(config.route.rules, geoip_route_rule);
}