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

Fix an issue in requesting ssh key passphrase

Browse source
This commit is contained in:
Bob Sun 2017-04-28 21:25:30 -07:00
parent 317d74b40d
commit 3267b29bd7
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pass/Models/PasswordStore.swift
View file

@ -47,14 +47,16 @@ struct GitCredential {
credential = try? GTCredential(userName: userName, password: newPassword!)
case let .ssh(userName, publicKeyFile, privateKeyFile, controller):
var newPassword = Utils.getPasswordFromKeychain(name: "gitSSHKeyPassphrase")
if newPassword == nil {
if let requestedPassword = self.requestGitPassword(controller, nil) {
if newPassword == nil || attempts != 0 {
if let requestedPassword = self.requestGitPassword(controller, lastPassword) {
newPassword = requestedPassword
Utils.addPasswordToKeychain(name: "gitSSHKeyPassphrase", password: newPassword)
} else {
return nil
}
}
attempts += 1
lastPassword = newPassword
credential = try? GTCredential(userName: userName, publicKeyURL: publicKeyFile, privateKeyURL: privateKeyFile, passphrase: newPassword!)
}
return credential