Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add menu option to show config file and QR code of an existing client #464

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add menu option to show config file and QR code of an existing client #464

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e19cd32
Fix tabulation for listClients() and revokeClient()
DjZU Jul 23, 2023
00bc8cb
Add menu in listClients() with option to show the config file and the…
DjZU Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 45 additions & 2 deletions wireguard-install.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,13 @@ AllowedIPs = ${CLIENT_WG_IPV4}/32,${CLIENT_WG_IPV6}/128" >>"/etc/wireguard/${SER

wg syncconf "${SERVER_WG_NIC}" <(wg-quick strip "${SERVER_WG_NIC}")

generateQR "${CLIENT_NAME}"
}

function generateQR() {
CLIENT_NAME="${1}"
HOME_DIR=$(getHomeDirForClient "${CLIENT_NAME}")

# Generate QR code if qrencode is installed
if command -v qrencode &>/dev/null; then
echo -e "${GREEN}\nHere is your client config file as a QR Code:\n${NC}"
Expand All @@ -391,7 +398,43 @@ function listClients() {
exit 1
fi

grep -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') '
echo ""
echo "List of existing client(s):"
grep -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf" | cut -d ' ' -f 3 | nl -w4 -s ') '

echo ""
echo "What do you want to do?"
echo " 1) Show config file and QR code"
echo " 2) Revoke user"
echo " 3) Exit"
until [[ ${CLIENTS_LIST_MENU_OPTION} =~ ^[1-3]$ ]]; do
read -rp "Select an option [1-3]: " CLIENTS_LIST_MENU_OPTION
done
case "${CLIENTS_LIST_MENU_OPTION}" in
1)
echo ""
echo "Select the existing client you want to show config file and QR code"
grep -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf" | cut -d ' ' -f 3 | nl -w4 -s ') '
until [[ ${CLIENT_NUMBER} -ge 1 && ${CLIENT_NUMBER} -le ${NUMBER_OF_CLIENTS} ]]; do
if [[ ${CLIENT_NUMBER} == '1' ]]; then
read -rp "Select one client [1]: " CLIENT_NUMBER
else
read -rp "Select one client [1-${NUMBER_OF_CLIENTS}]: " CLIENT_NUMBER
fi
done

# match the selected number to a client name
CLIENT_NAME=$(grep -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf" | cut -d ' ' -f 3 | sed -n "${CLIENT_NUMBER}"p)

generateQR "${CLIENT_NAME}"
;;
2)
revokeClient
;;
3)
exit 0
;;
esac
}

function revokeClient() {
Expand All @@ -404,7 +447,7 @@ function revokeClient() {

echo ""
echo "Select the existing client you want to revoke"
grep -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') '
grep -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf" | cut -d ' ' -f 3 | nl -w4 -s ') '
until [[ ${CLIENT_NUMBER} -ge 1 && ${CLIENT_NUMBER} -le ${NUMBER_OF_CLIENTS} ]]; do
if [[ ${CLIENT_NUMBER} == '1' ]]; then
read -rp "Select one client [1]: " CLIENT_NUMBER
Expand Down