fix: Dispose HttpMessageHandler (#22)

Author: HofmeisterAn

src/Docker.DotNet.X509/X509Certificate2.cs

@@ -1,4 +1,4 @@
-#if NETSTANDARD
+#if NETSTANDARD
 namespace Docker.DotNet.X509.Polyfills;
 
 using Org.BouncyCastle.Crypto;

src/Docker.DotNet/DockerClient.cs

@@ -9,20 +9,15 @@ public sealed class DockerClient : IDockerClient
 
     private const string UserAgent = "Docker.DotNet";
 
-    private static readonly TimeSpan SInfiniteTimeout = Timeout.InfiniteTimeSpan;
-
     private readonly HttpClient _client;
 
     private readonly Uri _endpointBaseUri;
 
     private readonly Version _requestedApiVersion;
 
-    private readonly ILogger _logger;
-
     internal DockerClient(DockerClientConfiguration configuration, Version requestedApiVersion, ILogger logger = null)
     {
         _requestedApiVersion = requestedApiVersion;
-        _logger = logger ?? NullLogger.Instance;
 
         Configuration = configuration;
         DefaultTimeout = configuration.DefaultTimeout;
@@ -75,7 +70,7 @@ await stream.ConnectAsync(timeout, cancellationToken)
                         .ConfigureAwait(false);
 
                     return dockerStream;
-                }, _logger);
+                }, logger);
                 break;
 
             case "tcp":
@@ -85,11 +80,11 @@ await stream.ConnectAsync(timeout, cancellationToken)
                     Scheme = configuration.Credentials.IsTlsCredentials() ? "https" : "http"
                 };
                 uri = builder.Uri;
-                handler = new ManagedHandler(_logger);
+                handler = new ManagedHandler(logger);
                 break;
 
             case "https":
-                handler = new ManagedHandler(_logger);
+                handler = new ManagedHandler(logger);
                 break;
 
             case "unix":
@@ -102,7 +97,7 @@ await sock.ConnectAsync(new Microsoft.Net.Http.Client.UnixDomainSocketEndPoint(p
                         .ConfigureAwait(false);
 
                     return sock;
-                }, _logger);
+                }, logger);
                 uri = new UriBuilder("http", uri.Segments.Last()).Uri;
                 break;
 
