From: Friendly fellow Date: Thu, 26 Mar 2020 15:49:55 +0000 (+0300) Subject: luci-proto-openconnect: fix certificate file paths X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=adf0fb1879ffb6bd04984d257484fad0fba1d6a3;p=oweals%2Fluci.git luci-proto-openconnect: fix certificate file paths 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 [reword commit message] Ref: https://github.com/openwrt/packages/issues/11584 Signed-off-by: Jo-Philipp Wich --- diff --git a/protocols/luci-proto-openconnect/root/usr/libexec/rpcd/luci.openconnect b/protocols/luci-proto-openconnect/root/usr/libexec/rpcd/luci.openconnect index 9378cc518..38650a615 100755 --- a/protocols/luci-proto-openconnect/root/usr/libexec/rpcd/luci.openconnect +++ b/protocols/luci-proto-openconnect/root/usr/libexec/rpcd/luci.openconnect @@ -59,19 +59,19 @@ elseif arg[1] == "call" then if arg[2] == "getCertificates" then print(json.stringify({ - user_certificate = readfile(string.format("/etc/openconnect/user-cert-%s.pem", args.interface)), - user_privatekey = readfile(string.format("/etc/openconnect/user-key-%s.pem", args.interface)), - ca_certificate = readfile(string.format("/etc/openconnect/ca-%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-vpn-%s.pem", args.interface)), + ca_certificate = readfile(string.format("/etc/openconnect/ca-vpn-%s.pem", args.interface)) })) elseif arg[2] == "setCertificates" 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 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 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 print(json.stringify({ result = true })) end