fix(historian-client): dispose TcpClient/SslStream on connect+TLS failure (review)

2026-06-12 11:30:39 -04:00
parent 6e152047eb
commit fd4d05534e
2 changed files with 19 additions and 3 deletions
@@ -59,13 +59,21 @@ internal sealed class FrameChannel : IAsyncDisposable
                throw new InvalidOperationException("WonderwareHistorianClientOptions.Host is required for the TCP transport.");

            var tcp = new TcpClient();
-            using (var connectCts = CancellationTokenSource.CreateLinkedTokenSource(ct))
+            try
            {
+                using var connectCts = CancellationTokenSource.CreateLinkedTokenSource(ct);
                connectCts.CancelAfter(opts.EffectiveConnectTimeout);
                await tcp.ConnectAsync(opts.Host!, opts.Port, connectCts.Token).ConfigureAwait(false);
            }
+            catch
+            {
+                tcp.Dispose();
+                throw;
+            }
            tcp.NoDelay = true;

+            // The returned NetworkStream owns the socket (TcpClient.GetStream() uses ownsSocket: true),
+            // so FrameChannel.ResetTransport() disposing this stream closes the underlying socket.
            Stream stream = tcp.GetStream();
            if (!opts.UseTls) return stream;

@@ -75,7 +83,15 @@ internal sealed class FrameChannel : IAsyncDisposable
                    return string.Equals(cert?.GetCertHashString(), opts.ServerCertThumbprint, StringComparison.OrdinalIgnoreCase);
                return errors == SslPolicyErrors.None;
            });
-            await ssl.AuthenticateAsClientAsync(opts.Host!).ConfigureAwait(false);
+            try
+            {
+                await ssl.AuthenticateAsClientAsync(opts.Host!).ConfigureAwait(false);
+            }
+            catch
+            {
+                await ssl.DisposeAsync().ConfigureAwait(false);
+                throw;
+            }
            return ssl;
        };