From cdfb0697c10ac4ffc75aa7cafb00d75975155751 Mon Sep 17 00:00:00 2001
From: Andrew Hurley <andrew@cherished.me>
Date: Wed, 23 Nov 2022 20:57:04 +1100
Subject: [PATCH] sudo -u #1000

---
 backup.sh |  2 +-
 v2b.sh    | 26 ++++++++++++++++----------
 vvv.sh    | 33 +++++++++++++++++++--------------
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/backup.sh b/backup.sh
index a0a3294..ddf94dd 100755
--- a/backup.sh
+++ b/backup.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-pushd /srv/backup && ./vvv.sh docker && nice ./v2b.sh -u backup_docker && popd
+pushd /srv/backup && ./vvv.sh docker && ./vvv.sh mailus && nice ./v2b.sh -u backup && popd
diff --git a/v2b.sh b/v2b.sh
index 7c7d764..a2698cc 100755
--- a/v2b.sh
+++ b/v2b.sh
@@ -4,6 +4,11 @@
 set -u
 set -o pipefail
 
+if [[ $(id -u) -ne "0" ]]; then
+  printf "Elevated privileges required\n"
+  exit 1
+fi
+
 UMASK="$(umask)"
 
 cprompt () {
@@ -21,7 +26,7 @@ cprompt () {
 
 usage () {
   printf "v2b.sh <option> [ <prefix> ]\n"
-  printf "  <prefix> only backup volumes with this prefix\n"
+  printf "  <prefix> only backup volumes with this prefix (underscore not required)\n"
   printf "  option: k (keep existing backups)\n"
   printf "  option: p (remove prefix from tar archive file name\n"
   printf "  option: u (unattended backup)\n"
@@ -49,9 +54,9 @@ shift $((OPTIND -1))
 FOLDER="_vols_"
 
 if [[ $# > 0 ]]; then
-  VOLUMES="$(sudo docker volume ls -q |grep "${1}_")"
+  VOLUMES="$(docker volume ls -q |grep "${1}_")"
 else
-  VOLUMES="$(sudo docker volume ls -q)"
+  VOLUMES="$(docker volume ls -q)"
 fi
 
 if [[ -z $VOLUMES ]]; then
@@ -65,9 +70,10 @@ else
   LASTF="${FOLDER}"
 fi
 
+USER=$(stat -c '%u' $BASH_SOURCE)
 INDEX="$((( ${LASTF#${FOLDER}} + 0 )))"
 NEWFL="${FOLDER}$(printf "%05d" $((( ${INDEX} + 1 ))))"
-TEMPF="$(mktemp -dt -p $PWD _XXXXXXXXXXXXXXX_)"
+TEMPF="$(sudo -u #${USER?err} mktemp -dt -p $PWD _XXXXXXXXXXXXXXX_)"
 
 for VOL in ${VOLUMES}; do
   if [[ $REMOVE == "true" ]]; then
@@ -81,12 +87,12 @@ for VOL in ${VOLUMES}; do
   fi
   printf "\n${VOL} --> ${TEMPF}/${TAR}\n"
   cprompt || continue
-  sudo docker run --rm --log-driver none \
+  docker run --rm --log-driver none \
     -v "${VOL}:/volume" \
     -v "${TEMPF}:/backup" \
     loomchild/volume-backup backup -v "${TAR}"
   if [[ -f "${TEMPF}/${TAR}" ]]; then
-    sudo chmod 600 "${TEMPF}/${TAR}"
+    chmod 600 "${TEMPF}/${TAR}"
   fi
 done
 
@@ -101,12 +107,12 @@ else
   if mv "${TEMPF}" "${FOLDER}"; then
     if [[ $SEND == "true" ]]; then
       if [[ $ADDR =~ ":" ]]; then
-        if sudo ssh "${ADDR%:*}" "mkdir -p ${ADDR#*:}"; then
-          sudo scp "${FOLDER}"/* "${ADDR}"
+        if ssh "${ADDR%:*}" "mkdir -p ${ADDR#*:}"; then
+          scp "${FOLDER}"/* "${ADDR}"
         fi
       else
-        if sudo ssh "${ADDR}" "mkdir -p ${PWD}/_$(hostname -f)_"; then
-          sudo scp "${FOLDER}"/* "${ADDR}:${PWD}/_$(hostname -f)_"
+        if ssh "${ADDR}" "mkdir -p ${PWD}/_$(hostname -f)_"; then
+          scp "${FOLDER}"/* "${ADDR}:${PWD}/_$(hostname -f)_"
         fi
       fi
     fi
diff --git a/vvv.sh b/vvv.sh
index dd3cdea..dba2299 100755
--- a/vvv.sh
+++ b/vvv.sh
@@ -4,6 +4,11 @@
 set -u
 set -o pipefail
 
+if [[ $(id -u) -ne "0" ]]; then
+  printf "Elevated privileges required\n"
+  exit 1
+fi
+
 usage () { 
   printf "Usage: vvv.sh <project>\n"
   printf "  project = Compose project folder.\n"
@@ -32,7 +37,7 @@ scripts () {
   for MODE in backup restore; do
     FILE="docker-${MODE}.sh"
     SCRIPT="#!/bin/bash"$'\n'
-    SCRIPT="${SCRIPT}sudo docker run --rm \\"$'\n'
+    SCRIPT="${SCRIPT}docker run --rm \\"$'\n'
     SCRIPT="${SCRIPT}  --name volumerize \\"$'\n'
     SCRIPT="${SCRIPT}  -e TZ=Australia/Perth \\"$'\n'
     SCRIPT="${SCRIPT}  -e VOLUMERIZE_SOURCE=/source \\"$'\n'
@@ -54,8 +59,7 @@ scripts () {
       printf "Fatal error 1.\n"
       exit 1
     fi
-    printf "${SCRIPT}" > "${FILE}"
-    chmod +x "${FILE}"
+    printf "${SCRIPT}" |sudo -u "#${USER?err}" tee "${FILE}"
   done
 }
 
@@ -70,46 +74,47 @@ if [[ ! -d "../${PROJECT}" ]]; then
   exit 1
 fi
 
-VOLUMES="$(sudo ls /var/lib/docker/volumes |grep "${PROJECT}_")"
+VOLUMES="$(ls /var/lib/docker/volumes |grep "${PROJECT}_")"
 if [[ -z "$VOLUMES" ]]; then
   printf "There are no volumes found to backup/restore!\n"
   exit 1
 fi
 
+USER=$(stat -c '%u' $BASH_SOURCE)
+
 pushd "../${PROJECT}" > /dev/null || exit 1
+
 if [[ ! $RESTORE == "true" ]]; then
   scripts
 fi
 
 for COMP in docker-compose*.yml; do
-  COMMAND="sudo docker compose -f $COMP stop"
+  COMMAND="docker compose -f $COMP stop"
   printf "${COMMAND}\n"
-  ${COMMAND}
-  if ! ${COMMAND}; then
+  if ! bash -c "${COMMAND}"; then
     printf "Services 'docker compose stop' error."
     exit 1
   fi
 done
 
 for COMP in docker-compose*.yml; do
-  COMMAND="sudo docker compose -f $COMP rm -f"
+  COMMAND="docker compose -f $COMP rm -f"
   printf "${COMMAND}\n"
-  ${COMMAND}
-  if ! ${COMMAND}; then
+  if ! bash -c "${COMMAND}"; then
     printf "Services 'docker compose rm' error."
     exit 1
   fi
 done
 
 if [[ $RESTORE == "true" ]]; then
-  "./docker-restore.sh"
+  bash "./docker-restore.sh"
 else
-  "./docker-backup.sh"
+  bash "./docker-backup.sh"
   if [[ $DOWN = "false" ]]; then
     for COMP in docker-compose*.yml; do
-      COMMAND="sudo docker compose -f $COMP up -d"
+      COMMAND="docker compose -f $COMP up -d"
       printf "${COMMAND}\n"
-      if ! ${COMMAND}; then
+      if ! bash -c "${COMMAND}"; then
         printf "Services 'up' error."
         exit 1
       fi