openwrt-mirror/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2025-12-22 01:44:35 +04:00
Code Issues Packages Projects Releases Wiki Activity

luci-proto-openconnect: fix certificate file paths

Browse Source 
This addresses the issue of openconnect.sh from openconnect package expecting
a vpn- suffix for the files, while the frontend didn't.

Signed-off-by: Friendly fellow <DasTestament@users.noreply.github.com>
[reword commit message]
Ref: https://github.com/openwrt/packages/issues/11584
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit adf0fb1879)
Fixes: #3951
This commit is contained in:
Friendly fellow
2020-03-26 18:49:55 +03:00
committed by Jo-Philipp Wich
parent c4d35431e0
commit d6c07c85b2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
protocols/luci-proto-openconnect/root/usr/libexec/rpcd/luci.openconnect
View File

@@ -59,19 +59,19 @@ elseif arg[1] == "call" then
if arg[2] == "getCertificates" then if arg[2] == "getCertificates" then
print(json.stringify({ print(json.stringify({
user_certificate = readfile(string.format("/etc/openconnect/user-cert-%s.pem", args.interface)), user_certificate = readfile(string.format("/etc/openconnect/user-cert-vpn-%s.pem", args.interface)),
user_privatekey = readfile(string.format("/etc/openconnect/user-key-%s.pem", args.interface)), user_privatekey = readfile(string.format("/etc/openconnect/user-key-vpn-%s.pem", args.interface)),
ca_certificate = readfile(string.format("/etc/openconnect/ca-%s.pem", args.interface)) ca_certificate = readfile(string.format("/etc/openconnect/ca-vpn-%s.pem", args.interface))
})) }))
elseif arg[2] == "setCertificates" then elseif arg[2] == "setCertificates" then
if args.user_certificate then if args.user_certificate then
writefile(string.format("/etc/openconnect/user-cert-%s.pem", args.interface), args.user_certificate) writefile(string.format("/etc/openconnect/user-cert-vpn-%s.pem", args.interface), args.user_certificate)
end end
if args.user_privatekey then if args.user_privatekey then
writefile(string.format("/etc/openconnect/user-key-%s.pem", args.interface), args.user_privatekey) writefile(string.format("/etc/openconnect/user-key-vpn-%s.pem", args.interface), args.user_privatekey)
end end
if args.ca_certificate then if args.ca_certificate then
writefile(string.format("/etc/openconnect/ca-%s.pem", args.interface), args.ca_certificate) writefile(string.format("/etc/openconnect/ca-vpn-%s.pem", args.interface), args.ca_certificate)
end end
print(json.stringify({ result = true })) print(json.stringify({ result = true }))
end end