From: Anna Tikhomirova <redacted>
Date: Sat, 19 Mar 2022 23:24:42 +0000 (+0300)
Subject: luci-app-openvpn: fix openvpn config corruption on upload
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=64b80b8f118753930357a236ce96ed5e4d720cda;p=openwrt-luci.git

luci-app-openvpn: fix openvpn config corruption on upload

Signed-off-by: Anna Tikhomirova <redacted>
---

diff --git a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
index a30ac81a99..b41fff21dc 100644
--- a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
@@ -31,8 +31,7 @@ function ovpn_upload()
 
 		http.setfilehandler(
 			function(meta, chunk, eof)
-				local data = util.trim(chunk:gsub("\r\n", "\n")) .. "\n"
-				data = util.trim(data:gsub("[\128-\255]", ""))
+				local data = chunk:gsub("\r\n", "\n")
 
 				if not fp and meta and meta.name == "ovpn_file" then
 					fp = io.open(file, "w")
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua
index fa823964ac..7197f45ef6 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-file.lua
@@ -51,7 +51,7 @@ function file.cfgvalue()
 end
 
 function file.write(self, section, data1)
-	return fs.writefile(cfg_file, "\n" .. util.trim(data1:gsub("\r\n", "\n")) .. "\n")
+	return fs.writefile(cfg_file, util.trim(data1:gsub("\r\n", "\n")) .. "\n")
 end
 
 function file.remove(self, section, value)