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

add checks to avoid invalid inputs

Browse source
This commit is contained in:
Bob Sun 2017-02-13 15:01:04 +08:00
parent 0b714ffec2
commit 3145ddacbe
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
4 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pass/Models/PasswordStore.swift
View file

@ -80,8 +80,13 @@ class PasswordStore {
try pgpPrivateData.write(to: URL(fileURLWithPath: pgpPrivateKeyLocalPath), options: .atomic)
pgp.importKeys(fromFile: pgpPublicKeyLocalPath, allowDuplicates: false)
if pgp.getKeysOf(.public).count == 0 {
throw NSError(domain: "me.mssun.pass.error", code: 2, userInfo: [NSLocalizedDescriptionKey: "Cannot import public key."])
}
pgp.importKeys(fromFile: pgpPrivateKeyLocalPath, allowDuplicates: false)
if pgp.getKeysOf(.secret).count == 0 {
throw NSError(domain: "me.mssun.pass.error", code: 2, userInfo: [NSLocalizedDescriptionKey: "Cannot import seceret key."])
}
let key = pgp.getKeysOf(.public)[0]
Defaults[.pgpKeyID] = key.keyID!.shortKeyString
if let gpgUser = key.users[0] as? PGPUser {