Merge pull request #1065 from Hir0-84/enhancement/issue_no281

Fix issue pivpn#281

scripts/openvpn/makeOVPN.sh

@@ -20,7 +20,7 @@ source "${setupVars}"
 helpFunc() {
     echo "::: Create a client ovpn profile, optional nopass"
     echo ":::"
-    echo "::: Usage: pivpn <-a|add> [-n|--name <arg>] [-p|--password <arg>]|[nopass] [-d|--days <number>] [-b|--bitwarden] [-i|--iOS] [-h|--help]"
+    echo "::: Usage: pivpn <-a|add> [-n|--name <arg>] [-p|--password <arg>]|[nopass] [-d|--days <number>] [-b|--bitwarden] [-i|--iOS] [-o|--ovpn] [-h|--help]"
     echo ":::"
     echo "::: Commands:"
     echo ":::  [none]               Interactive mode"
@@ -30,6 +30,7 @@ helpFunc() {
     echo ":::  -d,--days            Expire the certificate after specified number of days (default: 1080)"
     echo ":::  -b,--bitwarden       Create and save a client through Bitwarden"
     echo ":::  -i,--iOS             Generate a certificate that leverages iOS keychain"
+    echo ":::  -o,--ovpn            Regenerate a .ovpn config file for an existing client"
     echo ":::  -h,--help            Show this help dialog"
 }
 
@@ -97,6 +98,10 @@ do
                echo "Bitwarden not found, please install bitwarden"
                exit 1
             fi
+
+            ;;
+        -o|--ovpn)
+            GENOVPNONLY=1
             ;;
         *)
             echo "Error: Got an unexpected argument '$1'"
@@ -248,8 +253,12 @@ if [[ -z "${NAME}" ]]; then
     exit 1
 fi
 
-# Check if name is already in use
+if [ "${GENOVPNONLY}" == "1" ]; then
-while read -r line || [ -n "${line}" ]; do
+    # Generate .ovpn configuration file
+    cd /etc/openvpn/easy-rsa/pki || exit
+else
+    # Check if name is already in use
+    while read -r line || [ -n "${line}" ]; do
         STATUS=$(echo "$line" | awk '{print $1}')
 
         if [ "${STATUS}" == "V" ]; then
@@ -259,43 +268,43 @@ while read -r line || [ -n "${line}" ]; do
                 break
             fi
         fi
-done <${INDEX}
+    done <${INDEX}
 
-if [ "${INUSE}" == "1" ]; then
+    if [ "${INUSE}" == "1" ]; then
         printf "\n!! This name is already in use by a Valid Certificate."
         printf "\nPlease choose another name or revoke this certificate first.\n"
         exit 1
-fi
+    fi
 
-# Check if name is reserved
+    # Check if name is reserved
-if [ "${NAME}" == "ta" ] || [ "${NAME}" == "server" ] || [ "${NAME}" == "ca" ]; then
+    if [ "${NAME}" == "ta" ] || [ "${NAME}" == "server" ] || [ "${NAME}" == "ca" ]; then
         echo "Sorry, this is in use by the server and cannot be used by clients."
         exit 1
-fi
+    fi
 
-#As of EasyRSA 3.0.6, by default certificates last 1080 days, see https://github.com/OpenVPN/easy-rsa/blob/6b7b6bf1f0d3c9362b5618ad18c66677351cacd1/easyrsa3/vars.example
+    #As of EasyRSA 3.0.6, by default certificates last 1080 days, see https://github.com/OpenVPN/easy-rsa/blob/6b7b6bf1f0d3c9362b5618ad18c66677351cacd1/easyrsa3/vars.example
-if [ -z "${DAYS}" ]; then
+    if [ -z "${DAYS}" ]; then
         read -r -e -p "How many days should the certificate last?  " -i 1080 DAYS
-fi
+    fi
 
-if [[ ! "$DAYS" =~ ^[0-9]+$ ]] || [ "$DAYS" -lt 1 ] || [ "$DAYS" -gt 3650 ]; then
+    if [[ ! "$DAYS" =~ ^[0-9]+$ ]] || [ "$DAYS" -lt 1 ] || [ "$DAYS" -gt 3650 ]; then
         #The CRL lasts 3650 days so it doesn't make much sense that certificates would last longer
         echo "Please input a valid number of days, between 1 and 3650 inclusive."
         exit 1
+    fi
 
-fi
+    cd /etc/openvpn/easy-rsa || exit
 
-cd /etc/openvpn/easy-rsa || exit
+    if [[ "${NO_PASS}" =~ "1" ]]; then
-
-if [[ "${NO_PASS}" =~ "1" ]]; then
         if [[ -n "${PASSWD}" ]]; then
             echo "Both nopass and password arguments passed to the script. Please use either one."
             exit 1
         else
             keynoPASS
         fi
-else
+    else
         keyPASS
+    fi
 fi
 
 #1st Verify that clients Public Key Exists