33107c4f27
The old copy/move helpers ran 'sudo cp/mv X Y; sudo chown $user_name Y' (root + arbitrary chown). Rework them to write AS the destination's owner — no root, no chown — classifying by dest path like createTouch: /docker/containers/<app> -> runFileOp (docker install user), manager-owned control plane -> runInstallOp. The $user_name arg is now advisory (the path decides). Covers copyFile/copyFiles/ copyFolder/copyFolders/moveFile; copyResource is always containers -> runFileOp; createFolders' non-container branch -> runInstallOp; updateFileOwnership (an arbitrary user1:user2 chown) -> runSystem. Confirmed by callers (containers vs $docker_dir/backup_install_dir/configs dests). Removes a class of root data ops + arbitrary-chown from the runtime. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Signed-off-by: librelad <librelad@digitalangels.vip>
37 lines
1.5 KiB
Bash
Executable File
37 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
createFolders()
|
|
{
|
|
local silent_flag="$1"
|
|
local user_name="$2"
|
|
|
|
for dir_path in "${@:3}"; do
|
|
local folder_name=$(basename "$dir_path")
|
|
local clean_dir=$(echo "$dir_path" | sed 's#//*#/#g')
|
|
|
|
# Under /docker/containers/<app>/ the owner is the docker install user
|
|
# (the rootless container + host generators run as it), so create the dir
|
|
# AS that user via runFileOp — creating it as the right owner avoids a
|
|
# chown-to-another-user the unprivileged runtime can't do. Mirrors
|
|
# createTouch; the $user_name hint is advisory for these paths.
|
|
if [[ "$clean_dir" == "$containers_dir"* || "$clean_dir" == /docker/containers/* ]]; then
|
|
if [ ! -d "$dir_path" ]; then
|
|
local result=$(runFileOp mkdir -p "$dir_path")
|
|
[ "$silent_flag" == "loud" ] && checkSuccess "Creating $folder_name directory"
|
|
elif [ "$silent_flag" == "loud" ]; then
|
|
isNotice "$folder_name directory already exists"
|
|
fi
|
|
continue
|
|
fi
|
|
|
|
# Non-container path = manager-owned control plane -> create AS the
|
|
# manager (runInstallOp); no root, no chown.
|
|
if [ ! -d "$dir_path" ]; then
|
|
local result=$(runInstallOp mkdir -p "$dir_path")
|
|
[ "$silent_flag" == "loud" ] && checkSuccess "Creating $folder_name directory"
|
|
elif [ "$silent_flag" == "loud" ]; then
|
|
isNotice "$folder_name directory already exists"
|
|
fi
|
|
done
|
|
}
|