From bc312e07360ccef6c6ae6b9339739cc799102dae Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Sun, 7 Nov 2021 00:13:42 -0500
Subject: [PATCH] Update IKEv2 script

- Show client certificate statuses when listing IKEv2 clients
- Fixes #1038
---
 extras/ikev2setup.sh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/extras/ikev2setup.sh b/extras/ikev2setup.sh
index 842389d..804fdd4 100755
--- a/extras/ikev2setup.sh
+++ b/extras/ikev2setup.sh
@@ -153,7 +153,7 @@ check_container() {
 show_header() {
 cat <<'EOF'
 
-IKEv2 Script   Copyright (c) 2020-2021 Lin Song   10 Oct 2021
+IKEv2 Script   Copyright (c) 2020-2021 Lin Song   7 Nov 2021
 
 EOF
 }
@@ -383,7 +383,20 @@ get_server_address() {
 
 list_existing_clients() {
   echo "Checking for existing IKEv2 client(s)..."
-  certutil -L -d sql:/etc/ipsec.d | grep -v -e '^$' -e 'IKEv2 VPN CA' -e '\.' | tail -n +3 | cut -f1 -d ' '
+  echo
+  client_names=$(certutil -L -d sql:/etc/ipsec.d | grep -v -e '^$' -e 'IKEv2 VPN CA' -e '\.' | tail -n +3 | cut -f1 -d ' ')
+  max_len=$(printf '%s\n' "$client_names" | wc -L 2>/dev/null)
+  [[ $max_len =~ ^[0-9]+$ ]] || max_len=64
+  [ "$max_len" -gt "64" ] && max_len=64
+  [ "$max_len" -lt "16" ] && max_len=16
+  printf "%-${max_len}s  %s\n" 'Client Name' 'Certificate Status'
+  printf "%-${max_len}s  %s\n" '------------' '-------------------'
+  printf '%s\n' "$client_names" | while read -r line; do
+    printf "%-${max_len}s  " "$line"
+    client_status=$(certutil -V -u C -d sql:/etc/ipsec.d -n "$line" | grep -o -e ' valid' -e expired -e revoked | sed -e 's/^ //')
+    [ -z "$client_status" ] && client_status=unknown
+    printf '%s\n' "$client_status"
+  done
 }
 
 enter_server_address() {