Merge pull request #14202 from miska/vpn_user

openvpn: Support username and password options

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 5c8a0a4fae862d6087b29ae8637807ca0fec329b..907d79b61c5d17aa2e89985d616563d7011594cc 100644 (file)
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openvpn
 
 PKG_VERSION:=2.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=\
        https://build.openvpn.net/downloads/releases/ \

diff --git a/net/openvpn/files/openvpn.config b/net/openvpn/files/openvpn.config
index 09d504da28970164a518cf6798d02603b0207461..57fb385d7f00a74df6164eebc1a5a0857867b840 100644 (file)
--- a/net/openvpn/files/openvpn.config
+++ b/net/openvpn/files/openvpn.config
@@ -9,6 +9,13 @@ config openvpn custom_config
        # Set to 1 to enable this instance:
        option enabled 0
 
+       # Credentials to login
+       #option username 'login'
+       #option password 'password'
+
+       # Password for client certificate
+       #option cert_password 'cert_password'
+
        # Include OpenVPN configuration
        option config /etc/openvpn/my-vpn.conf
 

diff --git a/net/openvpn/files/openvpn.init b/net/openvpn/files/openvpn.init
index 487a2269e262308d260db44b8d3516ac8cdc9f93..fba9b3c2c1765f0452bd64d5693e2861fbc0749c 100644 (file)
--- a/net/openvpn/files/openvpn.init
+++ b/net/openvpn/files/openvpn.init
@@ -69,6 +69,14 @@ section_enabled() {
        [ $enable -gt 0 ] || [ $enabled -gt 0 ]
 }
 
+create_temp_file() {
+       mkdir -p "$(dirname "$1")"
+       rm -f "$1"
+       touch "$1"
+       chown root "$1"
+       chmod 0600 "$1"
+}
+
 openvpn_get_dev() {
        local dev dev_type
        local name="$1"
@@ -103,6 +111,31 @@ openvpn_get_dev() {
        echo "--dev-type $dev_type --dev $dev"
 }
 
+openvpn_get_credentials() {
+       local name="$1"
+       local ret=""
+
+       config_get cert_password "$name" cert_password
+       config_get password "$name" password
+       config_get username "$name" username
+
+       if [ -n "$cert_password" ]; then
+               create_temp_file /var/run/openvpn.$name.pass
+               echo "$cert_password" > /var/run/openvpn.$name.pass
+               ret=" --askpass /var/run/openvpn.$name.pass "
+       fi
+
+       if [ -n "$username" ]; then
+               create_temp_file /var/run/openvpn.$name.userpass
+               echo "$username" > /var/run/openvpn.$name.userpass
+               echo "$password" >> /var/run/openvpn.$name.userpass
+               ret=" --auth-user-pass /var/run/openvpn.$name.userpass "
+       fi
+
+       # Return overrides
+       echo "$ret"
+}
+
 openvpn_add_instance() {
        local name="$1"
        local dir="$2"
@@ -118,7 +151,8 @@ openvpn_add_instance() {
                --up "/usr/libexec/openvpn-hotplug up $name" \
                --down "/usr/libexec/openvpn-hotplug down $name" \
                --script-security "${security:-2}" \
-               $(openvpn_get_dev "$name" "$conf")
+               $(openvpn_get_dev "$name" "$conf") \
+               $(openvpn_get_credentials "$name" "$conf")
        procd_set_param file "$dir/$conf"
        procd_set_param term_timeout 15
        procd_set_param respawn
@@ -150,8 +184,7 @@ start_instance() {
                return
        fi
 
-       [ ! -d "/var/etc" ] && mkdir -p "/var/etc"
-       [ -f "/var/etc/openvpn-$s.conf" ] && rm "/var/etc/openvpn-$s.conf"
+       create_temp_file "/var/etc/openvpn-$s.conf"
 
        append_bools "$s" $OPENVPN_BOOLS
        append_params "$s" $OPENVPN_PARAMS