From 23fb2cf5e55d7ed9073e88b78570c5745ff961e2 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 5 Mar 2021 21:19:49 +0100
Subject: [PATCH] Add cleartext support for mlvpn

---
 .../resources/view/services/mlvpn.js            | 17 ++++++++++-------
 .../luasrc/controller/openmptcprouter.lua       |  4 ++++
 mlvpn/files/etc/init.d/mlvpn                    |  3 +++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js b/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js
index 2d5258047..014232d7a 100644
--- a/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js
+++ b/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js
@@ -46,8 +46,8 @@ return L.view.extend({
 		o.rmempty = false;
 
 		o = s.taboption('general', form.Value, 'firstport', _('First Port'));
-		o.default  = "65201"
-		o.datatype = "port"
+		o.default  = "65201";
+		o.datatype = "port";
 		o.rmempty  = false;
 
 		o = s.taboption('general', form.Value, 'password', _('Password'));
@@ -55,26 +55,29 @@ return L.view.extend({
 		o.modalonly = true;
 
 		o = s.taboption('general', form.Value, 'interface_name', _('Interface name'));
-		o.default     = "mlvpn0"
-		o.placeholder = "mlvpn0"
+		o.default     = "mlvpn0";
+		o.placeholder = "mlvpn0";
 		o.rmempty     = false;
 		o.modalonly   = true;
 
 		o = s.taboption('advanced', form.Value, 'timeout', _('Timeout (s)'));
 		o.default   = '30';
-		o.datatype  = "uinteger"
+		o.datatype  = "uinteger";
 		o.rmempty   = false;
 		o.modalonly = true;
 
 		o = s.taboption('advanced', form.Value, 'reorder_buffer_size', _('Reorder buffer size'));
 		o.default   = '128';
-		o.datatype  = "uinteger"
+		o.datatype  = "uinteger";
 		o.rmempty   = false;
 		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.default   = '50';
-		o.datatype  = "uinteger"
+		o.datatype  = "uinteger";
 		o.rmempty   = false;
 		o.modalonly = true;
 
diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 77d324ce7..98963fc69 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -649,6 +649,7 @@ function wizard_add()
 		ucic:set("shadowsocks-libev","sss0","method","none")
 		ucic:set("shadowsocks-libev","sss1","method","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_vless_user_security","none")
 	elseif encryption == "aes-256-gcm" then
@@ -657,6 +658,7 @@ function wizard_add()
 		ucic:set("glorytun","vpn","chacha20","0")
 		ucic:set("glorytun-udp","vpn","chacha","0")
 		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_vless_user_security","aes-128-gcm")
 	elseif encryption == "aes-256-cfb" then
@@ -665,6 +667,7 @@ function wizard_add()
 		ucic:set("glorytun","vpn","chacha20","0")
 		ucic:set("glorytun-udp","vpn","chacha","0")
 		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_vless_user_security","aes-128-gcm")
 	elseif encryption == "chacha20-ietf-poly1305" then
@@ -673,6 +676,7 @@ function wizard_add()
 		ucic:set("glorytun","vpn","chacha20","1")
 		ucic:set("glorytun-udp","vpn","chacha","1")
 		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_vless_user_security","chacha20-poly1305")
 	end
diff --git a/mlvpn/files/etc/init.d/mlvpn b/mlvpn/files/etc/init.d/mlvpn
index 3021f143e..6ef4bfdc6 100755
--- a/mlvpn/files/etc/init.d/mlvpn
+++ b/mlvpn/files/etc/init.d/mlvpn
@@ -40,6 +40,8 @@ start() {
 	password="$(uci -q get mlvpn.general.password)"
 	reorder_buffer_size="$(uci -q get mlvpn.general.reorder_buffer_size)"
 	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)"
 	firstport="$(uci -q get mlvpn.general.firstport)"
 	
@@ -57,6 +59,7 @@ start() {
 	reorder_buffer = yes
 	reorder_buffer_size = ${reorder_buffer_size}
 	loss_tolerence = ${loss_tolerence}
+	cleartext_data = ${cleartext_data}
 	password = "${password}"
 	mtu = 1452
 	EOF