Merge pull request libgit2#5305 from kas-luthor/bugfix/multiple-auth

pks-t · web-flow · commit dbb6429c60fb · 2020-01-10T14:30:18.000+01:00
Adds support for multiple SSH auth mechanisms being used sequentially
diff --git a/src/transports/ssh.c b/src/transports/ssh.c
@@ -646,6 +646,14 @@ static int _git_ssh_setup_conn(
 		}
 
 		error = _git_ssh_authenticate_session(session, cred);
+
+		if (error == GIT_EAUTH) {
+			/* refresh auth methods */
+			if ((error = list_auth_methods(&auth_methods, session, urldata.username)) < 0)
+				goto done;
+			else
+				error = GIT_EAUTH;
+		}
 	}
 
 	if (error < 0)

Original file line number	Diff line number	Diff line change
`@@ -646,6 +646,14 @@ static int _git_ssh_setup_conn(`
`646`	`646`	`}`
`647`	`647`
`648`	`648`	`error = _git_ssh_authenticate_session(session, cred);`
	`649`	`+`
	`650`	`+ if (error == GIT_EAUTH) {`
	`651`	`+ /* refresh auth methods */`
	`652`	`+ if ((error = list_auth_methods(&auth_methods, session, urldata.username)) < 0)`
	`653`	`+ goto done;`
	`654`	`+ else`
	`655`	`+ error = GIT_EAUTH;`
	`656`	`+ }`
`649`	`657`	`}`
`650`	`658`
`651`	`659`	`if (error < 0)`