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.

The helper's ledger keeps every record when two moves run at once

Țugui Dragoș42b93698155d
diff --git a/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift b/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift
index edd87571..cbcab9a6 100644
--- a/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift
+++ b/Packages/PeelCore/Sources/PeelPrivileged/HelperLedger.swift
@@ -17,7 +17,9 @@ public final class HelperLedger: @unchecked Sendable {
private let url: URL
private let maximumEntries: Int
- private let lock = NSLock()
+ /// One lock for every ledger in the process: the helper serves each connection on a queue of its own, and each
+ /// request opens the ledger afresh, so a lock of each instance's own would let two requests overwrite each other.
+ private static let lock = NSLock()
/// Returns nil when the folder cannot be made private to the helper. Nothing should be moved then either,
/// because an item moved without a record cannot be put back.
@@ -36,7 +38,7 @@ public final class HelperLedger: @unchecked Sendable {
/// Records `items` in one write, before any of them moves. Returns false when the write fails, and then
/// nothing may move. Items are looked up later by identity, so their names in the Trash are not needed.
public func record(_ items: [OpenItem], movedBy user: uid_t) -> Bool {
- lock.withLock {
+ Self.lock.withLock {
let added = items.compactMap { item in
item.identity.map { Entry(path: item.path, identity: $0, user: user, date: .now) }
}
@@ -47,7 +49,7 @@ public final class HelperLedger: @unchecked Sendable {
/// Removes `items` from the ledger: those that did not move after all, and those that were put back.
public func forget(_ items: [OpenItem]) {
- lock.withLock {
+ Self.lock.withLock {
let gone = Set(items.compactMap(\.identity))
guard !gone.isEmpty else { return }
_ = write(read().filter { !gone.contains($0.identity) })
@@ -56,7 +58,7 @@ public final class HelperLedger: @unchecked Sendable {
/// The place `item` was taken from, when this helper took it on behalf of `user`.
public func origin(of item: OpenItem, movedBy user: uid_t) -> String? {
- lock.withLock {
+ Self.lock.withLock {
guard let identity = item.identity else { return nil }
return read().last { $0.identity == identity && $0.user == user }?.path
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift
index 203529dc..27ee174f 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/HelperLedgerTests.swift
@@ -96,6 +96,23 @@ struct HelperLedgerTests {
#expect(ledger.origin(of: swapped, movedBy: getuid()) == nil, "ATTACK SUCCEEDED: a file swapped in under the same name is believed")
}
+ /// The helper serves each connection on a queue of its own, and each request opens the ledger afresh, so two
+ /// moves at once must not lose each other's record: an item the ledger forgot can never be put back.
+ @Test func movesAtOnceKeepEveryRecord() throws {
+ let directory = try TemporaryDirectory()
+ let policy = try policy(in: directory)
+ let items = try (0..<200).map { index in
+ try directory.file("root/Library/Caches/item \(index).plist")
+ return try policy.open(path("root/Library/Caches/item \(index).plist", in: directory)).get()
+ }
+ let url = directory.url.appending(path: "private/moved.plist")
+ DispatchQueue.concurrentPerform(iterations: items.count) { index in
+ _ = HelperLedger(at: url)?.record([items[index]], movedBy: getuid())
+ }
+ let ledger = try ledger(in: directory)
+ #expect(items.filter { ledger.origin(of: $0, movedBy: getuid()) == nil }.isEmpty, "a record was lost")
+ }
+
@Test func keepsTheNewestEntriesAndOnlyInAFolderOfItsOwn() throws {
let directory = try TemporaryDirectory()
let policy = try policy(in: directory)