Skip to content

Commit

Permalink
Merge pull request #291 from SimplyDanny/field-gpgagent-never-nil
Browse files Browse the repository at this point in the history 
Mark field 'gpgAgent' as never-nil
  • Loading branch information
@yishilin14
yishilin14 authored Jul 21, 2019
2 parents 2ece3ef + ea37b40 commit ad35130
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 43 deletions.
2 changes: 1 addition & 1 deletion pass/Controllers/AddPasswordTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class AddPasswordTableViewController: PasswordEditorTableViewController {
override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
if identifier == "saveAddPasswordSegue" {
// check PGP key
guard passwordStore.pgpAgent?.isImported ?? false else {
guard passwordStore.pgpAgent.isImported else {
let alertTitle = "CannotAddPassword".localize()
let alertMessage = "PgpKeyNotSet.".localize()
Utils.alert(title: alertTitle, message: alertMessage, controller: self, completion: nil)
Expand Down
2 changes: 1 addition & 1 deletion pass/Controllers/GeneralSettingsTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
@objc func rememberPGPPassphraseSwitchAction(_ sender: Any?) {
SharedDefaults[.isRememberPGPPassphraseOn] = rememberPGPPassphraseSwitch.isOn
if rememberPGPPassphraseSwitch.isOn == false {
passwordStore.pgpAgent?.passphrase = nil
passwordStore.pgpAgent.passphrase = nil
}
}

Expand Down
2 changes: 1 addition & 1 deletion pass/Controllers/PGPKeyArmorSettingTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class PGPKeyArmorSettingTableViewController: AutoCellHeightUITableViewController
override func viewDidLoad() {
super.viewDidLoad()

pgpPassphrase = passwordStore.pgpAgent?.passphrase
pgpPassphrase = passwordStore.pgpAgent.passphrase

scanPublicKeyCell?.textLabel?.text = "ScanPublicKeyQrCodes".localize()
scanPublicKeyCell?.textLabel?.textColor = Globals.blue
Expand Down
2 changes: 1 addition & 1 deletion pass/Controllers/PGPKeySettingTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class PGPKeySettingTableViewController: AutoCellHeightUITableViewController {
super.viewDidLoad()
pgpPublicKeyURLTextField.text = SharedDefaults[.pgpPublicKeyURL]?.absoluteString
pgpPrivateKeyURLTextField.text = SharedDefaults[.pgpPrivateKeyURL]?.absoluteString
pgpPassphrase = passwordStore.pgpAgent?.passphrase
pgpPassphrase = passwordStore.pgpAgent.passphrase
}

private func validatePGPKeyURL(input: String?) -> Bool {
Expand Down
4 changes: 2 additions & 2 deletions pass/Controllers/PasswordDetailTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
}
let _ = sem.wait(timeout: DispatchTime.distantFuture)
if SharedDefaults[.isRememberPGPPassphraseOn] {
self.passwordStore.pgpAgent?.passphrase = passphrase
self.passwordStore.pgpAgent.passphrase = passphrase
}
return passphrase
}
Expand All @@ -122,7 +122,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
} catch {
DispatchQueue.main.async {
// remove the wrong passphrase so that users could enter it next time
self.passwordStore.pgpAgent?.passphrase = nil
self.passwordStore.pgpAgent.passphrase = nil
// alert: cancel or try again
let alert = UIAlertController(title: "CannotShowPassword".localize(), message: error.localizedDescription, preferredStyle: UIAlertController.Style.alert)
alert.addAction(UIAlertAction(title: "Cancel".localize(), style: UIAlertAction.Style.default) { _ in
Expand Down
10 changes: 5 additions & 5 deletions pass/Controllers/PasswordsViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,13 +385,13 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
SVProgressHUD.show(withStatus: "Decrypting".localize())
}
if SharedDefaults[.isRememberPGPPassphraseOn] {
self.passwordStore.pgpAgent?.passphrase = passphrase
self.passwordStore.pgpAgent.passphrase = passphrase
}
return passphrase
}

private func decryptThenCopyPassword(from indexPath: IndexPath) {
guard self.passwordStore.pgpAgent?.isImported ?? false else {
guard self.passwordStore.pgpAgent.isImported else {
Utils.alert(title: "CannotCopyPassword".localize(), message: "SetPgpKey.".localize(), controller: self, completion: nil)
return
}
Expand All @@ -412,7 +412,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
} catch {
DispatchQueue.main.async {
// remove the wrong passphrase so that users could enter it next time
self.passwordStore.pgpAgent?.passphrase = nil
self.passwordStore.pgpAgent.passphrase = nil
Utils.alert(title: "CannotCopyPassword".localize(), message: error.localizedDescription, controller: self, completion: nil)
}
}
Expand Down Expand Up @@ -453,7 +453,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV

override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
if identifier == "showPasswordDetail" {
guard self.passwordStore.pgpAgent?.isImported ?? false else {
guard self.passwordStore.pgpAgent.isImported else {
Utils.alert(title: "CannotShowPassword".localize(), message: "SetPgpKey.".localize(), controller: self, completion: nil)
if let s = sender as? UITableViewCell {
let selectedIndexPath = tableView.indexPath(for: s)!
Expand All @@ -462,7 +462,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
return false
}
} else if identifier == "addPasswordSegue" {
guard self.passwordStore.pgpAgent?.isImported ?? false && self.passwordStore.storeRepository != nil else {
guard self.passwordStore.pgpAgent.isImported && self.passwordStore.storeRepository != nil else {
Utils.alert(title: "CannotAddPassword".localize(), message: "MakeSurePgpAndGitProperlySet.".localize(), controller: self, completion: nil)
return false
}
Expand Down
28 changes: 14 additions & 14 deletions pass/Controllers/SettingsTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
SharedDefaults[.pgpPrivateKeyURL] = URL(string: controller.pgpPrivateKeyURLTextField.text!.trimmed)
SharedDefaults[.pgpPublicKeyURL] = URL(string: controller.pgpPublicKeyURLTextField.text!.trimmed)
if SharedDefaults[.isRememberPGPPassphraseOn] {
self.passwordStore.pgpAgent?.passphrase = controller.pgpPassphrase
self.passwordStore.pgpAgent.passphrase = controller.pgpPassphrase
}
SharedDefaults[.pgpKeySource] = "url"

Expand All @@ -38,10 +38,10 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
SVProgressHUD.show(withStatus: "FetchingPgpKey".localize())
DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
do {
try self.passwordStore.pgpAgent?.initPGPKey(from: SharedDefaults[.pgpPublicKeyURL]!, keyType: .PUBLIC)
try self.passwordStore.pgpAgent?.initPGPKey(from: SharedDefaults[.pgpPrivateKeyURL]!, keyType: .PRIVATE)
try self.passwordStore.pgpAgent.initPGPKey(from: SharedDefaults[.pgpPublicKeyURL]!, keyType: .PUBLIC)
try self.passwordStore.pgpAgent.initPGPKey(from: SharedDefaults[.pgpPrivateKeyURL]!, keyType: .PRIVATE)
DispatchQueue.main.async {
self.pgpKeyTableViewCell.detailTextLabel?.text = self.passwordStore.pgpAgent?.pgpKeyID
self.pgpKeyTableViewCell.detailTextLabel?.text = self.passwordStore.pgpAgent.pgpKeyID
SVProgressHUD.showSuccess(withStatus: "Success".localize())
SVProgressHUD.dismiss(withDelay: 1)
Utils.alert(title: "RememberToRemoveKey".localize(), message: "RememberToRemoveKeyFromServer.".localize(), controller: self, completion: nil)
Expand All @@ -57,17 +57,17 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
} else if let controller = segue.source as? PGPKeyArmorSettingTableViewController {
SharedDefaults[.pgpKeySource] = "armor"
if SharedDefaults[.isRememberPGPPassphraseOn] {
self.passwordStore.pgpAgent?.passphrase = controller.pgpPassphrase
self.passwordStore.pgpAgent.passphrase = controller.pgpPassphrase
}
SVProgressHUD.setDefaultMaskType(.black)
SVProgressHUD.setDefaultStyle(.light)
SVProgressHUD.show(withStatus: "FetchingPgpKey".localize())
DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
do {
try self.passwordStore.pgpAgent?.initPGPKey(with: controller.armorPublicKeyTextView.text ?? "", keyType: .PUBLIC)
try self.passwordStore.pgpAgent?.initPGPKey(with: controller.armorPrivateKeyTextView.text ?? "", keyType: .PRIVATE)
try self.passwordStore.pgpAgent.initPGPKey(with: controller.armorPublicKeyTextView.text ?? "", keyType: .PUBLIC)
try self.passwordStore.pgpAgent.initPGPKey(with: controller.armorPrivateKeyTextView.text ?? "", keyType: .PRIVATE)
DispatchQueue.main.async {
self.pgpKeyTableViewCell.detailTextLabel?.text = self.passwordStore.pgpAgent?.pgpKeyID
self.pgpKeyTableViewCell.detailTextLabel?.text = self.passwordStore.pgpAgent.pgpKeyID
SVProgressHUD.showSuccess(withStatus: "Success".localize())
SVProgressHUD.dismiss(withDelay: 1)
}
Expand All @@ -89,9 +89,9 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
SVProgressHUD.show(withStatus: "FetchingPgpKey".localize())
DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
do {
try self.passwordStore.pgpAgent?.initPGPKeyFromFileSharing()
try self.passwordStore.pgpAgent.initPGPKeyFromFileSharing()
DispatchQueue.main.async {
self.pgpKeyTableViewCell.detailTextLabel?.text = self.passwordStore.pgpAgent?.pgpKeyID
self.pgpKeyTableViewCell.detailTextLabel?.text = self.passwordStore.pgpAgent.pgpKeyID
SVProgressHUD.showSuccess(withStatus: "Imported".localize())
SVProgressHUD.dismiss(withDelay: 1)
}
Expand Down Expand Up @@ -135,7 +135,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
}

private func setPGPKeyTableViewCellDetailText() {
if let pgpKeyID = self.passwordStore.pgpAgent?.pgpKeyID {
if let pgpKeyID = self.passwordStore.pgpAgent.pgpKeyID {
pgpKeyTableViewCell.detailTextLabel?.text = pgpKeyID
} else {
pgpKeyTableViewCell.detailTextLabel?.text = "NotSet".localize()
Expand Down Expand Up @@ -192,14 +192,14 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
optionMenu.addAction(urlAction)
optionMenu.addAction(armorAction)

if passwordStore.pgpAgent?.isFileSharingReady ?? false {
if passwordStore.pgpAgent.isFileSharingReady {
fileActionTitle.append(" (\("Import".localize()))")
let fileAction = UIAlertAction(title: fileActionTitle, style: .default) { _ in
// passphrase related
let savePassphraseAlert = UIAlertController(title: "Passphrase".localize(), message: "WantToSavePassphrase?".localize(), preferredStyle: UIAlertController.Style.alert)
// no
savePassphraseAlert.addAction(UIAlertAction(title: "No".localize(), style: UIAlertAction.Style.default) { _ in
self.passwordStore.pgpAgent?.passphrase = nil
self.passwordStore.pgpAgent.passphrase = nil
SharedDefaults[.isRememberPGPPassphraseOn] = false
self.saveImportedPGPKey()
})
Expand All @@ -208,7 +208,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
// ask for the passphrase
let alert = UIAlertController(title: "Passphrase".localize(), message: "FillInPgpPassphrase.".localize(), preferredStyle: UIAlertController.Style.alert)
alert.addAction(UIAlertAction(title: "Ok".localize(), style: UIAlertAction.Style.default, handler: {_ in
self.passwordStore.pgpAgent?.passphrase = alert.textFields?.first?.text
self.passwordStore.pgpAgent.passphrase = alert.textFields?.first?.text
SharedDefaults[.isRememberPGPPassphraseOn] = true
self.saveImportedPGPKey()
}))
Expand Down
6 changes: 3 additions & 3 deletions passAutoFillExtension/Controllers/CredentialProviderViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class CredentialProviderViewController: ASCredentialProviderViewController, UITa
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let entry = getPasswordEntry(by: indexPath)

guard self.passwordStore.pgpAgent?.isImported ?? false else {
guard self.passwordStore.pgpAgent.isImported else {
Utils.alert(title: "CannotCopyPassword".localize(), message: "PgpKeyNotSet.".localize(), controller: self, completion: nil)
return
}
Expand All @@ -165,7 +165,7 @@ class CredentialProviderViewController: ASCredentialProviderViewController, UITa
} catch {
DispatchQueue.main.async {
// remove the wrong passphrase so that users could enter it next time
self.passwordStore.pgpAgent?.passphrase = nil
self.passwordStore.pgpAgent.passphrase = nil
Utils.alert(title: "CannotCopyPassword".localize(), message: error.localizedDescription, controller: self, completion: nil)
}
}
Expand Down Expand Up @@ -200,7 +200,7 @@ class CredentialProviderViewController: ASCredentialProviderViewController, UITa
}
let _ = sem.wait(timeout: DispatchTime.distantFuture)
if SharedDefaults[.isRememberPGPPassphraseOn] {
self.passwordStore.pgpAgent?.passphrase = passphrase
self.passwordStore.pgpAgent.passphrase = passphrase
}
return passphrase
}
Expand Down
6 changes: 3 additions & 3 deletions passExtension/Controllers/ExtensionViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class ExtensionViewController: UIViewController, UITableViewDataSource, UITableV
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let entry = getPasswordEntry(by: indexPath)

guard self.passwordStore.pgpAgent?.isImported ?? false else {
guard self.passwordStore.pgpAgent.isImported else {
Utils.alert(title: "CannotCopyPassword".localize(), message: "PgpKeyNotSet.".localize(), controller: self, completion: nil)
return
}
Expand Down Expand Up @@ -191,7 +191,7 @@ class ExtensionViewController: UIViewController, UITableViewDataSource, UITableV
} catch {
DispatchQueue.main.async {
// remove the wrong passphrase so that users could enter it next time
self.passwordStore.pgpAgent?.passphrase = nil
self.passwordStore.pgpAgent.passphrase = nil
Utils.alert(title: "CannotCopyPassword".localize(), message: error.localizedDescription, controller: self, completion: nil)
}
}
Expand Down Expand Up @@ -227,7 +227,7 @@ class ExtensionViewController: UIViewController, UITableViewDataSource, UITableV
}
let _ = sem.wait(timeout: DispatchTime.distantFuture)
if SharedDefaults[.isRememberPGPPassphraseOn] {
self.passwordStore.pgpAgent?.passphrase = passphrase
self.passwordStore.pgpAgent.passphrase = passphrase
}
return passphrase
}
Expand Down
18 changes: 6 additions & 12 deletions passKit/Models/PasswordStore.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class PasswordStore {
public let storeURL = URL(fileURLWithPath: "\(Globals.repositoryPath)")
public let tempStoreURL = URL(fileURLWithPath: "\(Globals.repositoryPath)-temp")

public let pgpAgent: PGPAgent?
public let pgpAgent = PGPAgent()

public var storeRepository: GTRepository?

Expand Down Expand Up @@ -104,16 +104,14 @@ public class PasswordStore {
}

private init() {
self.pgpAgent = PGPAgent()

// Migration
importExistingKeysIntoKeychain()

do {
if fm.fileExists(atPath: storeURL.path) {
try storeRepository = GTRepository.init(url: storeURL)
}
try self.pgpAgent?.initPGPKeys()
try self.pgpAgent.initPGPKeys()
} catch {
print(error)
}
Expand Down Expand Up @@ -640,7 +638,7 @@ public class PasswordStore {

try? fm.removeItem(atPath: Globals.gitSSHPrivateKeyPath)

self.pgpAgent?.removePGPKeys()
self.pgpAgent.removePGPKeys()

AppKeychain.removeAllContent()

Expand Down Expand Up @@ -701,7 +699,7 @@ public class PasswordStore {
public func decrypt(passwordEntity: PasswordEntity, requestPGPKeyPassphrase: () -> String) throws -> Password? {
let encryptedDataPath = storeURL.appendingPathComponent(passwordEntity.getPath())
let encryptedData = try Data(contentsOf: encryptedDataPath)
guard let decryptedData = try self.pgpAgent?.decrypt(encryptedData: encryptedData, requestPGPKeyPassphrase: requestPGPKeyPassphrase) else {
guard let decryptedData = try self.pgpAgent.decrypt(encryptedData: encryptedData, requestPGPKeyPassphrase: requestPGPKeyPassphrase) else {
throw AppError.Decryption
}
let plainText = String(data: decryptedData, encoding: .utf8) ?? ""
Expand All @@ -710,15 +708,11 @@ public class PasswordStore {
}

public func encrypt(password: Password) throws -> Data {
let plainData = password.plainData
guard let encryptedData = try self.pgpAgent?.encrypt(plainData: plainData) else {
throw AppError.Encryption
}
return encryptedData
return try self.pgpAgent.encrypt(plainData: password.plainData)
}

public func removePGPKeys() {
self.pgpAgent?.removePGPKeys()
self.pgpAgent.removePGPKeys()
}

public func removeGitSSHKeys() {
Expand Down

0 comments on commit ad35130

Please sign in to comment.