luci-app-openvpn: allow and restrict file uploads to /etc/openvpn/

[project/luci.git] / applications / luci-app-openvpn / luasrc / model / cbi / openvpn-basic.lua

diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
index 54f082a1fa45e34d619b0d4a7c430705df835796..980238cb670d14f42bad84b09ecbb1833b9c8a19 100644 (file)
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
@@ -58,7 +58,7 @@ local basicParams = {
        { DynamicList,
                "remote",
                "vpnserver.example.org",
-               translate("Remote host name or ip address") },
+               translate("Remote host name or IP address") },
        { FileUpload,
                "secret",
                "/etc/openvpn/secret.key",
@@ -78,7 +78,7 @@ local basicParams = {
        { FileUpload,
                "dh",
                "/etc/easy-rsa/keys/dh1024.pem",
-               translate("Diffie Hellman parameters") },
+               translate("Diffie-Hellman parameters") },
        { FileUpload,
                "cert",
                "/etc/easy-rsa/keys/some-client.crt",
@@ -128,6 +128,8 @@ for _, option in ipairs(basicParams) do
                o.value = option[3]
        elseif option[1] == FileUpload then
 
+               o.initial_directory = "/etc/openvpn"
+
                function o.cfgvalue(self, section)
                        local cfg_val = AbstractValue.cfgvalue(self, section)