quote variables for openvpn cli to prevent issues

binhex · Aug 3, 2017 · 38cf86e · 38cf86e
1 parent 97c0667
commit 38cf86e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/run/root/openvpn.sh b/run/root/openvpn.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # define common command lne parameters for openvpn
-openvpn_cli="/usr/bin/openvpn --cd /config/openvpn --config ${VPN_CONFIG} --daemon --reneg-sec 0 --mute-replay-warnings --auth-nocache --keepalive 10 60 --setenv VPN_PROV ${VPN_PROV} --setenv DEBUG ${DEBUG} --setenv VPN_DEVICE_TYPE ${VPN_DEVICE_TYPE} --setenv VPN_REMOTE ${VPN_REMOTE} --script-security 2 --up /root/openvpnup.sh --up-delay --up-restart --writepid /root/openvpn.pid --remap-usr1 SIGHUP --log-append /dev/stdout"
+openvpn_cli="/usr/bin/openvpn --cd /config/openvpn --config '${VPN_CONFIG}' --daemon --reneg-sec 0 --mute-replay-warnings --auth-nocache --keepalive 10 60 --setenv VPN_PROV '${VPN_PROV}' --setenv DEBUG '${DEBUG}' --setenv VPN_DEVICE_TYPE '${VPN_DEVICE_TYPE}' --setenv VPN_REMOTE '${VPN_REMOTE}' --script-security 2 --up /root/openvpnup.sh --up-delay --up-restart --writepid /root/openvpn.pid --remap-usr1 SIGHUP --log-append /dev/stdout"
 
 if [[ "${VPN_PROV}" == "pia" ]]; then
 
 	# add pia specific flags
-	openvpn_cli="${openvpn_cli} --setenv STRICT_PORT_FORWARD ${STRICT_PORT_FORWARD} --disable-occ"
+	openvpn_cli="${openvpn_cli} --setenv STRICT_PORT_FORWARD '${STRICT_PORT_FORWARD}' --disable-occ"
 
 fi
 
@@ -20,13 +20,13 @@ fi
 if [[ ! -z "${VPN_OPTIONS}" ]]; then
 
 	# add additional flags to openvpn cli
-	openvpn_cli="${openvpn_cli} ${VPN_OPTIONS}"
+	openvpn_cli="${openvpn_cli} '${VPN_OPTIONS}'"
 
 fi
 
 if [[ "${DEBUG}" == "true" ]]; then
 
-	echo "[debug] OpenVPN command line '${openvpn_cli}'"
+	echo "[debug] OpenVPN command line:- ${openvpn_cli}"
 
 fi