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

Do not forget pgp passphrase on decryption error #296

Browse source
This commit is contained in:
Yishi Lin 2019-09-30 02:05:01 +08:00
parent 6b00d4911b
commit e332b1f3be
6 changed files with 46 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
passAutoFillExtension/Controllers/CredentialProviderViewController.swift
View file

@ -27,6 +27,7 @@ class CredentialProviderViewController: ASCredentialProviderViewController, UITa
@IBOutlet weak var tableView: UITableView!
private let passwordStore = PasswordStore.shared
private let keychain = AppKeychain.shared
private var searchActive = false
private var passwordsTableEntries: [PasswordsTableEntry] = []
@ -164,8 +165,6 @@ class CredentialProviderViewController: ASCredentialProviderViewController, UITa
}
} catch {
DispatchQueue.main.async {
// remove the wrong passphrase so that users could enter it next time
AppKeychain.shared.removeContent(for: Globals.pgpKeyPassphrase)
Utils.alert(title: "CannotCopyPassword".localize(), message: error.localizedDescription, controller: self, completion: nil)
}
}
@ -193,14 +192,14 @@ class CredentialProviderViewController: ASCredentialProviderViewController, UITa
sem.signal()
}))
alert.addTextField(configurationHandler: {(textField: UITextField!) in
textField.text = ""
textField.text = self.keychain.get(for: Globals.pgpKeyPassphrase) ?? ""
textField.isSecureTextEntry = true
})
self.present(alert, animated: true, completion: nil)
}
let _ = sem.wait(timeout: DispatchTime.distantFuture)
if SharedDefaults[.isRememberPGPPassphraseOn] {
AppKeychain.shared.add(string: passphrase, for: Globals.pgpKeyPassphrase)
self.keychain.add(string: passphrase, for: Globals.pgpKeyPassphrase)
}
return passphrase
}