mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Add cleartext support for mlvpn

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-03-05 21:19:49 +01:00
parent c3ff485c06
commit 23fb2cf5e5
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js
View file

@ -46,8 +46,8 @@ return L.view.extend({
o.rmempty = false; o.rmempty = false;
o = s.taboption('general', form.Value, 'firstport', _('First Port')); o = s.taboption('general', form.Value, 'firstport', _('First Port'));
o.default = "65201" o.default = "65201";
o.datatype = "port" o.datatype = "port";
o.rmempty = false; o.rmempty = false;
o = s.taboption('general', form.Value, 'password', _('Password')); o = s.taboption('general', form.Value, 'password', _('Password'));
@ -55,26 +55,29 @@ return L.view.extend({
o.modalonly = true; o.modalonly = true;
o = s.taboption('general', form.Value, 'interface_name', _('Interface name')); o = s.taboption('general', form.Value, 'interface_name', _('Interface name'));
o.default = "mlvpn0" o.default = "mlvpn0";
o.placeholder = "mlvpn0" o.placeholder = "mlvpn0";
o.rmempty = false; o.rmempty = false;
o.modalonly = true; o.modalonly = true;
o = s.taboption('advanced', form.Value, 'timeout', _('Timeout (s)')); o = s.taboption('advanced', form.Value, 'timeout', _('Timeout (s)'));
o.default = '30'; o.default = '30';
o.datatype = "uinteger" o.datatype = "uinteger";
o.rmempty = false; o.rmempty = false;
o.modalonly = true; o.modalonly = true;
o = s.taboption('advanced', form.Value, 'reorder_buffer_size', _('Reorder buffer size')); o = s.taboption('advanced', form.Value, 'reorder_buffer_size', _('Reorder buffer size'));
o.default = '128'; o.default = '128';
o.datatype = "uinteger" o.datatype = "uinteger";
o.rmempty = false; o.rmempty = false;
o.modalonly = true; o.modalonly = true;
o = s.taboption('advanced', form.Flag, 'cleartext_data', _('Disable encryption'));
o.default = o.disabled;
o = s.taboption('advanced', form.Value, 'loss_tolerance', _('Loss tolerance')); o = s.taboption('advanced', form.Value, 'loss_tolerance', _('Loss tolerance'));
o.default = '50'; o.default = '50';
o.datatype = "uinteger" o.datatype = "uinteger";
o.rmempty = false; o.rmempty = false;
o.modalonly = true; o.modalonly = true;

4
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -649,6 +649,7 @@ function wizard_add()
ucic:set("shadowsocks-libev","sss0","method","none") ucic:set("shadowsocks-libev","sss0","method","none")
ucic:set("shadowsocks-libev","sss1","method","none") ucic:set("shadowsocks-libev","sss1","method","none")
ucic:set("openvpn","omr","cipher","none") ucic:set("openvpn","omr","cipher","none")
ucic:set("mlvpn","general","cleartext_data","1")
ucic:set("v2ray","omrout","s_vmess_user_security","none") ucic:set("v2ray","omrout","s_vmess_user_security","none")
ucic:set("v2ray","omrout","s_vless_user_security","none") ucic:set("v2ray","omrout","s_vless_user_security","none")
elseif encryption == "aes-256-gcm" then elseif encryption == "aes-256-gcm" then
@ -657,6 +658,7 @@ function wizard_add()
ucic:set("glorytun","vpn","chacha20","0") ucic:set("glorytun","vpn","chacha20","0")
ucic:set("glorytun-udp","vpn","chacha","0") ucic:set("glorytun-udp","vpn","chacha","0")
ucic:set("openvpn","omr","cipher","AES-256-GCM") ucic:set("openvpn","omr","cipher","AES-256-GCM")
ucic:set("mlvpn","general","cleartext_data","0")
ucic:set("v2ray","omrout","s_vmess_user_security","aes-128-gcm") ucic:set("v2ray","omrout","s_vmess_user_security","aes-128-gcm")
ucic:set("v2ray","omrout","s_vless_user_security","aes-128-gcm") ucic:set("v2ray","omrout","s_vless_user_security","aes-128-gcm")
elseif encryption == "aes-256-cfb" then elseif encryption == "aes-256-cfb" then
@ -665,6 +667,7 @@ function wizard_add()
ucic:set("glorytun","vpn","chacha20","0") ucic:set("glorytun","vpn","chacha20","0")
ucic:set("glorytun-udp","vpn","chacha","0") ucic:set("glorytun-udp","vpn","chacha","0")
ucic:set("openvpn","omr","cipher","AES-256-CFB") ucic:set("openvpn","omr","cipher","AES-256-CFB")
ucic:set("mlvpn","general","cleartext_data","0")
ucic:set("v2ray","omrout","s_vmess_user_security","aes-128-gcm") ucic:set("v2ray","omrout","s_vmess_user_security","aes-128-gcm")
ucic:set("v2ray","omrout","s_vless_user_security","aes-128-gcm") ucic:set("v2ray","omrout","s_vless_user_security","aes-128-gcm")
elseif encryption == "chacha20-ietf-poly1305" then elseif encryption == "chacha20-ietf-poly1305" then
@ -673,6 +676,7 @@ function wizard_add()
ucic:set("glorytun","vpn","chacha20","1") ucic:set("glorytun","vpn","chacha20","1")
ucic:set("glorytun-udp","vpn","chacha","1") ucic:set("glorytun-udp","vpn","chacha","1")
ucic:set("openvpn","omr","cipher","AES-256-CBC") ucic:set("openvpn","omr","cipher","AES-256-CBC")
ucic:set("mlvpn","general","cleartext_data","0")
ucic:set("v2ray","omrout","s_vmess_user_security","chacha20-poly1305") ucic:set("v2ray","omrout","s_vmess_user_security","chacha20-poly1305")
ucic:set("v2ray","omrout","s_vless_user_security","chacha20-poly1305") ucic:set("v2ray","omrout","s_vless_user_security","chacha20-poly1305")
end end

3
mlvpn/files/etc/init.d/mlvpn
View file

@ -40,6 +40,8 @@ start() {
password="$(uci -q get mlvpn.general.password)" password="$(uci -q get mlvpn.general.password)"
reorder_buffer_size="$(uci -q get mlvpn.general.reorder_buffer_size)" reorder_buffer_size="$(uci -q get mlvpn.general.reorder_buffer_size)"
loss_tolerence="$(uci -q get mlvpn.general.loss_tolerence)" loss_tolerence="$(uci -q get mlvpn.general.loss_tolerence)"
cleartext_data="$(uci -q get mlvpn.general.cleartext_data)"
[ -z "$cleartext_data" ] && cleartext_data="0"
host="$(uci -q get mlvpn.general.host)" host="$(uci -q get mlvpn.general.host)"
firstport="$(uci -q get mlvpn.general.firstport)" firstport="$(uci -q get mlvpn.general.firstport)"
@ -57,6 +59,7 @@ start() {
reorder_buffer = yes reorder_buffer = yes
reorder_buffer_size = ${reorder_buffer_size} reorder_buffer_size = ${reorder_buffer_size}
loss_tolerence = ${loss_tolerence} loss_tolerence = ${loss_tolerence}
cleartext_data = ${cleartext_data}
password = "${password}" password = "${password}"
mtu = 1452 mtu = 1452
EOF EOF