From: Steven Baltakatei Sandoval <baltakatei@gmail.com>
Date: Sat, 4 Jul 2020 00:22:45 +0000 (+0000)
Subject: fix(bkgpslog):Use eval to build command strings
X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/commitdiff_plain/f665ce95d072891c192ec23058c33de8ec216a12

fix(bkgpslog):Use eval to build command strings

Use eval to build command strings instead of simply putting bare
unquoted variable. This is necessary because the `recipients` variable
used to build a command to encrypt files may contain quotes if one of
the recipients is an ssh key which may have a space:

    ssh-rsa AAAAB...

This should fix the inability of `bkgpslog` to accept quoted ssh
pubkey strings as a specified `-r` option argument.
---

diff --git a/exec/bkgpslog b/exec/bkgpslog
index 397fe11..63acc84 100755
--- a/exec/bkgpslog
+++ b/exec/bkgpslog
@@ -714,7 +714,7 @@ checkMakeTar() {
 appendArgTar(){
     # Desc: Writes first argument to temporary file with arguments as options, then appends file to tar
     # Usage: appendArgTar "$(echo "Data to be written.")" [name of file to be inserted] [tar path] [temp dir] ([cmd1] [cmd2] [cmd3] [cmd4]...)
-    # Version: 1.0.2
+    # Version: 1.0.3
     # Input: arg1: data to be written
     #        arg2: file name of file to be inserted into tar
     #        arg3: tar archive path (must exist first)
@@ -726,6 +726,7 @@ appendArgTar(){
     #          appendArgTar "$(cat /tmp/largefile2.gpg)" "largefile2" $HOME/archive.tar /tmp "gpg --decrypt" &
     #          appendArgTar "$(cat /tmp/largefile3.gpg)" "largefile3" $HOME/archive.tar /tmp "gpg --decrypt" &
     # Depends: bash 5
+    # Ref/Attrib: Using 'eval' to construct command strings https://askubuntu.com/a/476533
 
     # Save function name
     local FN="${FUNCNAME[0]}";
@@ -746,7 +747,11 @@ appendArgTar(){
     if ! [ -z "$7" ]; then CMD3="$7"; else CMD3="tee /dev/null "; fi # command string 3
     if ! [ -z "$8" ]; then CMD4="$8"; else CMD4="tee /dev/null "; fi # command string 4
 
+    # Input command
+    CMD0="echo \"\$1\""
+
     # # Debug
+    # yell "DEBUG:STATUS:$FN:CMD0:$CMD0"
     # yell "DEBUG:STATUS:$FN:CMD1:$CMD1"
     # yell "DEBUG:STATUS:$FN:CMD2:$CMD2"
     # yell "DEBUG:STATUS:$FN:CMD3:$CMD3"
@@ -756,7 +761,7 @@ appendArgTar(){
     # yell "DEBUG:STATUS:$FN:TMP_DIR:$TMP_DIR"
     
     # Write to temporary working dir
-    echo "$1" | $CMD1 | $CMD2 | $CMD3 | $CMD4 > "$TMP_DIR"/"$FILENAME";
+    eval "$CMD0"" | ""$CMD1"" | ""$CMD2"" | ""$CMD3"" | ""$CMD4" > "$TMP_DIR"/"$FILENAME";
 
     # Append to tar
     try tar --append --directory="$TMP_DIR" --file="$TAR_PATH" "$FILENAME";
@@ -765,7 +770,7 @@ appendArgTar(){
 appendFileTar(){
     # Desc: Processes first file and then appends to tar
     # Usage: appendFileTar [file path] [name of file to be inserted] [tar path] [temp dir] ([cmd1] [cmd2] [cmd3] [cmd4]...)
-    # Version: 1.0.1
+    # Version: 1.0.2
     # Input: arg1: path of file to be (processed and) written
     #        arg2: name to use for file inserted into tar
     #        arg3: tar archive path (must exist first)
@@ -793,7 +798,12 @@ appendFileTar(){
     if ! [ -z "$6" ]; then CMD2="$6"; else CMD2="tee /dev/null "; fi # command string 2
     if ! [ -z "$7" ]; then CMD3="$7"; else CMD3="tee /dev/null "; fi # command string 3
     if ! [ -z "$8" ]; then CMD4="$8"; else CMD4="tee /dev/null "; fi # command string 4
+
+    # Input command string
+    CMD0="cat \"\$1\""
+    
     # # Debug
+    # yell "DEBUG:STATUS:$FN:CMD0:$CMD0"
     # yell "DEBUG:STATUS:$FN:CMD1:$CMD1"
     # yell "DEBUG:STATUS:$FN:CMD2:$CMD2"
     # yell "DEBUG:STATUS:$FN:CMD3:$CMD3"
@@ -803,7 +813,7 @@ appendFileTar(){
     # yell "DEBUG:STATUS:$FN:TMP_DIR:$TMP_DIR"
     
     # Write to temporary working dir
-    cat "$1" | $CMD1 | $CMD2 | $CMD3 | $CMD4 > "$TMP_DIR"/"$FILENAME";
+    eval "$CMD0 | $CMD1 | $CMD2 | $CMD3 | $CMD4" > "$TMP_DIR"/"$FILENAME";
 
     # Append to tar
     try tar --append --directory="$TMP_DIR" --file="$TAR_PATH" "$FILENAME";