From 4a5804a24c7397c24945c0f94c2609483f008100 Mon Sep 17 00:00:00 2001
From: 4s3ti <4s3ti@protonmail.com>
Date: Sat, 8 May 2021 15:51:27 +0200
Subject: [PATCH] Multiple fixes and Shellcheck complaiance

fixes for Issue #1306, qrcode now defaults to ansiutf8,
added flag -a256 or --ansi256 if their fonts are having trouble

Shellcheck compliance #1233 for qrcodeCONF.sh,
LIST array is now created with mapfile instead
quoted multiple variables.

fixes for Issue #1307, User creation won't allow user creation with name
starting with "-", qrcodeCONF.sh won't accept wrong options or users starting with "-"
and exit with error code 1
---
 scripts/wireguard/makeCONF.sh   |  5 +++++
 scripts/wireguard/qrcodeCONF.sh | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/scripts/wireguard/makeCONF.sh b/scripts/wireguard/makeCONF.sh
index abff296..17b55c7 100755
--- a/scripts/wireguard/makeCONF.sh
+++ b/scripts/wireguard/makeCONF.sh
@@ -64,6 +64,11 @@ if [[ "${CLIENT_NAME}" =~ [^a-zA-Z0-9.@_-] ]]; then
     exit 1
 fi
 
+if [[ "${CLIENT_NAME:0:1}" == "-" ]]; then
+    echo "Name cannot start with -"
+    exit 1
+fi
+
 if [[ "${CLIENT_NAME}" =~ ^[0-9]+$ ]]; then
     echo "Names cannot be integers."
     exit 1
diff --git a/scripts/wireguard/qrcodeCONF.sh b/scripts/wireguard/qrcodeCONF.sh
index 7566546..a1600f8 100755
--- a/scripts/wireguard/qrcodeCONF.sh
+++ b/scripts/wireguard/qrcodeCONF.sh
@@ -3,8 +3,10 @@
 helpFunc(){
     echo "::: Show the qrcode of a client for use with the mobile app"
     echo ":::"
-    echo "::: Usage: pivpn <-qr|qrcode> [-h|--help] [<client-1>] ... [<client-n>] ..."
+    echo "::: Usage: pivpn <-qr|qrcode> [-h|--help] [Options] [<client-1>] ... [<client-n>] ..."
     echo ":::"
+    echo "::: Options:"
+    echo ":::  -a256|ansi256        Shows QR Code in ansi256 characters"
     echo "::: Commands:"
     echo ":::  [none]               Interactive mode"
     echo ":::  <client>             Client(s) to show"
@@ -12,6 +14,7 @@ helpFunc(){
 }
 
 # Parse input arguments
+encoding="ansiutf8"
 while test $# -gt 0
 do
     _key="$1"
@@ -20,6 +23,9 @@ do
             helpFunc
             exit 0
             ;;
+        -a256|--ansi256)
+            encoding="ansi256"
+            ;;
         *)
             CLIENTS_TO_SHOW+=("$1")
             ;;
@@ -33,14 +39,14 @@ if [ ! -s clients.txt ]; then
     exit 1
 fi
 
-LIST=($(awk '{print $1}' clients.txt))
+mapfile -t LIST < <(awk '{print $1}' clients.txt)
 if [ "${#CLIENTS_TO_SHOW[@]}" -eq 0 ]; then
 
     echo -e "::\e[4m  Client list  \e[0m::"
     len=${#LIST[@]}
     COUNTER=1
-    while [ $COUNTER -le ${len} ]; do
-        printf "%0${#len}s) %s\r\n" ${COUNTER} ${LIST[(($COUNTER-1))]}
+    while [ $COUNTER -le "${len}" ]; do
+        printf "%0${#len}s) %s\r\n" "${COUNTER}" "${LIST[(($COUNTER-1))]}"
         ((COUNTER++))
     done
 
@@ -54,13 +60,16 @@ fi
 
 for CLIENT_NAME in "${CLIENTS_TO_SHOW[@]}"; do
     re='^[0-9]+$'
-    if [[ ${CLIENT_NAME} =~ $re ]] ; then
+    if [[ ${CLIENT_NAME:0:1} == "-" ]]; then
+        echo "${CLIENT_NAME} is not a valid client name or option"
+        exit 1
+    elif [[ ${CLIENT_NAME} =~ $re ]] ; then
         CLIENT_NAME=${LIST[$((CLIENT_NAME -1))]}
     fi    
     if grep -qw "${CLIENT_NAME}" clients.txt; then
         echo -e "::: Showing client \e[1m${CLIENT_NAME}\e[0m below"
         echo "====================================================================="
-        qrencode -t ansi256 < "${CLIENT_NAME}.conf"
+        qrencode -t "${encoding}" < "${CLIENT_NAME}.conf"
         echo "====================================================================="
     else
         echo -e "::: \e[1m${CLIENT_NAME}\e[0m does not exist"