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.

Know 1Password's own vault files as password databases

Țugui Dragoșcef9c88de892
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b9f0c55..7050a305 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,8 @@ its changes the way [Keep a Changelog](https://keepachangelog.com/) suggests.
`/Library/Application Support`, are listed and never selected, like a VPN's connections in your home folder.
- The group folder where 1Password 7 kept its standalone vaults and their daily backups is listed and never selected,
also when you uninstall 1Password 8, which uses it too.
+- A folder holding a 1Password vault kept outside an account, `.opvault` or `.agilekeychain`, is listed and never
+ selected, like one holding a KeePass database, and the pages that measure folders hold it back too.
#### Space
diff --git a/Packages/PeelCore/Sources/PeelCore/Support/FileSize.swift b/Packages/PeelCore/Sources/PeelCore/Support/FileSize.swift
index 563f1481..2d9d5244 100644
--- a/Packages/PeelCore/Sources/PeelCore/Support/FileSize.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Support/FileSize.swift
@@ -312,12 +312,17 @@ public enum FileSize {
private static let walletPrefixes = ["wallet.dat.", "zecwallet-light-wallet.backup."]
- /// True for a KeePass database (`.kdbx`) or a KeePassXC key file (`.keyx`), without which the database
- /// cannot be opened.
+ /// True for a KeePass database (`.kdbx`), a KeePassXC key file (`.keyx`), without which the database cannot be
+ /// opened, or a vault 1Password 7 and earlier kept outside an account, in one of the formats it declares
+ /// (`.opvault`, `.agilekeychain`, `.legacyagilekeychain`).
static func isPasswordDatabase(_ name: String) -> Bool {
let name = name.lowercased()
- return name.hasSuffix(".kdbx") || name.hasSuffix(".keyx")
+ return passwordDatabaseSuffixes.contains { name.hasSuffix($0) }
}
+
+ private static let passwordDatabaseSuffixes = [
+ ".kdbx", ".keyx", ".opvault", ".agilekeychain", ".legacyagilekeychain",
+ ]
}
/// What is known about the folders being walked.
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/FileSizeTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/FileSizeTests.swift
index e57495c7..8859d4af 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/FileSizeTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/FileSizeTests.swift
@@ -496,10 +496,13 @@ struct FileSizeTests {
}
@Test func knowsAPasswordDatabaseAndItsKeyFile() {
- for name in ["Passwords.kdbx", "VAULT.KDBX", "Vault.keyx"] {
+ for name in [
+ "Passwords.kdbx", "VAULT.KDBX", "Vault.keyx", "1Password.opvault", "1Password.agilekeychain",
+ "Old.legacyagilekeychain",
+ ] {
#expect(FileSize.isPasswordDatabase(name), "\(name)")
}
- for name in ["Passwords.kdbx.lock", "notes.key", "kdbx", "Passwords.kdb"] {
+ for name in ["Passwords.kdbx.lock", "notes.key", "kdbx", "Passwords.kdb", "opvault", "Vault.opvault.zip"] {
#expect(!FileSize.isPasswordDatabase(name), "\(name)")
}
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/LeftoverScannerTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/LeftoverScannerTests.swift
index 5fd65556..71cbfa09 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/LeftoverScannerTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/LeftoverScannerTests.swift
@@ -1984,6 +1984,16 @@ struct LeftoverScannerTests {
#expect(manifests["com.example.bridge.json"]?.match.isRecommended == true)
}
+ @Test func aFolderHoldingAStandaloneVaultIsNeverSelected() async throws {
+ let directory = try TemporaryDirectory()
+ try directory.file("home/Library/Application Support/Tunewell/Vault.opvault/default/profile.js")
+
+ let scanner = LeftoverScanner(environment: environment(in: directory))
+ let scan = await scanner.scan(tunewell, installedApps: [tunewell])
+
+ #expect(scan.leftovers.map(\.match.heldBack) == [.holdsAPasswordDatabase])
+ }
+
@Test func aFolderWithAPasswordDatabaseOrItsKeyFileIsNeverSelected() async throws {
let directory = try TemporaryDirectory()
try directory.file("home/Library/Application Support/Tunewell/Backups/Passwords.kdbx")
diff --git a/SAFETY.md b/SAFETY.md
index 92395208..4c1b8070 100644
--- a/SAFETY.md
+++ b/SAFETY.md
@@ -370,8 +370,8 @@ Never selected for you, even when found:
open, and moving it would free nothing.
- `/Users/Shared`: it belongs to every account, not just yours.
- A project changed in the last 7 days, and a download that changed in the last day, which may still be going.
-- A folder with a repository, a wallet, a signing key, or a password database (KeePass's `.kdbx`, KeePassXC's `.keyx`)
- inside.
+- A folder with a repository, a wallet, a signing key, or a password database (KeePass's `.kdbx`, KeePassXC's `.keyx`,
+ a 1Password vault kept outside an account, `.opvault` or `.agilekeychain`) inside.
- What an app keeps that may exist only on this Mac: local mail, message history, a password manager's backups and an
authenticator's codes, VPN connections, a game's saves, a database, a streaming app's scenes and profiles, and the
sign-in a tool saved when you logged in, such as Docker's or Cargo's, each where the app's own documentation or