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

handle wrong GPG passphrase

Browse source
This commit is contained in:
Bob Sun 2017-02-06 14:28:57 +08:00
parent c50cf8e0a7
commit fd8cb300d7
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
3 changed files with 46 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

48
pass/Password.swift
View file

@ -10,10 +10,16 @@ import Foundation
import SwiftyUserDefaults
class Password {
var name = ""
var password = ""
var name: String
var password: String
var additions: [String: String]
init() {
name = ""
password = ""
additions = [:]
}
init(name: String, password: String, additions: [String: String]) {
self.name = name
self.password = password
@ -22,29 +28,25 @@ class Password {
}
extension PasswordEntity {
func decrypt() -> Password? {
func decrypt() throws -> Password? {
var password: Password?
let encryptedDataPath = URL(fileURLWithPath: "\(Globals.shared.documentPath)/\(rawPath!)")
do {
let encryptedData = try Data(contentsOf: encryptedDataPath)
let decryptedData = try PasswordStore.shared.pgp.decryptData(encryptedData, passphrase: Defaults[.pgpKeyPassphrase])
let plain = String(data: decryptedData, encoding: .ascii) ?? ""
var decrypted_password = ""
var decrypted_addtions = [String: String]()
plain.enumerateLines(invoking: { line, _ in
let item = line.characters.split(separator: ":").map(String.init)
if item.count == 1 {
decrypted_password = item[0]
} else {
let key = item[0]
let value = item[1].trimmingCharacters(in: .whitespaces)
decrypted_addtions[key] = value
}
})
password = Password(name: name!, password: decrypted_password, additions: decrypted_addtions)
} catch let error as NSError {
print(error.debugDescription)
}
let encryptedData = try Data(contentsOf: encryptedDataPath)
let decryptedData = try PasswordStore.shared.pgp.decryptData(encryptedData, passphrase: Defaults[.pgpKeyPassphrase])
let plain = String(data: decryptedData, encoding: .ascii) ?? ""
var decrypted_password = ""
var decrypted_addtions = [String: String]()
plain.enumerateLines(invoking: { line, _ in
let item = line.characters.split(separator: ":").map(String.init)
if item.count == 1 {
decrypted_password = item[0]
} else {
let key = item[0]
let value = item[1].trimmingCharacters(in: .whitespaces)
decrypted_addtions[key] = value
}
})
password = Password(name: name!, password: decrypted_password, additions: decrypted_addtions)
return password
}
}

11
pass/PasswordDetailTableViewController.swift
View file

@ -10,6 +10,7 @@ import UIKit
class PasswordDetailTableViewController: UITableViewController, UIGestureRecognizerDelegate {
var passwordEntity: PasswordEntity?
var password = Password()
struct TableCell {
var title: String
@ -26,7 +27,15 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
override func viewDidLoad() {
super.viewDidLoad()
tableView.register(UINib(nibName: "LabelTableViewCell", bundle: nil), forCellReuseIdentifier: "labelCell")
let password = passwordEntity!.decrypt()!
do {
password = try passwordEntity!.decrypt()!
} catch {
let alert = UIAlertController(title: "Cannot Show Password", message: error.localizedDescription, preferredStyle: UIAlertControllerStyle.alert)
alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: {(UIAlertAction) -> Void in
self.navigationController!.popViewController(animated: true)
}))
self.present(alert, animated: true, completion: nil)
}
var tableDataIndex = 0
tableData.append(TableSection(title: "", item: []))

18
pass/PasswordsViewController.swift
View file

@ -121,8 +121,12 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
} else {
password = passwordEntities![index]
}
let decryptedPassword = password.decrypt()!
UIPasteboard.general.string = decryptedPassword.password
do {
let decryptedPassword = try password.decrypt()!
UIPasteboard.general.string = decryptedPassword.password
} catch {
print(error)
}
}
func generateSections(item: [PasswordEntity]) {
@ -174,14 +178,14 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
if let viewController = segue.destination as? PasswordDetailTableViewController {
let selectedIndexPath = self.tableView.indexPath(for: sender as! UITableViewCell)!
let index = sections[selectedIndexPath.section].index + selectedIndexPath.row
let password: PasswordEntity
let passwordEntity: PasswordEntity
if searchController.isActive && searchController.searchBar.text != "" {
password = filteredPasswordEntities[index]
passwordEntity = filteredPasswordEntities[index]
} else {
password = passwordEntities![index]
passwordEntity = passwordEntities![index]
}
viewController.passwordEntity = password
viewController.navigationItem.title = password.name
viewController.passwordEntity = passwordEntity
viewController.navigationItem.title = passwordEntity.name
}
}
}