7acfdabbac
The backup engine already drops to the backup user (sudo -E -u $docker_install_user) and backupLocationOwner == $docker_install_user, which is exactly what runFileOp/runFileWrite resolve to in both modes. So convert the raw-sudo data ops (mkdir/chmod/rm/find/cat/grep/mv/chown/tee on backup repos, location configs, keys, manifests) to runFileOp/runFileWrite — creating files as the owner directly, no root chown. backup_verify creates its scratch as the backup user (runFileOp mktemp) instead of chown-after. Binary installs (kopia tar/install, borg dnf) -> runSystem. The 44 sudo -u engine drops stay (already least-privilege; the scoped sudoers will grant them). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Signed-off-by: librelad <librelad@digitalangels.vip>
37 lines
995 B
Bash
37 lines
995 B
Bash
#!/bin/bash
|
|
|
|
locationRemove()
|
|
{
|
|
local idx="$1"
|
|
local drop_password="${2:-no}" # legacy flag kept for backwards compat
|
|
|
|
if [[ -z "$idx" || ! "$idx" =~ ^[0-9]+$ ]]; then
|
|
isError "locationRemove requires a numeric index"
|
|
return 1
|
|
fi
|
|
|
|
local dir
|
|
dir=$(backupLocationDir "$idx")
|
|
if [[ ! -d "$dir" ]]; then
|
|
isError "Location $idx does not exist at $dir"
|
|
return 1
|
|
fi
|
|
|
|
local name_var="CFG_BACKUP_LOC_${idx}_NAME"
|
|
local label="${!name_var:-Location $idx}"
|
|
|
|
runFileOp rm -rf "$dir"
|
|
|
|
# Best-effort unset of the now-orphaned env vars so other code in this
|
|
# process doesn't see stale values.
|
|
local var
|
|
while IFS= read -r var; do
|
|
unset "$var"
|
|
done < <(compgen -v 2>/dev/null | grep -E "^CFG_BACKUP_LOC_${idx}_")
|
|
|
|
isSuccessful "Location $idx '$label' removed (directory deleted: $dir)"
|
|
if declare -f webuiGenerateBackupLocations >/dev/null 2>&1; then
|
|
webuiGenerateBackupLocations
|
|
fi
|
|
}
|