fix(singbox): correct http_clients detour field and clarify RKN domain list label
- fix(singbox): fix http_clients[0].detour field name (was incorrectly dial_detour, causing fatal decode config unknown field error on sing-box 1.14+) - fix(ui): rename community list 'Block' to 'Block (RKN)' / 'Реестр РКН' in DOMAIN_LIST_OPTIONS and PO catalogs to prevent confusion with parental control action 'Блокировать' - fix(ui): fix domain hint for adult content to pornhub.com in section.js - test(ruleset): update http_clients detour check in ruleset_download_detour.sh
This commit is contained in:
@@ -713,6 +713,9 @@ msgstr "BitTorrent / P2P"
|
||||
msgid "Block"
|
||||
msgstr "Блокировать"
|
||||
|
||||
msgid "Block (RKN)"
|
||||
msgstr "Реестр РКН"
|
||||
|
||||
msgid "Block / Disable in scheduled hours (Standard)"
|
||||
msgstr "Блокировать / Отключать в указанные часы (Стандарт)"
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ export const DOMAIN_LIST_OPTIONS = {
|
||||
russia_outside: 'Russia outside',
|
||||
ukraine_inside: 'Ukraine',
|
||||
geoblock: 'Geo Block',
|
||||
block: 'Block',
|
||||
block: 'Block (RKN)',
|
||||
porn: 'Porn',
|
||||
news: 'News',
|
||||
anime: 'Anime',
|
||||
|
||||
@@ -1232,7 +1232,7 @@ var DOMAIN_LIST_OPTIONS = {
|
||||
russia_outside: "Russia outside",
|
||||
ukraine_inside: "Ukraine",
|
||||
geoblock: "Geo Block",
|
||||
block: "Block",
|
||||
block: "Block (RKN)",
|
||||
porn: "Porn",
|
||||
news: "News",
|
||||
anime: "Anime",
|
||||
|
||||
@@ -7410,7 +7410,7 @@ var DOMAIN_LIST_HINTS = {
|
||||
geoblock:
|
||||
"Домены, заблокированные снаружи России (геоблокировка зарубежными сервисами)",
|
||||
block: "Домены, заблокированные внутри России (полный реестр блокировок РКН)",
|
||||
porn: "Pornhub, xvideos, xhamster, ...",
|
||||
porn: "pornhub.com, xvideos.com, xhamster.com, ...",
|
||||
news: "meduza.io, bbc.com, pravda.com.ua, ...",
|
||||
anime: "bato.to, mangadex.org, myanimelist.net, ...",
|
||||
youtube: "youtube.com, youtu.be, googlevideo.com, ...",
|
||||
|
||||
@@ -713,6 +713,9 @@ msgstr "BitTorrent / P2P"
|
||||
msgid "Block"
|
||||
msgstr "Блокировать"
|
||||
|
||||
msgid "Block (RKN)"
|
||||
msgstr "Реестр РКН"
|
||||
|
||||
msgid "Block / Disable in scheduled hours (Standard)"
|
||||
msgstr "Блокировать / Отключать в указанные часы (Стандарт)"
|
||||
|
||||
|
||||
@@ -1299,7 +1299,7 @@ function generate_config(output_path, service_address, mwan3_active, supports_xh
|
||||
if (type(config.http_clients) == "array" && length(config.http_clients) > 0) {
|
||||
let detour = download_detour_tag(settings, "lists");
|
||||
if (detour != "" && generator_routes.is_valid_detour(config, detour))
|
||||
config.http_clients[0].dial_detour = detour;
|
||||
config.http_clients[0].detour = detour;
|
||||
}
|
||||
|
||||
assert_unique_outbound_tags(config);
|
||||
|
||||
@@ -147,7 +147,7 @@ if grep -q '"download_detour": "zapret_sec-out"' "$output_zapret"; then
|
||||
fail "zapret-out must never be selected as download_detour due to routing_mark"
|
||||
fi
|
||||
|
||||
# 5. Verify mieru outbound is rejected as download_detour and http_clients dial_detour
|
||||
# 5. Verify mieru outbound is rejected as download_detour and http_clients detour
|
||||
cat >"$WORK_DIR/fixture_mieru.json" <<'JSON'
|
||||
{
|
||||
"settings": {
|
||||
@@ -186,8 +186,8 @@ SB_VERSION_STATE_FILE="$WORK_DIR/sb_v14" \
|
||||
ucode -L "$TACHYON_LIB" "$GENERATOR_UC" generate-config-fixture \
|
||||
"$WORK_DIR/fixture_mieru.json" "$output_mieru_v14" "127.0.0.1" "0" "1"
|
||||
|
||||
if grep -q '"dial_detour": "mieru_sec-out"' "$output_mieru_v14"; then
|
||||
fail "mieru outbound must never be assigned as http_clients dial_detour"
|
||||
if grep -q '"detour": "mieru_sec-out"' "$output_mieru_v14"; then
|
||||
fail "mieru outbound must never be assigned as http_clients detour"
|
||||
fi
|
||||
|
||||
printf "ruleset download detour checks passed\n"
|
||||
|
||||
Reference in New Issue
Block a user