mirror/setup-ipsec-vpn
1
0
Fork 0
mirror of synced 2025-03-03 19:33:16 +03:00
Code Issues Projects Releases Wiki Activity

Update IKEv2 script

Browse Source 
- Minor improvements to client name input prompts. Abort and exit
  if the user presses Enter without specifying a client name.
- Cleanup
This commit is contained in:
hwdsl2 2021-07-31 23:36:43 -05:00
parent 6aa15b8a21
commit ab50fa7264
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
extras/ikev2setup.sh
View File

@ -81,6 +81,11 @@ check_os_type() {
fi fi
} }
abort_and_exit() {
echo "Abort. No changes were made." >&2
exit 1
}
confirm_or_abort() { confirm_or_abort() {
printf '%s' "$1" printf '%s' "$1"
read -r response read -r response
@ -89,8 +94,7 @@ confirm_or_abort() {
echo echo
;; ;;
*) *)
echo "Abort. No changes were made." abort_and_exit
exit 1
;; ;;
esac esac
} }
@ -194,8 +198,7 @@ check_cert_exists() {
check_cert_exists_and_exit() { check_cert_exists_and_exit() {
if certutil -L -d sql:/etc/ipsec.d -n "$1" >/dev/null 2>&1; then if certutil -L -d sql:/etc/ipsec.d -n "$1" >/dev/null 2>&1; then
echo "Error: Certificate '$1' already exists." >&2 echo "Error: Certificate '$1' already exists." >&2
echo "Abort. No changes were made." >&2 abort_and_exit
exit 1
fi fi
} }
@ -448,13 +451,15 @@ enter_client_name() {
echo "Provide a name for the IKEv2 VPN client." echo "Provide a name for the IKEv2 VPN client."
echo "Use one word only, no special characters except '-' and '_'." echo "Use one word only, no special characters except '-' and '_'."
read -rp "Client name: " client_name read -rp "Client name: " client_name
while [ -z "$client_name" ] || ! check_client_name "$client_name" || check_cert_exists "$client_name"; do [ -z "$client_name" ] && abort_and_exit
if [ -z "$client_name" ] || ! check_client_name "$client_name"; then while ! check_client_name "$client_name" || check_cert_exists "$client_name"; do
if ! check_client_name "$client_name"; then
echo "Invalid client name." echo "Invalid client name."
else else
echo "Invalid client name. Client '$client_name' already exists." echo "Invalid client name. Client '$client_name' already exists."
fi fi
read -rp "Client name: " client_name read -rp "Client name: " client_name
[ -z "$client_name" ] && abort_and_exit
done done
} }
@ -481,12 +486,12 @@ enter_client_name_for() {
get_server_address get_server_address
echo echo
read -rp "Enter the name of the IKEv2 client to $1: " client_name read -rp "Enter the name of the IKEv2 client to $1: " client_name
while [ -z "$client_name" ] || ! check_client_name "$client_name" \ [ -z "$client_name" ] && abort_and_exit
|| [ "$client_name" = "IKEv2 VPN CA" ] || [ "$client_name" = "$server_addr" ] \ while ! check_client_name "$client_name" || [ "$client_name" = "IKEv2 VPN CA" ] \
|| ! check_cert_exists "$client_name" || ! check_cert_status "$client_name"; do || [ "$client_name" = "$server_addr" ] || ! check_cert_exists "$client_name" \
if [ -z "$client_name" ] || ! check_client_name "$client_name" \ || ! check_cert_status "$client_name"; do
|| [ "$client_name" = "IKEv2 VPN CA" ] || [ "$client_name" = "$server_addr" ] \ if ! check_client_name "$client_name" || [ "$client_name" = "IKEv2 VPN CA" ] \
|| ! check_cert_exists "$client_name"; then || [ "$client_name" = "$server_addr" ] || ! check_cert_exists "$client_name"; then
echo "Invalid client name, or client does not exist." echo "Invalid client name, or client does not exist."
else else
printf '%s' "Error: Certificate '$client_name' " printf '%s' "Error: Certificate '$client_name' "
@ -503,6 +508,7 @@ enter_client_name_for() {
fi fi
fi fi
read -rp "Enter the name of the IKEv2 client to $1: " client_name read -rp "Enter the name of the IKEv2 client to $1: " client_name
[ -z "$client_name" ] && abort_and_exit
done done
} }
@ -1179,8 +1185,7 @@ check_ipsec_conf() {
echo "Error: IKEv2 configuration section found in /etc/ipsec.conf." >&2 echo "Error: IKEv2 configuration section found in /etc/ipsec.conf." >&2
echo " This script cannot automatically remove IKEv2 from this server." >&2 echo " This script cannot automatically remove IKEv2 from this server." >&2
echo " To manually remove IKEv2, see https://git.io/ikev2" >&2 echo " To manually remove IKEv2, see https://git.io/ikev2" >&2
echo "Abort. No changes were made." >&2 abort_and_exit
exit 1
fi fi
} }