mirror of
https://github.com/tw93/Mole.git
synced 2026-03-22 16:10:08 +00:00
fix(purge): normalize search roots for scan filtering (#478)
This commit is contained in:
@@ -254,12 +254,33 @@ is_purge_project_root() {
|
||||
is_safe_project_artifact() {
|
||||
local path="$1"
|
||||
local search_path="$2"
|
||||
|
||||
# Normalize search path to tolerate user config entries with trailing slash.
|
||||
if [[ "$search_path" != "/" ]]; then
|
||||
search_path="${search_path%/}"
|
||||
fi
|
||||
|
||||
if [[ "$path" != /* ]]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ "$path" != "$search_path/"* ]]; then
|
||||
return 1
|
||||
# fd may emit physical/canonical paths (for example /private/var)
|
||||
# while configured search roots use symlink aliases (for example /var).
|
||||
# Compare physical paths as a fallback to avoid false negatives.
|
||||
local physical_path=""
|
||||
local physical_search_path=""
|
||||
if [[ -d "$path" && -d "$search_path" ]]; then
|
||||
physical_path=$(cd "$path" 2> /dev/null && pwd -P || echo "")
|
||||
physical_search_path=$(cd "$search_path" 2> /dev/null && pwd -P || echo "")
|
||||
fi
|
||||
|
||||
if [[ -z "$physical_path" || -z "$physical_search_path" || "$physical_path" != "$physical_search_path/"* ]]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
path="$physical_path"
|
||||
search_path="$physical_search_path"
|
||||
fi
|
||||
|
||||
# Must not be a direct child of the search root.
|
||||
|
||||
@@ -92,6 +92,23 @@ setup() {
|
||||
[[ "$result" == "ALLOWED" ]]
|
||||
}
|
||||
|
||||
@test "is_safe_project_artifact: accepts physical path under symlinked search root" {
|
||||
mkdir -p "$HOME/www/real/proj/node_modules"
|
||||
touch "$HOME/www/real/proj/package.json"
|
||||
ln -s "$HOME/www/real" "$HOME/www/link"
|
||||
|
||||
result=$(bash -c "
|
||||
source '$PROJECT_ROOT/lib/clean/project.sh'
|
||||
if is_safe_project_artifact '$HOME/www/real/proj/node_modules' '$HOME/www/link/proj'; then
|
||||
echo 'ALLOWED'
|
||||
else
|
||||
echo 'BLOCKED'
|
||||
fi
|
||||
")
|
||||
|
||||
[[ "$result" == "ALLOWED" ]]
|
||||
}
|
||||
|
||||
@test "filter_nested_artifacts: removes nested node_modules" {
|
||||
mkdir -p "$HOME/www/project/node_modules/package/node_modules"
|
||||
|
||||
@@ -472,6 +489,28 @@ EOF
|
||||
[[ "$result" == "FOUND" ]]
|
||||
}
|
||||
|
||||
@test "scan_purge_targets: supports trailing slash search path in find mode" {
|
||||
mkdir -p "$HOME/single-project/node_modules"
|
||||
touch "$HOME/single-project/package.json"
|
||||
|
||||
local scan_output
|
||||
scan_output="$(mktemp)"
|
||||
|
||||
result=$(bash -c "
|
||||
source '$PROJECT_ROOT/lib/clean/project.sh'
|
||||
MO_USE_FIND=1 scan_purge_targets '$HOME/single-project/' '$scan_output'
|
||||
if grep -q '$HOME/single-project/node_modules' '$scan_output'; then
|
||||
echo 'FOUND'
|
||||
else
|
||||
echo 'MISSING'
|
||||
fi
|
||||
")
|
||||
|
||||
rm -f "$scan_output"
|
||||
|
||||
[[ "$result" == "FOUND" ]]
|
||||
}
|
||||
|
||||
@test "is_recently_modified: detects recent projects" {
|
||||
mkdir -p "$HOME/www/project/node_modules"
|
||||
touch "$HOME/www/project/package.json"
|
||||
|
||||
Reference in New Issue
Block a user