test(predicates): restore list update signature parity & update plain list validation assertions

This commit is contained in:
Dushnilin
2026-09-16 22:54:34 +03:00
parent 61c01109ad
commit 67761143f5
7 changed files with 12 additions and 14 deletions
+2 -2
View File
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: TACHYON\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-09-16 19:41+0300\n"
"PO-Revision-Date: 2026-09-16 19:41+0300\n"
"POT-Creation-Date: 2026-09-16 19:54+0300\n"
"PO-Revision-Date: 2026-09-16 19:54+0300\n"
"Last-Translator: Dushnilin <dushnilin@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
+2 -2
View File
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: TACHYON\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-09-16 22:41+0300\n"
"PO-Revision-Date: 2026-09-16 22:41+0300\n"
"POT-Creation-Date: 2026-09-16 22:54+0300\n"
"PO-Revision-Date: 2026-09-16 22:54+0300\n"
"Last-Translator: Dushnilin\n"
"Language-Team: none\n"
"Language: ru\n"
+2 -2
View File
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: TACHYON\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-09-16 22:41+0300\n"
"PO-Revision-Date: 2026-09-16 22:41+0300\n"
"POT-Creation-Date: 2026-09-16 22:54+0300\n"
"PO-Revision-Date: 2026-09-16 22:54+0300\n"
"Last-Translator: Dushnilin\n"
"Language-Team: none\n"
"Language: ru\n"
+2 -2
View File
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: TACHYON\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-09-16 19:41+0300\n"
"PO-Revision-Date: 2026-09-16 19:41+0300\n"
"POT-Creation-Date: 2026-09-16 19:54+0300\n"
"PO-Revision-Date: 2026-09-16 19:54+0300\n"
"Last-Translator: Dushnilin <dushnilin@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
-2
View File
@@ -1253,7 +1253,6 @@ function append_list_update_signature_body(body, section) {
body = signature_add_value(body, "lists." + name + ".action", action);
if (action == "dns") {
body = signature_add_value(body, "lists." + name + ".domain_ip_lists", option(section, "domain_ip_lists", ""));
body = signature_add_value(body, "lists." + name + ".rule_set", connections.rule_sets_value(section));
return body;
}
if (action == "hosts") {
@@ -1271,7 +1270,6 @@ function append_list_update_signature_body(body, section) {
body = signature_add_value(body, "lists." + name + ".remote_subnet_lists", option(section, "remote_subnet_lists", ""));
body = signature_add_value(body, "lists." + name + ".rule_set_with_subnets", connections.rule_sets_with_subnets_value(section));
body = signature_add_value(body, "lists." + name + ".domain_ip_lists", option(section, "domain_ip_lists", ""));
body = signature_add_value(body, "lists." + name + ".rule_set", connections.rule_sets_value(section));
return body;
}
+3 -3
View File
@@ -35,12 +35,12 @@ assert_accepts "empty ruleset reference" ruleset-reference-valid "" "$COMMUNITY_
assert_accepts "community ruleset reference" ruleset-reference-valid telegram "$COMMUNITY_SERVICES"
assert_accepts "https ruleset reference" ruleset-reference-valid https://example.com/rule.srs "$COMMUNITY_SERVICES"
assert_accepts "extensionless https ruleset reference" ruleset-reference-valid https://example.com/download "$COMMUNITY_SERVICES"
assert_rejects "https plain list as ruleset reference" ruleset-reference-valid https://example.com/list.lst "$COMMUNITY_SERVICES"
assert_rejects "https plain list with query as ruleset reference" ruleset-reference-valid "https://example.com/list.txt?token=1" "$COMMUNITY_SERVICES"
assert_accepts "https plain list as ruleset reference" ruleset-reference-valid https://example.com/list.lst "$COMMUNITY_SERVICES"
assert_accepts "https plain list with query as ruleset reference" ruleset-reference-valid "https://example.com/list.txt?token=1" "$COMMUNITY_SERVICES"
assert_accepts "absolute srs ruleset reference" ruleset-reference-valid /tmp/rule.srs "$COMMUNITY_SERVICES"
assert_accepts "absolute json ruleset reference" ruleset-reference-valid /tmp/rule.json "$COMMUNITY_SERVICES"
assert_rejects "relative ruleset reference" ruleset-reference-valid relative/rule.srs "$COMMUNITY_SERVICES"
assert_rejects "plain list as ruleset reference" ruleset-reference-valid /tmp/rule.lst "$COMMUNITY_SERVICES"
assert_accepts "plain list as ruleset reference" ruleset-reference-valid /tmp/rule.lst "$COMMUNITY_SERVICES"
assert_accepts "empty plain list reference" plain-domain-ip-list-reference-valid ""
assert_accepts "https plain list reference" plain-domain-ip-list-reference-valid https://example.com/list.lst
+1 -1
View File
@@ -42,7 +42,7 @@ if (source.slice(server, requiredIndex('"dns_detour_enabled"', server)).includes
for (const expected of [
'_("DNS server used by the resolver")',
'_("DNS requests through section")',
'"Add URLs or local paths to .srs / .json lists. Subnets are ignored by default."',
'"Add URLs or local paths to .srs / .json / .lst / .txt lists. Subnets are ignored by default."',
'"Add URLs or local paths to .lst lists containing domains. IP entries are ignored."',
]) {
requiredIndex(expected);