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.

Give the helper's ledger to the person before it goes to the Trash

Țugui Dragoșf44b08e90082
diff --git a/Packages/PeelCore/Sources/PeelPrivileged/DirectoryHandle.swift b/Packages/PeelCore/Sources/PeelPrivileged/DirectoryHandle.swift
index 5caa4135..decd1c43 100644
--- a/Packages/PeelCore/Sources/PeelPrivileged/DirectoryHandle.swift
+++ b/Packages/PeelCore/Sources/PeelPrivileged/DirectoryHandle.swift
@@ -97,6 +97,11 @@ public final class DirectoryHandle: Sendable {
return info
}
+ /// Makes what sits at `name` inside this folder, a link itself included, belong to `user`; its group stays.
+ public func give(_ name: String, to user: uid_t) -> Bool {
+ name.withCString { fchownat(descriptor, $0, user, gid_t(bitPattern: -1), AT_SYMLINK_NOFOLLOW) == 0 }
+ }
+
/// The owner of the directory itself, read through the descriptor.
public func ownerIdentifier() -> uid_t? {
var info = stat()
diff --git a/Packages/PeelCore/Sources/PeelPrivileged/HelperInterface.swift b/Packages/PeelCore/Sources/PeelPrivileged/HelperInterface.swift
index 886fc74f..a133b40d 100644
--- a/Packages/PeelCore/Sources/PeelPrivileged/HelperInterface.swift
+++ b/Packages/PeelCore/Sources/PeelPrivileged/HelperInterface.swift
@@ -7,7 +7,7 @@ public enum HelperIdentity {
public static let launchdPlistName = "com.tuguidragos.Peel.Helper.plist"
/// Raise it whenever the helper changes, so Peel never works with a helper of another version. The helper
/// refuses requests that carry any other version.
- public static let protocolVersion = 17
+ public static let protocolVersion = 18
}
/// The complete set of privileged operations. The helper validates every argument itself.
diff --git a/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift b/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift
index 4fb1a041..01c9a785 100644
--- a/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift
+++ b/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift
@@ -80,7 +80,8 @@ public final class HelperLedger: Sendable {
/// is the helper's own and closed to everyone else, as the ledger keeps its folder.
public static func moveFolder(
_ folder: String = defaultFolder,
- into trash: DirectoryHandle
+ into trash: DirectoryHandle,
+ givingTo user: uid_t
) -> Result<String?, POSIXError> {
lock.withLock {
switch OpenItem.at(folder) {
@@ -90,9 +91,26 @@ public final class HelperLedger: Sendable {
guard let mode = item.mode, mode & S_IFMT == S_IFDIR, mode & 0o077 == 0, item.owner == geteuid() else {
return .failure(POSIXError(.EPERM))
}
- return TrashMover.move(item, into: trash).map { $0 }
+ // Given to `user` before it moves, so emptying the Trash asks for no password: in the Trash its
+ // entries could no longer be listed without Full Disk Access. Taken back if the move fails, so the
+ // ledger is never the user's where the helper reads it.
+ give(item, to: user)
+ let moved = TrashMover.move(item, into: trash)
+ if case .failure = moved {
+ give(item, to: geteuid())
+ }
+ return moved.map { $0 }
+ }
+ }
+ }
+
+ private static func give(_ item: OpenItem, to user: uid_t) {
+ if let inside = item.parent.child(item.name) {
+ for entry in (try? FileManager.default.contentsOfDirectory(atPath: item.path)) ?? [] {
+ _ = inside.give(entry, to: user)
}
}
+ _ = item.parent.give(item.name, to: user)
}
public struct Unreadable: Error {}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift
index 85903326..ecb54d30 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift
@@ -148,23 +148,26 @@ struct HelperLedgerTests {
let trash = try #require(policy.openTrash(ownedBy: getuid()))
let folder = path("private", in: directory)
- #expect(try HelperLedger.moveFolder(folder, into: trash).get() == nil, "there was no folder to move")
+ #expect(try HelperLedger.moveFolder(folder, into: trash, givingTo: getuid()).get() == nil, "there was no folder to move")
let ledger = try ledger(in: directory)
_ = try move("root/Library/Caches/com.example.plist", with: ledger, policy: policy, in: directory)
- let moved = try #require(try HelperLedger.moveFolder(folder, into: trash).get())
+ let moved = try #require(try HelperLedger.moveFolder(folder, into: trash, givingTo: getuid()).get())
#expect(moved.hasSuffix("/home/.Trash/private"))
#expect(FileManager.default.fileExists(atPath: moved + "/moved.plist"))
#expect(!FileManager.default.fileExists(atPath: folder))
+ for path in [moved, moved + "/moved.plist"] {
+ #expect(try FileManager.default.attributesOfItem(atPath: path)[.ownerAccountID] as? UInt32 == getuid())
+ }
try directory.directory("shared")
try directory.setPermissions(0o755, of: "shared")
#expect(throws: POSIXError.self, "a folder others can read into was moved") {
- try HelperLedger.moveFolder(path("shared", in: directory), into: trash).get()
+ try HelperLedger.moveFolder(path("shared", in: directory), into: trash, givingTo: getuid()).get()
}
try FileManager.default.createSymbolicLink(atPath: folder, withDestinationPath: path("root/Library/Caches", in: directory))
#expect(throws: POSIXError.self, "a link in the ledger's place was followed") {
- try HelperLedger.moveFolder(folder, into: trash).get()
+ try HelperLedger.moveFolder(folder, into: trash, givingTo: getuid()).get()
}
#expect(FileManager.default.fileExists(atPath: path("root/Library/Caches", in: directory)))
}
diff --git a/PeelHelper/HelperService.swift b/PeelHelper/HelperService.swift
index 92d31888..3f5f5677 100644
--- a/PeelHelper/HelperService.swift
+++ b/PeelHelper/HelperService.swift
@@ -142,7 +142,7 @@ final class HelperService: NSObject, PeelHelperProtocol {
else {
return reply(HelperRefusal.noTrash.rawValue)
}
- switch HelperLedger.moveFolder(into: trash) {
+ switch HelperLedger.moveFolder(into: trash, givingTo: caller.user) {
case .success: reply(nil)
case .failure(let error): reply(error.localizedDescription)
}