Webstar/LibrePortal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prune unreadable dirs in the app-config scan

Browse Source 
sourceScanFiles "app_configs" runs as the docker install user and walks
all of containers/. Container-created data dirs (e.g. <app>/postgres,
uid 231141 mode 0700 under rootless) aren't listable by that user, so
find printed a "Permission denied" line per dir into the middle of every
app install's output — noise that reads like the install is touching
other apps.

Prune unreadable/non-traversable dirs instead of descending into them.
They never hold a .config, and pruning keeps genuine find errors
visible where a blanket 2>/dev/null would not. Verified the scan returns
the same 10 configs, with no stderr.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
librelad 2026-08-18 21:55:27 +01:00
parent 4b6b05db81
commit 2ea6340139
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/source/loading/scan_files.sh
View File

@ -53,6 +53,14 @@ sourceScanFiles()
# and not list-readable by the manager), so enumerate them AS that user via
# runFileOp; the manager still sources each (the .config files are o+r). The
# 'containers' install templates are manager-owned, so a plain find suffices.
#
# Unreadable dirs are PRUNED, not descended into: an app's container-created
# data dirs are owned by the container's (sub)uid and mode 0700 — e.g.
# containers/<app>/postgres, uid 231141 under rootless — so even the docker
# install user can't list them, and find would print a "Permission denied"
# line per dir straight into the middle of every install's output. They never
# hold a LibrePortal .config, so skipping them loses nothing; pruning (rather
# than discarding stderr) keeps genuine find errors visible.
if [ "$load_type" != "libreportal_configs" ]; then
local scan_op=""
[[ "$load_type" == "app_configs" ]] && scan_op="runFileOp"
@ -61,7 +69,7 @@ sourceScanFiles()
source "$file"
# echo "$load_type FILE $file"
fi
done < <($scan_op find "$folder_dir" -maxdepth 3 -type d \( -name 'resources' \) -prune -o -type f -name "$file_pattern" -print0)
done < <($scan_op find "$folder_dir" -maxdepth 3 \( -type d \( -name 'resources' -o ! -readable -o ! -executable \) -prune \) -o -type f -name "$file_pattern" -print0)
fi
# Load the categories from the file into an array