mirror of
https://github.com/tw93/Mole.git
synced 2026-02-04 12:41:46 +00:00
feat: improve app cleanup with orphaned LaunchAgent detection
New features: - Add orphaned LaunchAgent/LaunchDaemon detection with 5-layer verification - Layer 1: Check if program path exists - Layer 2: Verify AssociatedBundleIdentifiers via mdfind - Layer 3: Check Application Support directory activity (7 days) - Layer 4: Fuzzy match app name in /Applications - Layer 5: Special handling for PrivilegedHelperTools - Only process user-level ~/Library/LaunchAgents (safer than system-level) - Unload agent before removal using launchctl Bug fixes: - Handle paths with spaces correctly in orphaned_app_data cleanup - Add nullglob state management to prevent word splitting - Use IFS=$'\n' for proper array iteration - Only count successful deletions (check safe_clean return value) Tests: - Add 4 new tests for is_launch_item_orphaned edge cases - Add tests for space handling and deletion count accuracy
This commit is contained in:
tw93
@@ -80,15 +80,137 @@ EOF
|
||||
set -euo pipefail
|
||||
source "$PROJECT_ROOT/lib/core/common.sh"
|
||||
source "$PROJECT_ROOT/lib/clean/apps.sh"
|
||||
ls() { return 1; }
|
||||
stop_section_spinner() { :; }
|
||||
rm -rf "$HOME/Library/Caches"
|
||||
clean_orphaned_app_data
|
||||
EOF
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"Skipped: No permission"* ]]
|
||||
[[ "$output" == *"No permission"* ]]
|
||||
}
|
||||
|
||||
@test "clean_orphaned_app_data handles paths with spaces correctly" {
|
||||
run env HOME="$HOME" PROJECT_ROOT="$PROJECT_ROOT" bash --noprofile --norc <<'EOF'
|
||||
set -euo pipefail
|
||||
source "$PROJECT_ROOT/lib/core/common.sh"
|
||||
source "$PROJECT_ROOT/lib/clean/apps.sh"
|
||||
|
||||
# Mock scan_installed_apps - return empty (no installed apps)
|
||||
scan_installed_apps() {
|
||||
: > "$1"
|
||||
}
|
||||
|
||||
# Mock mdfind to return empty (no app found)
|
||||
mdfind() {
|
||||
return 0
|
||||
}
|
||||
|
||||
# Ensure local function mock works even if timeout/gtimeout is installed
|
||||
run_with_timeout() { shift; "$@"; }
|
||||
|
||||
# Mock safe_clean (normally from bin/clean.sh)
|
||||
safe_clean() {
|
||||
rm -rf "$1"
|
||||
return 0
|
||||
}
|
||||
|
||||
# Create required Library structure for permission check
|
||||
mkdir -p "$HOME/Library/Caches"
|
||||
|
||||
# Create test structure with spaces in path (old modification time: 61 days ago)
|
||||
mkdir -p "$HOME/Library/Saved Application State/com.test.orphan.savedState"
|
||||
# Create a file with some content so directory size > 0
|
||||
echo "test data" > "$HOME/Library/Saved Application State/com.test.orphan.savedState/data.plist"
|
||||
# Set modification time to 61 days ago (older than 60-day threshold)
|
||||
touch -t "$(date -v-61d +%Y%m%d%H%M.%S 2>/dev/null || date -d '61 days ago' +%Y%m%d%H%M.%S)" "$HOME/Library/Saved Application State/com.test.orphan.savedState" 2>/dev/null || true
|
||||
|
||||
# Disable spinner for test
|
||||
start_section_spinner() { :; }
|
||||
stop_section_spinner() { :; }
|
||||
|
||||
# Run cleanup
|
||||
clean_orphaned_app_data
|
||||
|
||||
# Verify path with spaces was handled correctly (not split into multiple paths)
|
||||
if [[ -d "$HOME/Library/Saved Application State/com.test.orphan.savedState" ]]; then
|
||||
echo "ERROR: Orphaned savedState not deleted"
|
||||
exit 1
|
||||
else
|
||||
echo "SUCCESS: Orphaned savedState deleted correctly"
|
||||
fi
|
||||
EOF
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"SUCCESS"* ]]
|
||||
}
|
||||
|
||||
@test "clean_orphaned_app_data only counts successful deletions" {
|
||||
run env HOME="$HOME" PROJECT_ROOT="$PROJECT_ROOT" bash --noprofile --norc <<'EOF'
|
||||
set -euo pipefail
|
||||
source "$PROJECT_ROOT/lib/core/common.sh"
|
||||
source "$PROJECT_ROOT/lib/clean/apps.sh"
|
||||
|
||||
# Mock scan_installed_apps - return empty
|
||||
scan_installed_apps() {
|
||||
: > "$1"
|
||||
}
|
||||
|
||||
# Mock mdfind to return empty (no app found)
|
||||
mdfind() {
|
||||
return 0
|
||||
}
|
||||
|
||||
# Ensure local function mock works even if timeout/gtimeout is installed
|
||||
run_with_timeout() { shift; "$@"; }
|
||||
|
||||
# Create required Library structure for permission check
|
||||
mkdir -p "$HOME/Library/Caches"
|
||||
|
||||
# Create test files (old modification time: 61 days ago)
|
||||
mkdir -p "$HOME/Library/Caches/com.test.orphan1"
|
||||
mkdir -p "$HOME/Library/Caches/com.test.orphan2"
|
||||
# Create files with content so size > 0
|
||||
echo "data1" > "$HOME/Library/Caches/com.test.orphan1/data"
|
||||
echo "data2" > "$HOME/Library/Caches/com.test.orphan2/data"
|
||||
# Set modification time to 61 days ago
|
||||
touch -t "$(date -v-61d +%Y%m%d%H%M.%S 2>/dev/null || date -d '61 days ago' +%Y%m%d%H%M.%S)" "$HOME/Library/Caches/com.test.orphan1" 2>/dev/null || true
|
||||
touch -t "$(date -v-61d +%Y%m%d%H%M.%S 2>/dev/null || date -d '61 days ago' +%Y%m%d%H%M.%S)" "$HOME/Library/Caches/com.test.orphan2" 2>/dev/null || true
|
||||
|
||||
# Mock safe_clean to fail on first item, succeed on second
|
||||
safe_clean() {
|
||||
if [[ "$1" == *"orphan1"* ]]; then
|
||||
return 1 # Fail
|
||||
else
|
||||
rm -rf "$1"
|
||||
return 0 # Succeed
|
||||
fi
|
||||
}
|
||||
|
||||
# Disable spinner
|
||||
start_section_spinner() { :; }
|
||||
stop_section_spinner() { :; }
|
||||
|
||||
# Run cleanup
|
||||
clean_orphaned_app_data
|
||||
|
||||
# Verify first item still exists (safe_clean failed)
|
||||
if [[ -d "$HOME/Library/Caches/com.test.orphan1" ]]; then
|
||||
echo "PASS: Failed deletion preserved"
|
||||
fi
|
||||
|
||||
# Verify second item deleted
|
||||
if [[ ! -d "$HOME/Library/Caches/com.test.orphan2" ]]; then
|
||||
echo "PASS: Successful deletion removed"
|
||||
fi
|
||||
|
||||
# Check that output shows correct count (only 1, not 2)
|
||||
EOF
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"PASS: Failed deletion preserved"* ]]
|
||||
[[ "$output" == *"PASS: Successful deletion removed"* ]]
|
||||
}
|
||||
|
||||
|
||||
@test "is_critical_system_component matches known system services" {
|
||||
run bash --noprofile --norc <<'EOF'
|
||||
set -euo pipefail
|
||||
@@ -160,3 +282,144 @@ EOF
|
||||
[[ "$output" != *"rm-called"* ]]
|
||||
[[ "$output" != *"launchctl-called"* ]]
|
||||
}
|
||||
|
||||
@test "is_launch_item_orphaned detects orphan when program missing" {
|
||||
run env HOME="$HOME" PROJECT_ROOT="$PROJECT_ROOT" bash --noprofile --norc <<'EOF'
|
||||
set -euo pipefail
|
||||
source "$PROJECT_ROOT/lib/core/common.sh"
|
||||
source "$PROJECT_ROOT/lib/clean/apps.sh"
|
||||
|
||||
tmp_dir="$(mktemp -d)"
|
||||
tmp_plist="$tmp_dir/com.test.orphan.plist"
|
||||
|
||||
cat > "$tmp_plist" << 'PLIST'
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>com.test.orphan</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>/nonexistent/app/program</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
PLIST
|
||||
|
||||
run_with_timeout() { shift; "$@"; }
|
||||
|
||||
if is_launch_item_orphaned "$tmp_plist"; then
|
||||
echo "orphan"
|
||||
fi
|
||||
|
||||
rm -rf "$tmp_dir"
|
||||
EOF
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"orphan"* ]]
|
||||
}
|
||||
|
||||
@test "is_launch_item_orphaned protects when program exists" {
|
||||
run env HOME="$HOME" PROJECT_ROOT="$PROJECT_ROOT" bash --noprofile --norc <<'EOF'
|
||||
set -euo pipefail
|
||||
source "$PROJECT_ROOT/lib/core/common.sh"
|
||||
source "$PROJECT_ROOT/lib/clean/apps.sh"
|
||||
|
||||
tmp_dir="$(mktemp -d)"
|
||||
tmp_plist="$tmp_dir/com.test.active.plist"
|
||||
tmp_program="$tmp_dir/program"
|
||||
touch "$tmp_program"
|
||||
|
||||
cat > "$tmp_plist" << PLIST
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>com.test.active</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>$tmp_program</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
PLIST
|
||||
|
||||
run_with_timeout() { shift; "$@"; }
|
||||
|
||||
if is_launch_item_orphaned "$tmp_plist"; then
|
||||
echo "orphan"
|
||||
else
|
||||
echo "not-orphan"
|
||||
fi
|
||||
|
||||
rm -rf "$tmp_dir"
|
||||
EOF
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"not-orphan"* ]]
|
||||
}
|
||||
|
||||
@test "is_launch_item_orphaned protects when app support active" {
|
||||
run env HOME="$HOME" PROJECT_ROOT="$PROJECT_ROOT" bash --noprofile --norc <<'EOF'
|
||||
set -euo pipefail
|
||||
source "$PROJECT_ROOT/lib/core/common.sh"
|
||||
source "$PROJECT_ROOT/lib/clean/apps.sh"
|
||||
|
||||
tmp_dir="$(mktemp -d)"
|
||||
tmp_plist="$tmp_dir/com.test.appsupport.plist"
|
||||
|
||||
mkdir -p "$HOME/Library/Application Support/TestApp"
|
||||
touch "$HOME/Library/Application Support/TestApp/recent.txt"
|
||||
|
||||
cat > "$tmp_plist" << 'PLIST'
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>com.test.appsupport</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>$HOME/Library/Application Support/TestApp/Current/app</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
PLIST
|
||||
|
||||
run_with_timeout() { shift; "$@"; }
|
||||
|
||||
if is_launch_item_orphaned "$tmp_plist"; then
|
||||
echo "orphan"
|
||||
else
|
||||
echo "not-orphan"
|
||||
fi
|
||||
|
||||
rm -rf "$tmp_dir"
|
||||
rm -rf "$HOME/Library/Application Support/TestApp"
|
||||
EOF
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"not-orphan"* ]]
|
||||
}
|
||||
|
||||
@test "clean_orphaned_launch_agents skips when no orphans" {
|
||||
run env HOME="$HOME" PROJECT_ROOT="$PROJECT_ROOT" bash --noprofile --norc <<'EOF'
|
||||
set -euo pipefail
|
||||
source "$PROJECT_ROOT/lib/core/common.sh"
|
||||
source "$PROJECT_ROOT/lib/clean/apps.sh"
|
||||
|
||||
mkdir -p "$HOME/Library/LaunchAgents"
|
||||
|
||||
start_section_spinner() { :; }
|
||||
stop_section_spinner() { :; }
|
||||
note_activity() { :; }
|
||||
get_path_size_kb() { echo "1"; }
|
||||
run_with_timeout() { shift; "$@"; }
|
||||
|
||||
clean_orphaned_launch_agents
|
||||
EOF
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user