lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

support reading several key IDs in .gpg-id files

Browse source
This commit is contained in:
Lysann Tranvouez 2026-03-11 22:57:51 +01:00
parent 566b7253f5
commit 77f85ccdd1
8 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
passKit/Models/PasswordStore.swift
View file

@ -410,7 +410,7 @@ public class PasswordStore {
} }
if Defaults.isEnableGPGIDOn { if Defaults.isEnableGPGIDOn {
let encryptedDataPath = password.fileURL(in: storeURL) let encryptedDataPath = password.fileURL(in: storeURL)
return [findGPGID(from: encryptedDataPath)] return findGPGIDs(from: encryptedDataPath)
} }
return [] return []
}() }()
@ -461,7 +461,7 @@ extension PasswordStore {
} }
} }
func findGPGID(from url: URL) -> String { func findGPGIDs(from url: URL) -> [String] {
var path = url var path = url
while !FileManager.default.fileExists(atPath: path.appendingPathComponent(".gpg-id").path), while !FileManager.default.fileExists(atPath: path.appendingPathComponent(".gpg-id").path),
path.path != "file:///" { path.path != "file:///" {
@ -469,5 +469,9 @@ func findGPGID(from url: URL) -> String {
} }
path = path.appendingPathComponent(".gpg-id") path = path.appendingPathComponent(".gpg-id")
return (try? String(contentsOf: path))?.trimmed ?? "" let allKeysSeparatedByNewline = (try? String(contentsOf: path)) ?? ""
return allKeysSeparatedByNewline
.split(separator: "\n")
.map { String($0).trimmed }
.filter { !$0.isEmpty }
} }

BIN
passKitTests/Fixtures/password-store-with-gpgid.git/objects/23/44f8116ab49ad30dd96d92e306a2b28839ee71 Normal file
View file

Binary file not shown.

BIN
passKitTests/Fixtures/password-store-with-gpgid.git/objects/34/22e35e46f42b12fdca050c9bc424028d0e89c8 Normal file
View file

Binary file not shown.

BIN
passKitTests/Fixtures/password-store-with-gpgid.git/objects/8b/08bf485e19720eae26df62ddceefbb8b4d8247 Normal file
View file

Binary file not shown.

1
passKitTests/Fixtures/password-store-with-gpgid.git/objects/bb/1f455127743a2e202840fc39201937a2457ed2 Normal file
View file

@ -0,0 +1 @@
xÌ1€ @k^áBˆI(9BíŒÿïÔj»]÷³öl›EUM×™C{ÏlDˆ+=r¢ŠÚKd¬8.4†u Ùy: nç—ˆKyº1F

3
passKitTests/Fixtures/password-store-with-gpgid.git/objects/c7/c52ac6962d08d69e5651eedd6cbaf2f8bd05c3 Normal file
View file

@ -0,0 +1,3 @@
x<01>ŽAjÄ0sÖ+æbF#Y¶ „< Ç|@òŒm‘]ÙHrÀy}ÌB><3E>C_
º»¦í~O ÒS+"@ÆÚyÔÚ…h}`ƒÌÞ±'1èEGãE­öP$7ðÔKÄÙEíi¤ØÏyÄñŠ£h£8f«ƒ
G[·g 9Ãg ù{;ä^oòÞþH'Çèa0d{D ϨÕôðlòÿU×K™<4B>S<EFBFBD>5T ø’³BÊÐ-ûò’BfH­Â’ÚzÄ9ÝRÉS9÷vÕã qk«úõ–cJ

1
passKitTests/Fixtures/password-store-with-gpgid.git/refs/heads/master Normal file
View file

@ -0,0 +1 @@
c7c52ac6962d08d69e5651eedd6cbaf2f8bd05c3

13
passKitTests/Models/PasswordStoreTest.swift
View file

@ -32,7 +32,7 @@ final class PasswordStoreTest: XCTestCase {
try cloneRepository(.withGPGID) try cloneRepository(.withGPGID)
XCTAssertEqual(passwordStore.numberOfPasswords, 4) XCTAssertEqual(passwordStore.numberOfPasswords, 4)
XCTAssertEqual(passwordStore.numberOfCommits, 16) XCTAssertEqual(passwordStore.numberOfCommits, 17)
XCTAssertEqual(passwordStore.numberOfLocalCommits, 0) XCTAssertEqual(passwordStore.numberOfLocalCommits, 0)
let entity = passwordStore.fetchPasswordEntity(with: "personal/github.com.gpg") let entity = passwordStore.fetchPasswordEntity(with: "personal/github.com.gpg")
@ -319,11 +319,12 @@ final class PasswordStoreTest: XCTestCase {
Defaults.isEnableGPGIDOn = true Defaults.isEnableGPGIDOn = true
[ [
("work/github.com", "4712286271220DB299883EA7062E678DA1024DAE"), ("work/github.com", ["4712286271220DB299883EA7062E678DA1024DAE"]),
("personal/github.com", "787EAE1A5FA3E749AA34CC6AA0645EBED862027E"), ("personal/github.com", ["787EAE1A5FA3E749AA34CC6AA0645EBED862027E"]),
].forEach { path, id in ("shared/github.com", ["4712286271220DB299883EA7062E678DA1024DAE", "787EAE1A5FA3E749AA34CC6AA0645EBED862027E"]),
let keyID = findGPGID(from: localRepoURL.appendingPathComponent(path)) ].forEach { path, keyIDs in
XCTAssertEqual(keyID, id) let foundKeyIDs = findGPGIDs(from: localRepoURL.appendingPathComponent(path))
XCTAssertEqual(foundKeyIDs, keyIDs)
} }
let personal = try decrypt(path: "personal/github.com.gpg") let personal = try decrypt(path: "personal/github.com.gpg")