Marown/wireguard-install
1
0
Fork 0
mirror of https://github.com/hwdsl2/wireguard-install.git synced 2024-06-12 22:14:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve user input

Browse Source 
- When adding or removing a client, abort and exit if the user
  enters an empty client name or client number.
This commit is contained in:
hwdsl2 2022-09-02 23:42:09 -05:00
parent e60bb933c7
commit 899b772354
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wireguard-install.sh
View File

@ -99,6 +99,11 @@ if [[ "$is_container" -eq 0 ]]; then
exit 1
fi
abort_and_exit () {
echo "Abort. No changes were made." >&2
exit 1
}
get_export_dir () {
export_to_home_dir=0
export_dir=~/
@ -509,11 +514,13 @@ else
echo
echo "Provide a name for the client:"
read -p "Name: " unsanitized_client
[ -z "$unsanitized_client" ] && abort_and_exit
# Allow a limited set of characters to avoid conflicts
client=$(sed 's/[^0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-]/_/g' <<< "$unsanitized_client")
while [[ -z "$client" ]] || grep -q "^# BEGIN_PEER $client$" /etc/wireguard/wg0.conf; do
echo "$client: invalid name."
read -p "Name: " unsanitized_client
[ -z "$unsanitized_client" ] && abort_and_exit
client=$(sed 's/[^0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-]/_/g' <<< "$unsanitized_client")
done
echo
@ -541,9 +548,11 @@ else
echo "Select the client to remove:"
grep '^# BEGIN_PEER' /etc/wireguard/wg0.conf | cut -d ' ' -f 3 | nl -s ') '
read -p "Client: " client_number
[ -z "$client_number" ] && abort_and_exit
until [[ "$client_number" =~ ^[0-9]+$ && "$client_number" -le "$number_of_clients" ]]; do
echo "$client_number: invalid selection."
read -p "Client: " client_number
[ -z "$client_number" ] && abort_and_exit
done
client=$(grep '^# BEGIN_PEER' /etc/wireguard/wg0.conf | cut -d ' ' -f 3 | sed -n "$client_number"p)
echo