From: Steven Baltakatei Sandoval <baltakatei@gmail.com>
Date: Fri, 3 Jul 2020 22:54:50 +0000 (+0000)
Subject: test(bkgpslog):Test recipient string quoting
X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/commitdiff_plain/be9ef23e2a53f4f8ec7553388d9e6f3d169af0e4

test(bkgpslog):Test recipient string quoting

recipient strings with spaces in them don't fare well with `\"` in
them when such strings are used to create new strings.
---

diff --git a/exec/bkgpslog b/exec/bkgpslog
index 50b83dc..397fe11 100755
--- a/exec/bkgpslog
+++ b/exec/bkgpslog
@@ -14,7 +14,7 @@ DIR_TMP_DEFAULT="/dev/shm"; # Default parent of working directory
 SCRIPT_TIME_START=$(date +%Y%m%dT%H%M%S.%N);
 PATH="$HOME/.local/bin:$PATH";   # Add "$(systemd-path user-binaries)" path in case apps saved there
 SCRIPT_HOSTNAME=$(hostname);     # Save hostname of system running this script.
-SCRIPT_VERSION="0.3.6";          # Define version of script.
+SCRIPT_VERSION="0.3.7";          # Define version of script.
 SCRIPT_NAME="bkgpslog";          # Define basename of script file.
 SCRIPT_URL="https://gitlab.com/baltakatei/ninfacyzga-01"; # Define wesite hosting this script.
 AGE_VERSION="1.0.0-beta2";       # Define version of age (encryption program)
@@ -927,7 +927,7 @@ main() {
 		vbm "DEBUG:Testing pubkey string:$pubkey";
 		if echo "butts" | age -a -r "$pubkey" 1>/dev/null; then
 		    #### Form age recipient string
-		    recipients="$recipients""-r \"$pubkey\" ";
+		    recipients="$recipients""-r '$pubkey' ";
 		    vbm "STATUS:Added pubkey for forming age recipient string:""$pubkey";
 		    vbm "DEBUG:recipients:""$recipients";
 		    #### Add validated pubkey to recPubKeysValid array
@@ -939,26 +939,26 @@ main() {
 	    vbm "DEBUG:Finished processing recPubKeys array";
 
 	    ##  Form age command string
-	    CMD_ENCRYPT="age ""$recipients ";
-	    CMD_ENCRYPT_SUFFIX=".age";
+	    CMD_ENCRYPT="age ""$recipients " && vbm "CMD_ENCRYPT:$CMD_ENCRYPT";
+	    CMD_ENCRYPT_SUFFIX=".age" && vbm "CMD_ENCRYPT_SUFFIX:$CMD_ENCRYPT_SUFFIX";
 	else
 	    yell "ERROR:Encryption enabled but \"age\" not found. Exiting."; exit 1;
 	fi
     else
-	CMD_ENCRYPT="tee /dev/null ";
-	CMD_ENCRYPT_SUFFIX="";
+	CMD_ENCRYPT="tee /dev/null " && vbm "CMD_ENCRYPT:$CMD_ENCRYPT";
+	CMD_ENCRYPT_SUFFIX="" && vbm "CMD_ENCRYPT_SUFFIX:$CMD_ENCRYPT_SUFFIX";
 	vbm "DEBUG:Encryption not enabled."
     fi
     if [[ "$OPTION_COMPRESS" = "true" ]]; then # Check if compression option active
 	if checkapp gzip; then # Check if gzip available
-	    CMD_COMPRESS="gzip ";
-	    CMD_COMPRESS_SUFFIX=".gz";
+	    CMD_COMPRESS="gzip " && vbm "CMD_COMPRESS:$CMD_COMPRESS";
+	    CMD_COMPRESS_SUFFIX=".gz" && vbm "CMD_COMPRESS_SUFFIX:$CMD_COMPRESS_SUFFIX";
 	else
 	    yell "ERROR:Compression enabled but \"gzip\" not found. Exiting."; exit 1;
 	fi
     else
-	CMD_COMPRESS="tee /dev/null ";
-	CMD_COMPRESS_SUFFIX="";
+	CMD_COMPRESS="tee /dev/null " && vbm "CMD_COMPRESS:$CMD_COMPRESS";
+	CMD_COMPRESS_SUFFIX="" && vbm "CMD_COMPRESS_SUFFIX:$CMD_COMPRESS_SUFFIX";
 	vbm "DEBUG:Compression not enabled.";
     fi