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

2
pass/Controllers/GitRepositoryAuthenticationSettingTableViewController.swift
View file

@ -18,7 +18,7 @@ class GitRepositoryAuthenticationSettingTableViewController: UITableViewControll
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
navigationItem.title = "Auth Method" navigationItem.title = "Auth Method"
switch selectedMethod! { switch selectedMethod ?? "" {
case "Password": case "Password":
passwordCell.accessoryType = UITableViewCellAccessoryType.checkmark passwordCell.accessoryType = UITableViewCellAccessoryType.checkmark
case "SSH Key": case "SSH Key":

6
pass/Controllers/PGPKeySettingTableViewController.swift
View file

@ -24,6 +24,12 @@ class PGPKeySettingTableViewController: UITableViewController {
override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool { override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
if identifier == "savePGPKeySegue" { if identifier == "savePGPKeySegue" {
guard pgpPublicKeyURLTextField.text != nil else {
return false
}
guard pgpPrivateKeyURLTextField.text != nil else {
return false
}
if URL(string: pgpPublicKeyURLTextField.text!)!.scheme! == "http" && if URL(string: pgpPublicKeyURLTextField.text!)!.scheme! == "http" &&
URL(string: pgpPrivateKeyURLTextField.text!)!.scheme! == "http" { URL(string: pgpPrivateKeyURLTextField.text!)!.scheme! == "http" {
let alertMessage = "HTTP connection is not supported." let alertMessage = "HTTP connection is not supported."

6
pass/Controllers/SettingsTableViewController.swift
View file

@ -26,7 +26,11 @@ class SettingsTableViewController: UITableViewController {
@IBAction func save(segue: UIStoryboardSegue) { @IBAction func save(segue: UIStoryboardSegue) {
if let controller = segue.source as? PGPKeySettingTableViewController { if let controller = segue.source as? PGPKeySettingTableViewController {
if Defaults[.pgpKeyID] == nil { if Defaults[.pgpKeyID] == nil ||
Defaults[.pgpPrivateKeyURL] != URL(string: controller.pgpPrivateKeyURLTextField.text!) ||
Defaults[.pgpPublicKeyURL] != URL(string: controller.pgpPublicKeyURLTextField.text!) ||
Defaults[.pgpKeyPassphrase] != controller.pgpKeyPassphraseTextField.text!
{
Defaults[.pgpPrivateKeyURL] = URL(string: controller.pgpPrivateKeyURLTextField.text!) Defaults[.pgpPrivateKeyURL] = URL(string: controller.pgpPrivateKeyURLTextField.text!)
Defaults[.pgpPublicKeyURL] = URL(string: controller.pgpPublicKeyURLTextField.text!) Defaults[.pgpPublicKeyURL] = URL(string: controller.pgpPublicKeyURLTextField.text!)
Defaults[.pgpKeyPassphrase] = controller.pgpKeyPassphraseTextField.text! Defaults[.pgpKeyPassphrase] = controller.pgpKeyPassphraseTextField.text!

7
pass/Models/PasswordStore.swift
View file

@ -80,8 +80,13 @@ class PasswordStore {
try pgpPrivateData.write(to: URL(fileURLWithPath: pgpPrivateKeyLocalPath), options: .atomic) try pgpPrivateData.write(to: URL(fileURLWithPath: pgpPrivateKeyLocalPath), options: .atomic)
pgp.importKeys(fromFile: pgpPublicKeyLocalPath, allowDuplicates: false) 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) 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] let key = pgp.getKeysOf(.public)[0]
Defaults[.pgpKeyID] = key.keyID!.shortKeyString Defaults[.pgpKeyID] = key.keyID!.shortKeyString
if let gpgUser = key.users[0] as? PGPUser { if let gpgUser = key.users[0] as? PGPUser {