added command line option to (batch) remove certs

::: Revoke a client ovpn profile
:::
::: Usage: pivpn <-r|revoke> [-h|--help] [<client-1>] ... [<client-n>]
...
:::
::: Commands:
:::  [none]               Interactive mode
:::  <client>             Client(s) to to revoke
:::  -h,--help            Show this help dialog

pivpn

@@ -55,7 +55,8 @@ function debugFunc {
 }
 
 function removeOVPNFunc {
-    $SUDO /opt/pivpn/removeOVPN.sh
+    shift
+    $SUDO /opt/pivpn/removeOVPN.sh "$@"
     exit 1
 }
 
@@ -94,7 +95,7 @@ case "$1" in
 "-c" | "clients"            ) listClientsFunc;;
 "-d" | "debug"              ) debugFunc;;
 "-l" | "list"               ) listOVPNFunc;;
-"-r" | "revoke"             ) removeOVPNFunc;;
+"-r" | "revoke"             ) removeOVPNFunc "$@";;
 "-h" | "help"               ) helpFunc;;
 "-u" | "uninstall"          ) uninstallFunc;;
 "-v"                        ) versionFunc;;

scripts/makeOVPN.sh

@@ -16,6 +16,7 @@ helpFunc() {
     echo "::: Usage: pivpn <-a|add> [-n|--name <arg>] [-p|--password <arg>]|[nopass] [-h|--help]"
     echo ":::"
     echo "::: Commands:"
+    echo ":::  [none]               Interactive mode"
     echo ":::  nopass               Create a client without a password"
     echo ":::  -n,--name            Name for the Client (default: '"$(hostname)"')"
     echo ":::  -p,--password        Password for the Client (no default)"

scripts/removeOVPN.sh

@@ -6,16 +6,44 @@ REVOKE_STATUS=$(cat /etc/pivpn/REVOKE_STATUS)
 PLAT=$(cat /etc/pivpn/DET_PLATFORM)
 INDEX="/etc/openvpn/easy-rsa/pki/index.txt"
 
+helpFunc() {
+    echo "::: Revoke a client ovpn profile"
+    echo ":::"
+    echo "::: Usage: pivpn <-r|revoke> [-h|--help] [<client-1>] ... [<client-n>] ..."
+    echo ":::"
+    echo "::: Commands:"
+    echo ":::  [none]               Interactive mode"
+    echo ":::  <client>             Client(s) to to revoke"
+    echo ":::  -h,--help            Show this help dialog"
+}
+
+# Parse input arguments
+while test $# -gt 0
+do
+    _key="$1"
+    case "$_key" in
+        -h|--help)
+            helpFunc
+            exit 0
+            ;;
+        *)
+            CERTS_TO_REVOKE+=("$1")
+            ;;
+    esac
+    shift
+done
+
 if [ ! -f "${INDEX}" ]; then
         printf "The file: %s was not found\n" "$INDEX"
         exit 1
 fi
 
-printf "\n"
+if [[ -z "${CERTS_TO_REVOKE}" ]]; then
-printf " ::\e[4m  Certificate List  \e[0m:: \n"
+    printf "\n"
+    printf " ::\e[4m  Certificate List  \e[0m:: \n"
     
-i=0
+    i=0
-while read -r line || [ -n "$line" ]; do
+    while read -r line || [ -n "$line" ]; do
         STATUS=$(echo "$line" | awk '{print $1}')
         if [[ "${STATUS}" = "V" ]]; then
             NAME=$(echo "$line" | sed -e 's:.*/CN=::')
@@ -26,26 +54,53 @@ while read -r line || [ -n "$line" ]; do
             fi
             let i=i+1
         fi
-done <${INDEX}
+    done <${INDEX}
-printf "\n"
+    printf "\n"
     
-echo "::: Please enter the Name of the client to be revoked from the list above:"
+    echo "::: Please enter the Name of the client to be revoked from the list above:"
-read -r NAME
+    read -r NAME
     
-if [[ -z "${NAME}" ]]; then
+    if [[ -z "${NAME}" ]]; then
-    echo "::: You can not leave this blank!"
+        echo "You can not leave this blank!"
         exit 1
-fi
+    fi
     
-for((x=1;x<=i;++x)); do
+    for((x=1;x<=i;++x)); do
         if [ "${CERTS[$x]}" = "${NAME}" ]; then
             VALID=1
         fi
-done
+    done
     
-if [ -z "${VALID}" ]; then
+    if [ -z "${VALID}" ]; then
-    printf "::: You didn't enter a valid cert name!\n"
+        printf "You didn't enter a valid cert name!\n"
         exit 1
+    fi
+    
+    CERTS_TO_REVOKE=( "${NAME}" )
+else
+    i=0
+    while read -r line || [ -n "$line" ]; do
+        STATUS=$(echo "$line" | awk '{print $1}')
+        if [[ "${STATUS}" = "V" ]]; then
+            NAME=$(echo "$line" | sed -e 's:.*/CN=::')
+            CERTS[$i]=${NAME}
+            let i=i+1
+        fi
+    done <${INDEX}
+    
+    for (( ii = 0; ii < ${#CERTS_TO_REVOKE[@]}; ii++)); do
+        VALID=0
+        for((x=1;x<=i;++x)); do
+            if [ "${CERTS[$x]}" = "${CERTS_TO_REVOKE[ii]}" ]; then
+                VALID=1
+            fi
+        done
+        
+        if [ "${VALID}" != 1 ]; then
+            printf "You passed an invalid cert name: '"%s"'!\n" "${CERTS_TO_REVOKE[ii]}"
+            exit 1
+        fi
+    done
 fi
 
 cd /etc/openvpn/easy-rsa || exit
@@ -66,13 +121,16 @@ if [ "${REVOKE_STATUS}" == 0 ]; then
     fi
 fi
 
-./easyrsa --batch revoke "${NAME}"
+for (( ii = 0; ii < ${#CERTS_TO_REVOKE[@]}; ii++)); do
-./easyrsa gen-crl
+    printf "\n::: Revoking certificate '"%s"'.\n" "${CERTS_TO_REVOKE[ii]}"
-printf "\n::: Certificate revoked, and CRL file updated.\n"
+    ./easyrsa --batch revoke "${CERTS_TO_REVOKE[ii]}"
-printf "::: Removing certs and client configuration for this profile.\n"
+    ./easyrsa gen-crl
-rm -rf "pki/reqs/${NAME}.req"
+    printf "\n::: Certificate revoked, and CRL file updated.\n"
-rm -rf "pki/private/${NAME}.key"
+    printf "::: Removing certs and client configuration for this profile.\n"
-rm -rf "pki/issued/${NAME}.crt"
+    rm -rf "pki/reqs/${CERTS_TO_REVOKE[ii]}.req"
-rm -rf "/home/${INSTALL_USER}/ovpns/${NAME}.ovpn"
+    rm -rf "pki/private/${CERTS_TO_REVOKE[ii]}.key"
-cp /etc/openvpn/easy-rsa/pki/crl.pem /etc/openvpn/crl.pem
+    rm -rf "pki/issued/${CERTS_TO_REVOKE[ii]}.crt"
+    rm -rf "/home/${INSTALL_USER}/ovpns/${CERTS_TO_REVOKE[ii]}.ovpn"
+    cp /etc/openvpn/easy-rsa/pki/crl.pem /etc/openvpn/crl.pem
+done
 printf "::: Completed!\n"