From 4804de524140d024e137668f68744f66ac514891 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 5 Oct 2023 07:51:57 +0200 Subject: [PATCH 1/2] Should fix https://github.com/Ysurac/openmptcprouter/issues/2989 --- luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm index 83016ce63..0b66c1662 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm @@ -28,7 +28,7 @@ menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter" lastmodif="" allbackup=luci.model.uci.cursor():get("openmptcprouter",servername,"allbackup") for _, backup in pairs(allbackup) do - filemodif=split(backup, '|') + filemodif=luci.util.split(backup, '|') if filemodif[2] ~= lastmodif then lastmodif=filemodif[2] %> From fbcbcc80ab7f94d90a358a1f6fbb5ac6e86492bd Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 5 Oct 2023 17:45:21 +0200 Subject: [PATCH 2/2] Fix Shadowsocks Rust crypto change --- .../luasrc/controller/openmptcprouter.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index 45a55985a..299e3bd95 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -926,8 +926,8 @@ function wizard_add() ucic:set("xray","omrout","s_trojan_user_security","aes-128-gcm") ucic:set("xray","omrout","s_socks_user_security","aes-128-gcm") ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-aes-256-gcm") - ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-aes-256-gcm") - ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-aes-256-gcm") + ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm") + ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm") elseif encryption == "aes-256-cfb" then ucic:set("openmptcprouter","settings","encryption","aes-256-cfb") ucic:set("shadowsocks-libev","sss0","method","aes-256-cfb") @@ -945,15 +945,15 @@ function wizard_add() ucic:set("xray","omrout","s_trojan_user_security","aes-128-gcm") ucic:set("xray","omrout","s_socks_user_security","aes-128-gcm") ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-aes-256-gcm") - ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-aes-256-gcm") - ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-aes-256-gcm") + ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm") + ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm") elseif encryption == "chacha20-ietf-poly1305" then ucic:set("openmptcprouter","settings","encryption","chacha20") ucic:set("shadowsocks-libev","sss0","method","chacha20-ietf-poly1305") ucic:set("shadowsocks-libev","sss1","method","chacha20-ietf-poly1305") ucic:set("glorytun","vpn","chacha20","1") ucic:set("glorytun-udp","vpn","chacha","1") - ucic:set("openvpn","omr","cipher","AES-256-CBC") + ucic:set("openvpn","omr","cipher","AES-256-GCM") ucic:set("mlvpn","general","cleartext_data","0") ucic:set("v2ray","omrout","s_vmess_user_security","chacha20-poly1305") ucic:set("v2ray","omrout","s_vless_user_security","chacha20-poly1305") @@ -964,8 +964,10 @@ function wizard_add() ucic:set("xray","omrout","s_trojan_user_security","chacha20-poly1305") ucic:set("xray","omrout","s_socks_user_security","chacha20-poly1305") ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-chacha20-poly1305") - ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-chacha20-poly1305") - ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-chacha20-poly1305") + --ucic:set("shadowsocks-rust","sss0","method","2022-blake3-chacha20-poly1305") + --ucic:set("shadowsocks-rust","sss1","method","2022-blake3-chacha20-poly1305") + ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm") + ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm") else ucic:set("openmptcprouter","settings","encryption","other") end