@@ -113,7 +108,7 @@ await sock.ConnectAsync(new Microsoft.Net.Http.Client.UnixDomainSocketEndPoint(p
         _endpointBaseUri = uri;
 
         _client = new HttpClient(Configuration.Credentials.GetHandler(handler), true);
-        _client.Timeout = SInfiniteTimeout;
+        _client.Timeout = Timeout.InfiniteTimeSpan;
     }
 
     public DockerClientConfiguration Configuration { get; }
@@ -299,7 +294,7 @@ internal Task<Stream> MakeRequestForStreamAsync(
         IDictionary<string, string> headers,
         CancellationToken token)
     {
-        return MakeRequestForStreamAsync(errorHandlers, method, path, queryString, body, headers, SInfiniteTimeout, token);
+        return MakeRequestForStreamAsync(errorHandlers, method, path, queryString, body, headers, Timeout.InfiniteTimeSpan, token);
     }
 
     internal async Task<Stream> MakeRequestForStreamAsync(
@@ -330,7 +325,7 @@ internal async Task<HttpResponseMessage> MakeRequestForRawResponseAsync(
         IDictionary<string, string> headers,
         CancellationToken token)
     {
-        var response = await PrivateMakeRequestAsync(SInfiniteTimeout, HttpCompletionOption.ResponseHeadersRead, method, path, queryString, headers, body, token)
+        var response = await PrivateMakeRequestAsync(Timeout.InfiniteTimeSpan, HttpCompletionOption.ResponseHeadersRead, method, path, queryString, headers, body, token)
             .ConfigureAwait(false);
 
         await HandleIfErrorResponseAsync(response.StatusCode, response)
@@ -346,7 +341,7 @@ internal async Task<DockerApiStreamedResponse> MakeRequestForStreamedResponseAsy
         IQueryString queryString,
         CancellationToken cancellationToken)
     {
-        var response = await PrivateMakeRequestAsync(SInfiniteTimeout, HttpCompletionOption.ResponseHeadersRead, method, path, queryString, null, null, cancellationToken)
+        var response = await PrivateMakeRequestAsync(Timeout.InfiniteTimeSpan, HttpCompletionOption.ResponseHeadersRead, method, path, queryString, null, null, cancellationToken)
             .ConfigureAwait(false);
 
         await HandleIfErrorResponseAsync(response.StatusCode, response, errorHandlers)
@@ -367,7 +362,7 @@ internal Task<WriteClosableStream> MakeRequestForHijackedStreamAsync(
         IDictionary<string, string> headers,
         CancellationToken cancellationToken)
     {
-        return MakeRequestForHijackedStreamAsync(errorHandlers, method, path, queryString, body, headers, SInfiniteTimeout, cancellationToken);
+        return MakeRequestForHijackedStreamAsync(errorHandlers, method, path, queryString, body, headers, Timeout.InfiniteTimeSpan, cancellationToken);
     }
 
     internal async Task<WriteClosableStream> MakeRequestForHijackedStreamAsync(
@@ -418,24 +413,26 @@ private async Task<HttpResponseMessage> PrivateMakeRequestAsync(
         IRequestContent data,
         CancellationToken cancellationToken)
     {
-        var request = PrepareRequest(method, path, queryString, headers, data);
+        using var request = PrepareRequest(method, path, queryString, headers, data);
 
-        if (timeout != SInfiniteTimeout)
+        if (Timeout.InfiniteTimeSpan == timeout)
         {
-            using (var timeoutTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken))
-            {
-                timeoutTokenSource.CancelAfter(timeout);
-                return await _client.SendAsync(request, completionOption, timeoutTokenSource.Token)
-                    .ConfigureAwait(false);
-            }
-        }
+            var tcs = new TaskCompletionSource<HttpResponseMessage>();
+
+            using var disposable = cancellationToken.Register(() => tcs.SetCanceled());
 
-        var tcs = new TaskCompletionSource<HttpResponseMessage>();
-        using (cancellationToken.Register(() => tcs.SetCanceled()))
-        {
             return await await Task.WhenAny(tcs.Task, _client.SendAsync(request, completionOption, cancellationToken))
                 .ConfigureAwait(false);
         }
+        else
+        {
+            using var timeoutCts = new CancellationTokenSource(timeout);
+
+            using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, cancellationToken);
+
+            return await _client.SendAsync(request, completionOption, linkedCts.Token)
+                .ConfigureAwait(false);
+        }
     }
 
     private HttpRequestMessage PrepareRequest(HttpMethod method, string path, IQueryString queryString, IDictionary<string, string> headers, IRequestContent data)

src/Docker.DotNet/DockerClientConfiguration.cs

@@ -32,8 +32,8 @@ public DockerClientConfiguration(
 
         EndpointBaseUri = endpoint;
         Credentials = credentials ?? new AnonymousCredentials();
-        DefaultTimeout = TimeSpan.Equals(default, defaultTimeout) ? TimeSpan.FromSeconds(100) : defaultTimeout;
-        NamedPipeConnectTimeout = TimeSpan.Equals(default, namedPipeConnectTimeout) ? TimeSpan.FromMilliseconds(100) : namedPipeConnectTimeout;
+        DefaultTimeout = TimeSpan.Equals(TimeSpan.Zero, defaultTimeout) ? TimeSpan.FromSeconds(100) : defaultTimeout;
+        NamedPipeConnectTimeout = TimeSpan.Equals(TimeSpan.Zero, namedPipeConnectTimeout) ? TimeSpan.FromMilliseconds(100) : namedPipeConnectTimeout;
         DefaultHttpRequestHeaders = defaultHttpRequestHeaders ?? new Dictionary<string, string>();
     }
 

src/Docker.DotNet/DockerPipeStream.cs

@@ -126,8 +126,8 @@ protected override void Dispose(bool disposing)
     {
         if (disposing)
         {
-            _stream.Dispose();
             _event.Dispose();
+            _stream.Dispose();
         }
     }
 }

src/Docker.DotNet/Endpoints/ContainerOperations.cs

@@ -318,7 +318,7 @@ public async Task<ContainerWaitResponse> WaitContainerAsync(string id, Cancellat
             throw new ArgumentNullException(nameof(id));
         }
 
-        return await _client.MakeRequestAsync<ContainerWaitResponse>(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/wait", null, null, null, TimeSpan.FromMilliseconds(Timeout.Infinite), cancellationToken).ConfigureAwait(false);
+        return await _client.MakeRequestAsync<ContainerWaitResponse>(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/wait", null, null, null, Timeout.InfiniteTimeSpan, cancellationToken).ConfigureAwait(false);
     }
 
     public Task RemoveContainerAsync(string id, ContainerRemoveParameters parameters, CancellationToken cancellationToken = default)

src/Docker.DotNet/Microsoft.Net.Http.Client/HttpConnectionResponseContent.cs

@@ -63,6 +63,7 @@ protected override void Dispose(bool disposing)
             if (disposing)
             {
                 _responseStream.Dispose();
+                _connection.Dispose();
             }
         }
         finally

test/Docker.DotNet.Tests/CommonCommands.cs

@@ -1,4 +1,4 @@
-namespace Docker.DotNet.Tests;
+namespace Docker.DotNet.Tests;
 
 public static class CommonCommands
 {

test/Docker.DotNet.Tests/IContainerOperationsTests.cs

@@ -655,9 +655,11 @@ public async Task StartContainerAsync_ContainerNotExists_ThrowsException()
     [Fact]
     public async Task WaitContainerAsync_TokenIsCancelled_OperationCancelledException()
     {
+        using var waitContainerCts = CancellationTokenSource.CreateLinkedTokenSource(_testFixture.Cts.Token);
+
         var stopWatch = new Stopwatch();
 
-        using var waitContainerCts = new CancellationTokenSource(delay: TimeSpan.FromMinutes(5));
+        var delay = TimeSpan.FromSeconds(5);
 
         var createContainerResponse = await _testFixture.DockerClient.Containers.CreateContainerAsync(
             new CreateContainerParameters
@@ -674,12 +676,10 @@ public async Task WaitContainerAsync_TokenIsCancelled_OperationCancelledExceptio
 
         _testOutputHelper.WriteLine("Starting timeout to cancel WaitContainer operation.");
 
-        TimeSpan delay = TimeSpan.FromSeconds(5);
-
         waitContainerCts.CancelAfter(delay);
         stopWatch.Start();
 
-        // Will wait forever here if cancelation fails.
+        // Will wait forever here if cancellation fails.
         var waitContainerTask = _testFixture.DockerClient.Containers.WaitContainerAsync(createContainerResponse.ID, waitContainerCts.Token);
 
         _ = await Assert.ThrowsAsync<TaskCanceledException>(() => waitContainerTask);
@@ -690,7 +690,7 @@ public async Task WaitContainerAsync_TokenIsCancelled_OperationCancelledExceptio
         _testOutputHelper.WriteLine($"WaitContainerAsync: {stopWatch.Elapsed} elapsed");
 
         // Task should be cancelled when CancelAfter timespan expires
-        TimeSpan tolerance = TimeSpan.FromMilliseconds(500);
+        var tolerance = TimeSpan.FromMilliseconds(500);
 
         Assert.InRange(stopWatch.Elapsed, delay.Subtract(tolerance), delay.Add(tolerance));
         Assert.True(waitContainerTask.IsCanceled);

test/Docker.DotNet.Tests/xunit.runner.json

@@ -1,4 +1,4 @@
-{
+{
   "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
   "diagnosticMessages" : false
 }