From 526cd748a7c370500c0b18af010f6848441ab116 Mon Sep 17 00:00:00 2001
From: Swamy Goundar <psg@southecho.com>
Date: Sun, 22 Mar 2020 19:20:52 -0700
Subject: [PATCH] Added PiVPN function listclients

---
 openvpn-install.sh | 89 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 1 deletion(-)

diff --git a/openvpn-install.sh b/openvpn-install.sh
index 9c6fad7..51a6044 100755
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -845,6 +845,11 @@ tls-cipher $CC_CIPHER
 status /var/log/openvpn/status.log
 verb 3" >> /etc/openvpn/server.conf
 
+#Creating log files for Openvpn
+echo "status /var/log/openvpn-status.log 20
+status-version 3" >> /etc/openvpn/server.conf
+echo "log-append /var/log/openvpn.log" >> /etc/openvpn/server.conf
+
 	# Create log dir
 	mkdir -p /var/log/openvpn
 
@@ -1258,8 +1263,90 @@ while read -r line || [ -n "$line" ]; do
 done <${INDEX}
 printf "\n"
 
+}
+
+function showclients() {
+STATUS_LOG="/var/log/openvpn-status.log"
+
+if [ ! -f "${STATUS_LOG}" ]; then
+    echo "The file: $STATUS_LOG was not found!"
+    exit 1
+fi
+
+scriptusage(){
+    echo "::: List any connected clients to the server"
+    echo ":::"
+    echo "::: Usage: pivpn <-c|clients> [-b|bytes]"
+    echo ":::"
+    echo "::: Commands:"
+    echo ":::  [none]              List clients with human readable format"
+    echo ":::  -b, bytes           List clients with dotted decimal notation"
+    echo ":::  -h, help            Show this usage dialog"
+}
+
+hr(){
+    numfmt --to=iec-i --suffix=B "$1"
+}
 
 
+listClients(){
+    printf ": NOTE : The output below is NOT real-time!\n"
+    printf ":      : It may be off by a few minutes.\n"
+    printf "\n"
+    printf "\e[1m::: Client Status List :::\e[0m\n"
+
+    {
+    printf "\e[4mName\e[0m  \t  \e[4mRemote IP\e[0m  \t  \e[4mVirtual IP\e[0m  \t  \e[4mBytes Received\e[0m  \t  \e[4mBytes Sent\e[0m  \t  \e[4mConnected Since\e[0m\n"
+
+    if grep -q "^CLIENT_LIST" "${STATUS_LOG}"; then
+            if [ -n "$(type -t numfmt)" ]; then
+                if [ "$HR" = 1 ]; then
+                    while read -r line; do
+                        read -r -a array <<< $line
+                        [[ ${array[0]} = CLIENT_LIST ]] || continue
+                        printf "%s  \t  %s  \t  %s  \t  %s  \t  %s  \t  %s %s %s - %s\n" ${array[1]} ${array[2]} ${array[3]} $(hr ${array[4]}) $(hr ${array[5]}) ${array[7]} ${array[8]} ${array[10]} ${array[9]}
+                    done <$STATUS_LOG
+                else
+                    while read -r line; do
+                        read -r -a array <<< $line
+                        [[ ${array[0]} = CLIENT_LIST ]] || continue
+                        printf "%s  \t  %s  \t  %s  \t  %'d  \t  %'d  \t  %s %s %s - %s\n" ${array[1]} ${array[2]} ${array[3]} ${array[4]} ${array[5]} ${array[7]} ${array[8]} ${array[10]} ${array[9]}
+                    done <$STATUS_LOG
+                fi
+            else
+                awk -F' ' -v s='CLIENT_LIST' '$1 == s {print $2"\t\t"$3"\t"$4"\t"$5"\t\t"$6"\t\t"$8" "$9" "$11" - "$10"\n"}' ${STATUS_LOG}
+            fi
+    else
+        printf "\nNo Clients Connected!\n"
+    fi
+
+    printf "\n"
+    } | column -t -s $'\t'
+}
+
+if [[ $# -eq 0 ]]; then
+    HR=1
+    listClients
+else
+    while true; do
+        case "$1" in
+            -b|bytes)
+                HR=0
+                listClients
+                exit 0
+                ;;
+            -h|help)
+                scriptusage
+                exit 0
+                ;;
+            *)
+                HR=0
+                listClients
+                exit 0
+                ;;
+        esac
+    done
+fi
 
 
 }
@@ -1292,7 +1379,7 @@ function manageMenu () {
 			listcerts
 		;;
 		4)
-			echo "TBD"
+			showclients
 		;;