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

Do no prompt repeatedly for the SSH passphrase

Browse source
This commit is contained in:
Yishi Lin 2019-05-20 01:26:53 +08:00
parent c59c72729b
commit 43ff63e01d
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
passKit/Models/GitCredential.swift
View file

@ -31,6 +31,10 @@ public struct GitCredential {
switch self.credential { switch self.credential {
case let .http(userName): case let .http(userName):
if attempts > 3 {
// After too many failures (say six), the error message "failed to authenticate ssh session" might be confusing.
return nil
}
var lastPassword = self.passwordStore.gitPassword var lastPassword = self.passwordStore.gitPassword
if lastPassword == nil || attempts != 0 { if lastPassword == nil || attempts != 0 {
if let requestedPassword = requestGitPassword(self.credential, lastPassword) { if let requestedPassword = requestGitPassword(self.credential, lastPassword) {
@ -45,7 +49,10 @@ public struct GitCredential {
attempts += 1 attempts += 1
credential = try? GTCredential(userName: userName, password: lastPassword!) credential = try? GTCredential(userName: userName, password: lastPassword!)
case let .ssh(userName, privateKeyFile): case let .ssh(userName, privateKeyFile):
// remarks: in fact, attempts > 1 never happens even with the wrong passphrase if attempts > 0 {
// The passphrase seems correct, but the previous authentification failed.
return nil
}
var lastPassword = self.passwordStore.gitSSHPrivateKeyPassphrase var lastPassword = self.passwordStore.gitSSHPrivateKeyPassphrase
if lastPassword == nil || attempts != 0 { if lastPassword == nil || attempts != 0 {
if let requestedPassword = requestGitPassword(self.credential, lastPassword) { if let requestedPassword = requestGitPassword(self.credential, lastPassword) {