WIP Try using CredentialCache

Author: bording

LibGit2Sharp/Core/ManagedHttpSmartSubtransport.cs

@@ -49,10 +49,26 @@ private class ManagedHttpSmartSubtransportStream : SmartSubtransportStream
         {
             private static int MAX_REDIRECTS = 7;
 
+            private static readonly HttpClientHandler httpClientHandler;
+            private static readonly CredentialCache credentialCache;
+
             private MemoryStream postBuffer = new MemoryStream();
             private HttpResponseMessage response;
             private Stream responseStream;
 
+            static ManagedHttpSmartSubtransportStream()
+            {
+                httpClientHandler = new HttpClientHandler();
+
+                httpClientHandler.SslProtocols |= SslProtocols.Tls12;
+                //httpClientHandler.ServerCertificateCustomValidationCallback = CertificateValidationProxy;
+
+                httpClientHandler.AllowAutoRedirect = false;
+
+                credentialCache = new CredentialCache();
+                httpClientHandler.Credentials = credentialCache;
+            }
+
             public ManagedHttpSmartSubtransportStream(ManagedHttpSmartSubtransport parent, string endpointUrl, bool isPost, string contentType)
                 : base(parent)
             {
@@ -63,7 +79,7 @@ public ManagedHttpSmartSubtransportStream(ManagedHttpSmartSubtransport parent, s
 
             private HttpClient CreateHttpClient(HttpMessageHandler handler)
             {
-                return new HttpClient(handler)
+                return new HttpClient(handler, false)
                 {
                     DefaultRequestHeaders =
                     {
@@ -73,17 +89,6 @@ private HttpClient CreateHttpClient(HttpMessageHandler handler)
                 };
             }
 
-            private HttpClientHandler CreateClientHandler()
-            {
-                var httpClientHandler = new HttpClientHandler();
-                httpClientHandler.SslProtocols |= SslProtocols.Tls12;
-                httpClientHandler.ServerCertificateCustomValidationCallback = CertificateValidationProxy;
-
-                httpClientHandler.AllowAutoRedirect = false;
-
-                return httpClientHandler;
-            }
-
             private Uri EndpointUrl { get; set; }
 
             private bool IsPost { get; set; }
@@ -157,16 +162,12 @@ private HttpRequestMessage CreateRequest(Uri endpointUrl, bool isPost)
 
             private HttpResponseMessage GetResponseWithRedirects()
             {
-                ICredentials credentials = null;
                 var url = EndpointUrl;
                 int retries;
 
                 for (retries = 0; ; retries++)
                 {
-                    var httpClientHandler = CreateClientHandler();
-                    httpClientHandler.Credentials = credentials;
-
-                    using (var httpClient = this.CreateHttpClient(httpClientHandler))
+                    using (var httpClient = CreateHttpClient(httpClientHandler))
                     {
                         var request = CreateRequest(url, IsPost);
 
@@ -198,14 +199,15 @@ private HttpResponseMessage GetResponseWithRedirects()
                                 throw new InvalidOperationException("authentication cancelled");
                             }
 
+                            var scheme = response.Headers.WwwAuthenticate.First().Scheme;
+
                             if (cred is DefaultCredentials)
                             {
-                                credentials = CredentialCache.DefaultNetworkCredentials;
+                                credentialCache.Add(url, scheme, CredentialCache.DefaultNetworkCredentials);
                             }
-                            else if (cred is UsernamePasswordCredentials)
+                            else if (cred is UsernamePasswordCredentials userpass)
                             {
-                                UsernamePasswordCredentials userpass = (UsernamePasswordCredentials)cred;
-                                credentials = new NetworkCredential(userpass.Username, userpass.Password);
+                                credentialCache.Add(url, scheme, new NetworkCredential(userpass.Username, userpass.Password));
                             }
 
                             continue;