Merge pull request #8906 from mono/master-vsts993869

[Git] Azure DevOps Git Clone Hangs

Author: slluis

main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs

@@ -33,6 +33,7 @@
 using MonoDevelop.Components;
 using System.Linq;
 using Mono.Addins;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.VersionControl.Git
 {
@@ -112,30 +113,13 @@ public static Credentials TryGet (string url, string userFromUrl, SupportedCrede
 		{
 			bool result = false;
 			Uri uri = null;
-
 			GitCredentialsState state;
 			if (!credState.TryGetValue (type, out state))
 				credState [type] = state = new GitCredentialsState ();
 			state.UrlUsed = url;
+			Credentials cred = null;
 
-			// We always need to run the TryGet* methods as we need the passphraseItem/passwordItem populated even
-			// if the password store contains an invalid password/no password
-			if ((types & SupportedCredentialTypes.UsernamePassword) != 0) {
-				if (Uri.TryCreate (url, UriKind.RelativeOrAbsolute, out uri)) {
-					if (!state.NativePasswordUsed && TryGetUsernamePassword (uri, out var username, out var password)) {
-						state.NativePasswordUsed = true;
-						return new UsernamePasswordCredentials {
-							Username = username,
-							Password = password
-						};
-					}
-				}
-			}
-
-			Credentials cred;
-			if ((types & SupportedCredentialTypes.UsernamePassword) != 0)
-				cred = new UsernamePasswordCredentials ();
-			else {
+			if ((types & SupportedCredentialTypes.Ssh) != 0) {
 				// Try ssh-agent on Linux.
 				if (!Platform.IsWindows && !state.AgentUsed) {
 					bool agentUsable;
@@ -163,7 +147,7 @@ public static Credentials TryGet (string url, string userFromUrl, SupportedCrede
 						};
 						cred = sshCred;
 
-						if (XwtCredentialsDialog.Run (url, types, cred).Result) {
+						if (XwtCredentialsDialog.Run (url, SupportedCredentialTypes.Ssh, cred).Result) {
 							keyIndex = Keys.IndexOf (sshCred.PrivateKey);
 							if (keyIndex < 0) {
 								Keys.Add (sshCred.PrivateKey);
@@ -186,7 +170,7 @@ public static Credentials TryGet (string url, string userFromUrl, SupportedCrede
 				};
 
 				if (KeyHasPassphrase (key)) {
-					if (XwtCredentialsDialog.Run (url, types, cred).Result) {
+					if (XwtCredentialsDialog.Run (url, SupportedCredentialTypes.Ssh, cred).Result) {
 						var sshCred = (SshUserKeyCredentials)cred;
 						keyIndex = Keys.IndexOf (sshCred.PrivateKey);
 						if (keyIndex < 0) {
@@ -202,6 +186,22 @@ public static Credentials TryGet (string url, string userFromUrl, SupportedCrede
 				return cred;
 			}
 
+			// We always need to run the TryGet* methods as we need the passphraseItem/passwordItem populated even
+			// if the password store contains an invalid password/no password
+			if ((types & SupportedCredentialTypes.UsernamePassword) != 0) {
+				if (Uri.TryCreate (url, UriKind.RelativeOrAbsolute, out uri)) {
+					if (!state.NativePasswordUsed && TryGetUsernamePassword (uri, out var username, out var password)) {
+						state.NativePasswordUsed = true;
+						return new UsernamePasswordCredentials {
+							Username = username,
+							Password = password
+						};
+					}
+				}
+			}
+			if (cred == null)
+				cred = new UsernamePasswordCredentials ();
+
 			var gitCredentialsProviders = AddinManager.GetExtensionObjects<IGitCredentialsProvider> ();
 
 			if (gitCredentialsProviders != null) {
@@ -238,7 +238,7 @@ static GitCredentialsProviderResult GetCredentialsFromProvider (IGitCredentialsP
 			if (type != SupportedCredentialTypes.UsernamePassword)
 				return GitCredentialsProviderResult.NotFound;
 
-			var (result, credentials) = gitCredentialsProvider.TryGetCredentialsAsync (uri).Result;
+			var (result, credentials) = Task.Run (() => gitCredentialsProvider.TryGetCredentialsAsync (uri)).Result;
 
 			if (result == GitCredentialsProviderResult.Found) {
 				((UsernamePasswordCredentials)cred).Username = credentials.Username;

main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs

@@ -1199,6 +1199,11 @@ static async Task RetryUntilSuccessAsync (ProgressMonitor monitor, Func<GitCrede
 						retry = false;
 						throw new VersionControlException (e.Message, e);
 					} catch (LibGit2SharpException e) {
+						if (e.Message.Contains ("remote: Public key authentication failed.")) {
+							// if key auth fails, retry until the user selects the proper key or cancels
+							retry = true;
+							continue;
+						}
 						GitCredentials.InvalidateCredentials (credType);
 
 						if (e.Message == GettextCatalog.GetString (GitCredentials.UserCancelledExceptionMessage))