完善OpenSslSocketsHttpHandler

.codegraph/.gitignore

@@ -0,0 +1,5 @@
+# CodeGraph data files — local to each machine, not for committing.
+# Ignore everything in .codegraph/ except this file itself, so transient
+# files (the database, daemon.pid, sockets, logs) never show up in git.
+*
+!.gitignore

src/DotNetCampus.HttpClientOverOpenSsl.Tests/OpenSslSocketsHttpHandlerTests.cs

@@ -3,17 +3,6 @@
 [TestClass]
 public sealed class OpenSslSocketsHttpHandlerTests
 {
-    [TestMethod]
-    public void Constructor_WithNullParameter_ShouldNotThrow()
-    {
-        // Arrange & Act
-        var handler = new OpenSslSocketsHttpHandler(null);
-
-        // Assert
-        Assert.IsNotNull(handler);
-        handler.Dispose();
-    }
-
     [TestMethod]
     public void Constructor_WithDefaultParameter_ShouldNotThrow()
     {
@@ -25,52 +14,6 @@ public void Constructor_WithDefaultParameter_ShouldNotThrow()
         handler.Dispose();
     }
 
-    [TestMethod]
-    public void Constructor_WithFreshSocketsHttpHandler_ShouldNotThrow()
-    {
-        // Arrange
-        using var innerHandler = new SocketsHttpHandler();
-
-        // Act
-        var handler = new OpenSslSocketsHttpHandler(innerHandler);
-
-        // Assert
-        Assert.IsNotNull(handler);
-        handler.Dispose();
-    }
-
-    [TestMethod]
-    public void Constructor_WithProvidedHandler_SetsConnectCallback()
-    {
-        // Arrange
-        using var innerHandler = new SocketsHttpHandler();
-
-        // Act
-        var handler = new OpenSslSocketsHttpHandler(innerHandler);
-
-        // Assert
-        Assert.IsNotNull(innerHandler.ConnectCallback, "ConnectCallback should be set on provided handler.");
-
-        handler.Dispose();
-    }
-
-    [TestMethod]
-    public void Constructor_WithConnectCallbackAlreadySet_ShouldThrowArgumentException()
-    {
-        // Arrange
-        using var innerHandler = new SocketsHttpHandler();
-        innerHandler.ConnectCallback = static (context, cancellationToken) =>
-            ValueTask.FromResult<Stream>(Stream.Null);
-
-        // Act
-        void Act() => new OpenSslSocketsHttpHandler(innerHandler);
-
-        // Assert
-        var exception = Assert.Throws<ArgumentException>(Act);
-        Assert.AreEqual("socketsHttpHandler", exception.ParamName);
-        StringAssert.Contains(exception.Message, "ConnectCallback");
-    }
-
     [TestMethod]
     public void Dispose_ShouldDisposeWithoutException()
     {

src/DotNetCampus.HttpClientOverOpenSsl/ConnectionOptions.cs

@@ -0,0 +1,97 @@
+namespace DotNetCampus.HttpClientOverOpenSsl
+{
+    sealed class ConnectionOptions
+    {
+        private static readonly HttpRequestOptionsKey<ConnectionOptions> key = new(nameof(ConnectionOptions));
+
+        /// <summary>
+        /// 是否为安全传输
+        /// </summary>
+        public bool IsSecurity { get; }
+
+        /// <summary>
+        /// 原始请求Uri
+        /// </summary>
+        public Uri OriginalUri { get; }
+
+        /// <summary>
+        /// 连接选项
+        /// </summary>
+        /// <param name="isSecurity"></param> 
+        /// <param name="originalUri"></param>
+        public ConnectionOptions(bool isSecurity, Uri originalUri)
+        {
+            this.IsSecurity = isSecurity;
+            this.OriginalUri = originalUri;
+        }
+
+
+        /// <summary>
+        /// 获取自定义连接选项
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public static ConnectionOptions Get(HttpRequestMessage request)
+        {
+            return request.Options.TryGetValue(key, out var options)
+                ? options
+                : throw new InvalidOperationException("必须先 Set()");
+        }
+
+        /// <summary>
+        /// 设置使用自定义连接
+        /// </summary>
+        /// <param name="request"></param>   
+        public static void Set(HttpRequestMessage request)
+        {
+            if (request.Options.TryGetValue(key, out _))
+            {
+                return;
+            }
+
+            var originalUri = request.RequestUri ?? throw new HttpRequestException("必须指定请求的URI");
+            var isSecurity = originalUri.Scheme == Uri.UriSchemeHttps
+                || originalUri.Scheme == Uri.UriSchemeWss
+                || originalUri.Scheme == Uri.UriSchemeFtps;
+
+            if (isSecurity == true)
+            {
+                // 修改Scheme之前，记录原始的Host
+                if (request.Headers.Host == null)
+                {
+                    request.Headers.Host = originalUri.Authority;
+                }
+
+                // 修改协议非安全Scheme防止自动ssl连接
+                if (originalUri.Scheme == Uri.UriSchemeHttps)
+                {
+                    request.RequestUri = new UriBuilder(originalUri) { Scheme = Uri.UriSchemeHttp }.Uri;
+                }
+                else if (originalUri.Scheme == Uri.UriSchemeWss)
+                {
+                    request.RequestUri = new UriBuilder(originalUri) { Scheme = Uri.UriSchemeWs }.Uri;
+                }
+                else if (originalUri.Scheme == Uri.UriSchemeFtps)
+                {
+                    request.RequestUri = new UriBuilder(originalUri) { Scheme = Uri.UriSchemeFtp }.Uri;
+                }
+            }
+
+            var options = new ConnectionOptions(isSecurity, originalUri);
+            request.Options.Set(key, options);
+        }
+
+        /// <summary>
+        /// 移除使用自定义连接
+        /// </summary>
+        /// <param name="request"></param>
+        public static void Remove(HttpRequestMessage request)
+        {
+            if (request.Options.Remove(key.Key, out var value) &&
+                value is ConnectionOptions options)
+            {
+                request.RequestUri = options.OriginalUri;
+            }
+        }
+    }
+}

src/DotNetCampus.HttpClientOverOpenSsl/Interop/OpenSSLNative.cs

@@ -138,6 +138,23 @@ IntPtr MapAndLoad(string libraryName, Assembly assembly, DllImportSearchPath? se
         }
     }
 
+    /// <summary>
+    /// 获取当前平台是否可加载 OpenSSL 原生库。
+    /// 通过已注册的 DllImportResolver 尝试加载 libssl-3，不抛出异常。
+    /// </summary>
+    /// <remarks>
+    /// 读取此属性会触发静态构造函数，确保 DllImportResolver 已注册。
+    /// 解析器会遍历所有搜索路径（BaseDirectory、NuGet runtimes、FallbackLibraryPath），
+    /// 若找到 DLL 则返回 <see langword="true"/> 并缓存句柄供后续 DllImport 使用。
+    /// </remarks>
+    public static bool IsOpenSslAvailable()
+    {
+        // 通过已注册的 DllImportResolver 尝试加载 libssl-3，
+        // NativeLibrary.TryLoad 会调用 MapAndLoad 走完整的搜索逻辑。
+        // 加载成功则说明 OpenSSL 原生库可用，同时句柄会被缓存供后续使用。
+        return NativeLibrary.TryLoad(LibSslConst, typeof(OpenSSLNative).Assembly, null, out _);
+    }
+
     #region Constants
 
     public const int SSL_VERIFY_NONE = 0x00;
@@ -233,7 +250,7 @@ public static int SSL_set_tlsext_host_name(SafeSslHandle ssl, string name)
         var namePtr = Marshal.StringToHGlobalAnsi(name);
         try
         {
-            return (int) SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, namePtr);
+            return (int)SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, namePtr);
         }
         finally
         {
@@ -273,7 +290,7 @@ public static string GetErrorString(ulong error)
     {
         var buffer = new byte[256];
         ERR_error_string_n(error, buffer, buffer.Length);
-        var nullIndex = Array.IndexOf(buffer, (byte) 0);
+        var nullIndex = Array.IndexOf(buffer, (byte)0);
         return nullIndex >= 0 ? System.Text.Encoding.ASCII.GetString(buffer, 0, nullIndex) : System.Text.Encoding.ASCII.GetString(buffer);
     }
 

src/DotNetCampus.HttpClientOverOpenSsl/OpenSslAsyncStream.cs

@@ -78,13 +78,24 @@ namespace DotNetCampus.HttpClientOverOpenSsl;
 /// </remarks>
 internal sealed class OpenSslAsyncStream : Stream
 {
+    private readonly NetworkStream? _innerStream = null;
+    private readonly bool _leaveInnerStreamOpen;
     private readonly Socket _socket;
     private readonly bool _ownsSocket;
     private SafeSslContextHandle? _sslContext;
     private SafeSslHandle? _ssl;
     private bool _isAuthenticated;
     private bool _disposed;
 
+    public static bool IsSupported { get; } = OperatingSystem.IsWindows() && OpenSSLNative.IsOpenSslAvailable();
+
+    public OpenSslAsyncStream(NetworkStream innerStream, bool leaveInnerStreamOpen)
+        : this(innerStream.Socket, ownsSocket: false)
+    {
+        _innerStream = innerStream;
+        _leaveInnerStreamOpen = leaveInnerStreamOpen;
+    }
+
     /// <summary>
     /// 使用指定的 Socket 创建 <see cref="OpenSslAsyncStream"/> 实例。
     /// </summary>
@@ -482,6 +493,11 @@ protected override void Dispose(bool disposing)
             {
                 _socket.Dispose();
             }
+
+            if (!_leaveInnerStreamOpen && _innerStream is not null)
+            {
+                _innerStream.Dispose();
+            }
         }
 
         base.Dispose(disposing);

src/DotNetCampus.HttpClientOverOpenSsl/OpenSslClientAuthenticationOptions.cs

@@ -3,7 +3,7 @@ namespace DotNetCampus.HttpClientOverOpenSsl;
 /// <summary>
 /// OpenSSL 客户端认证配置选项。
 /// </summary>
-internal sealed class OpenSslClientAuthenticationOptions
+public sealed class OpenSslClientAuthenticationOptions
 {
     /// <summary>
     /// 目标主机名，用于 TLS SNI（Server Name Indication）和证书验证。