Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Leave to the helper a way back only root can look into

Țugui Dragoș4a0b68907219
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/HelperReach.swift b/Packages/PeelCore/Sources/PeelCore/Removal/HelperReach.swift
index 8b5d01aa..c0037d5d 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/HelperReach.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/HelperReach.swift
@@ -31,7 +31,9 @@ struct HelperReach: Sendable {
guard lstat(trashed.path(percentEncoded: false), &info) == 0,
let located = PathPattern.located(original.path(percentEncoded: false))
else { return nil }
- return policy.refusal(ofPuttingBack: located, owner: info.st_uid, mode: info.st_mode)
+ let rejection = policy.refusal(ofPuttingBack: located, owner: info.st_uid, mode: info.st_mode)
+ // A folder this process can't look into may be one root can: the helper answers for that itself.
+ return rejection == .unresolvableParent ? nil : rejection
}
/// True when the helper would refuse `url` for where it is: outside the folders it serves, in `/Applications`
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/TrashServiceTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/TrashServiceTests.swift
index 056a0b7a..58552ca3 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/TrashServiceTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/TrashServiceTests.swift
@@ -627,6 +627,24 @@ struct TrashServiceTests {
#expect(lockedFolder == .folderLocked)
}
+ @Test(.permissionsHold) func leavesToTheHelperAWayBackOnlyRootCanLookInto() throws {
+ let directory = try TemporaryDirectory()
+ let vendor = try directory.directory("root/Library/Application Support/Vendor")
+ try directory.directory("root/Library/Application Support/Vendor/Sub")
+ let trashed = try directory.file("home/.Trash/item.txt", bytes: 1)
+ let service = TrashService(
+ environment: SearchEnvironment(
+ homeDirectory: directory.url.appending(path: "home"),
+ rootDirectory: directory.url.appending(path: "root")
+ )
+ ) { $0 }
+ let item = TrashedItem(originalURL: vendor.appending(path: "Sub/item.txt"), trashedURL: trashed, date: .now)
+ try directory.setPermissions(0o000, of: vendor)
+ defer { try? directory.setPermissions(0o755, of: vendor) }
+
+ #expect(service.refusal(ofPuttingBack: item, canUseHelper: true) == nil)
+ }
+
@Test(.permissionsHold) func saysWhatTheHelperWouldOfAPlaceItDoesNotServe() throws {
let directory = try TemporaryDirectory()
let locked = try directory.directory("home/Locked")