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

fix(fuzzer): support .lua.gz scripts and correct zapret2 desync function names

Browse Source
This commit is contained in:
Dushnilin
2026-09-02 19:37:13 +03:00
parent fd629555c7
commit 963185569e
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fe-app-tachyon/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "fe-app-tachyon", "name": "fe-app-tachyon",
"version": "1.3.16", "version": "1.3.17",
"license": "MIT", "license": "MIT",
"type": "module", "type": "module",
"scripts": { "scripts": {
tachyon/files/usr/lib/components/action.uc
+7 -8
View File
@@ -2625,7 +2625,8 @@ function create_component_backup(component) {
return true; return true;
} }
else if (component == "zapret2") { else if (component == "zapret2") {
let nfqws2 = "/opt/zapret2/nfq/nfqws2"; let nfqws2 = "/opt/zapret2/nfq2/nfqws2";
if (!file_exists(nfqws2)) nfqws2 = "/opt/zapret2/nfq/nfqws2";
if (!file_exists(nfqws2)) nfqws2 = "/usr/bin/nfqws2"; if (!file_exists(nfqws2)) nfqws2 = "/usr/bin/nfqws2";
if (!file_exists(nfqws2)) return true; if (!file_exists(nfqws2)) return true;
ensure_dir(bdir); ensure_dir(bdir);
@@ -2725,13 +2726,11 @@ function rollback_component(component) {
else if (component == "zapret2") { else if (component == "zapret2") {
let backup_bin = bdir + "/nfqws2"; let backup_bin = bdir + "/nfqws2";
if (!file_exists(backup_bin)) action_fail("zapret2", "rollback", "Zapret2 backup binary is missing"); if (!file_exists(backup_bin)) action_fail("zapret2", "rollback", "Zapret2 backup binary is missing");
if (file_exists("/opt/zapret2/nfq/nfqws2")) { let dest = "/opt/zapret2/nfq2/nfqws2";
command_success_from_args([ "cp", "-p", backup_bin, "/opt/zapret2/nfq/nfqws2" ]); if (!file_exists(dest) && file_exists("/opt/zapret2/nfq/nfqws2")) dest = "/opt/zapret2/nfq/nfqws2";
command_success_from_args([ "chmod", "0755", "/opt/zapret2/nfq/nfqws2" ]); else if (!file_exists(dest) && file_exists("/usr/bin/nfqws2")) dest = "/usr/bin/nfqws2";
} else { command_success_from_args([ "cp", "-p", backup_bin, dest ]);
command_success_from_args([ "cp", "-p", backup_bin, "/usr/bin/nfqws2" ]); command_success_from_args([ "chmod", "0755", dest ]);
command_success_from_args([ "chmod", "0755", "/usr/bin/nfqws2" ]);
}
clear_version_caches(); clear_version_caches();
restart_tachyon_after_successful_change(); restart_tachyon_after_successful_change();
action_success("zapret2", "rollback", "Zapret2 rolled back to " + backup_version, backup_version, "", 1); action_success("zapret2", "rollback", "Zapret2 rolled back to " + backup_version, backup_version, "", 1);
tachyon/files/usr/lib/diagnostics/fuzzer.uc
+19 -15
View File
@@ -39,6 +39,7 @@ function get_zapret2_bin() {
return resolve_binary([ return resolve_binary([
getenv("ZAPRET2_NFQWS2_BIN"), getenv("ZAPRET2_NFQWS2_BIN"),
"/opt/zapret2/nfq2/nfqws2", "/opt/zapret2/nfq2/nfqws2",
"/opt/zapret2/nfq/nfqws2",
"/opt/zapret2/nfqws2", "/opt/zapret2/nfqws2",
"/usr/bin/nfqws2" "/usr/bin/nfqws2"
]); ]);
@@ -81,12 +82,15 @@ function get_zapret2_lua_flags(args_str) {
let lib_lua = d + "/zapret-lib.lua"; let lib_lua = d + "/zapret-lib.lua";
let antidpi_lua = d + "/zapret-antidpi.lua"; let antidpi_lua = d + "/zapret-antidpi.lua";
let auto_lua = d + "/zapret-auto.lua"; let auto_lua = d + "/zapret-auto.lua";
if (fs.stat(lib_lua) != null) flags += sprintf("--lua-init=@%s ", lib_lua); if (fs.stat(lib_lua) != null || fs.stat(lib_lua + ".gz") != null) flags += sprintf("--lua-init=@%s ", lib_lua);
if (fs.stat(antidpi_lua) != null) flags += sprintf("--lua-init=@%s ", antidpi_lua); if (fs.stat(antidpi_lua) != null || fs.stat(antidpi_lua + ".gz") != null) flags += sprintf("--lua-init=@%s ", antidpi_lua);
if (fs.stat(auto_lua) != null) flags += sprintf("--lua-init=@%s ", auto_lua); if (fs.stat(auto_lua) != null || fs.stat(auto_lua + ".gz") != null) flags += sprintf("--lua-init=@%s ", auto_lua);
if (flags != "") if (flags != "")
break; break;
} }
if (flags == "" && fs.stat("/opt/zapret2/lua") != null) {
flags = "--lua-init=@/opt/zapret2/lua/zapret-lib.lua --lua-init=@/opt/zapret2/lua/zapret-antidpi.lua --lua-init=@/opt/zapret2/lua/zapret-auto.lua ";
}
return flags; return flags;
} }
@@ -335,24 +339,24 @@ const STRATEGIES_ZAPRET2 = [
description: "High-entropy triple fragmentation for heavily filtered regions." description: "High-entropy triple fragmentation for heavily filtered regions."
}, },
{ {
id: "z2_split2_pos1", id: "z2_split_pos1",
name: "Classic Split2 (pos=1)", name: "Classic Multisplit (pos=1)",
engine: "zapret2", engine: "zapret2",
args: "--lua-desync=split2:pos=1:fooling=badseq", args: "--lua-desync=multisplit:pos=1:fooling=badseq",
description: "Standard 2-fragment desync for compatibility." description: "Standard 2-fragment multisplit desync for compatibility."
}, },
{ {
id: "z2_disorder2_pos1", id: "z2_disorder_pos1",
name: "Classic Disorder2 (pos=1)", name: "Classic Multidisorder (pos=1)",
engine: "zapret2", engine: "zapret2",
args: "--lua-desync=disorder2:pos=1:fooling=badseq", args: "--lua-desync=multidisorder:pos=1:fooling=badseq",
description: "Sends out-of-order segment with badseq fooling." description: "Sends out-of-order segment with badseq fooling."
}, },
{ {
id: "z2_fake_datanoack", id: "z2_fake_datanoack",
name: "Fake (TTL=8, DataNoAck) + Split2", name: "Fake (TTL=8, DataNoAck) + Multisplit",
engine: "zapret2", engine: "zapret2",
args: "--lua-desync=fake:ttl=8:fooling=datanoack --lua-desync=split2:pos=1", args: "--lua-desync=fake:ttl=8:fooling=datanoack --lua-desync=multisplit:pos=1",
description: "DataNoAck fooling confuses stateful DPI without triggering ACK RST." description: "DataNoAck fooling confuses stateful DPI without triggering ACK RST."
}, },
{ {
@@ -612,9 +616,9 @@ function generate_combinatorial_zapret2() {
add(sprintf("Fake (TTL=%d, %s) + Multisplit (pos=%s)", ttl, fooling, pos), add(sprintf("Fake (TTL=%d, %s) + Multisplit (pos=%s)", ttl, fooling, pos),
sprintf("--lua-desync=fake:ttl=%d:fooling=%s --lua-desync=multisplit:pos=%s", ttl, fooling, pos), sprintf("--lua-desync=fake:ttl=%d:fooling=%s --lua-desync=multisplit:pos=%s", ttl, fooling, pos),
"Low-TTL fake injection followed by multisplit payload"); "Low-TTL fake injection followed by multisplit payload");
add(sprintf("Fake (TTL=%d, %s) + Split2 (pos=%s)", ttl, fooling, pos), add(sprintf("Fake (TTL=%d, %s) + Multidisorder (pos=%s)", ttl, fooling, pos),
sprintf("--lua-desync=fake:ttl=%d:fooling=%s --lua-desync=split2:pos=%s", ttl, fooling, pos), sprintf("--lua-desync=fake:ttl=%d:fooling=%s --lua-desync=multidisorder:pos=%s", ttl, fooling, pos),
"Low-TTL fake injection followed by 2-part split"); "Low-TTL fake injection followed by multidisorder payload");
} }
} }
} }