wip: ssl, cadente improvements and fixes

Author: CypherPotato

cadente/Sisk.Cadente/HttpHost.cs

@@ -127,10 +127,12 @@ private async void ReceiveClient ( IAsyncResult result ) {
 
     private async Task HandleTcpClient ( TcpClient client ) {
 
-        bool clientIsAlive = true;
         try {
-            client.ReceiveTimeout = TimeoutManager._ClientReadTimeoutSeconds;
-            client.SendTimeout = TimeoutManager._ClientWriteTimeoutSeconds;
+            int clientReadTimeoutMs = (int) TimeoutManager.ClientReadTimeout.TotalMilliseconds;
+            int clientWriteTimeoutMs = (int) TimeoutManager.ClientWriteTimeout.TotalMilliseconds;
+
+            client.ReceiveTimeout = clientReadTimeoutMs;
+            client.SendTimeout = clientWriteTimeoutMs;
 
             if (Handler is null)
                 return;
@@ -145,31 +147,11 @@ private async Task HandleTcpClient ( TcpClient client ) {
                 connectionStream = clientStream;
             }
 
-            CancellationTokenSource disconnectToken = new CancellationTokenSource ();
-            Task disconnectPoolingTask = Task.Factory.StartNew ( delegate {
-
-                try {
-                    int itcount = 0;
-                    while (clientIsAlive && itcount < 3) {
-                        if (client.Client.Poll ( 1, SelectMode.SelectRead )) {
-                            itcount++;
-                        }
-
-                        Thread.Sleep ( 100 );
-                    }
-                }
-                catch {
-                    ;
-                }
-                finally {
-                    disconnectToken.Cancel ();
-                    clientIsAlive = false;
-                }
-
-            }, TaskCreationOptions.LongRunning );
-
             IPEndPoint clientEndpoint = (IPEndPoint) client.Client.RemoteEndPoint!;
-            HttpHostClient hostClient = new HttpHostClient ( clientEndpoint, disconnectToken.Token );
+            HttpHostClient hostClient = new HttpHostClient ( clientEndpoint, CancellationToken.None );
+
+            connectionStream.ReadTimeout = clientReadTimeoutMs;
+            connectionStream.WriteTimeout = clientWriteTimeoutMs;
 
             using (HttpConnection connection = new HttpConnection ( hostClient, connectionStream, this, clientEndpoint )) {
 
@@ -194,7 +176,6 @@ await sslStream.AuthenticateAsServerAsync (
             }
         }
         finally {
-            clientIsAlive = false;
             client.Dispose ();
         }
     }

cadente/Sisk.Cadente/HttpHostTimeoutManager.cs

@@ -14,24 +14,15 @@ namespace Sisk.Cadente;
 /// </summary>
 public sealed class HttpHostTimeoutManager {
 
-    internal int _ClientReadTimeoutSeconds = 30;
-    internal int _ClientWriteTimeoutSeconds = 30;
-
     /// <summary>
     /// Gets or sets the timeout for client read operations.
     /// </summary>
-    public TimeSpan ClientReadTimeout {
-        get => TimeSpan.FromSeconds ( _ClientReadTimeoutSeconds );
-        set => _ClientReadTimeoutSeconds = (int) value.TotalSeconds;
-    }
+    public TimeSpan ClientReadTimeout { get; set; } = TimeSpan.FromSeconds ( 30 );
 
     /// <summary>
     /// Gets or sets the timeout for client write operations.
     /// </summary>
-    public TimeSpan ClientWriteTimeout {
-        get => TimeSpan.FromSeconds ( _ClientWriteTimeoutSeconds );
-        set => _ClientWriteTimeoutSeconds = (int) value.TotalSeconds;
-    }
+    public TimeSpan ClientWriteTimeout { get; set; } = TimeSpan.FromSeconds ( 30 );
 
     internal HttpHostTimeoutManager () { }
 }

cadente/Sisk.Cadente/Streams/HttpChunkedStream.cs

@@ -42,28 +42,30 @@ public override int Read ( byte [] buffer, int offset, int count ) {
         if (innerStreamReturnedZero)
             return 0;
 
-        Span<byte> readBuffer = stackalloc byte [ Math.Min ( count - 2, CHUNKED_MAX_SIZE ) ];
+        Span<byte> destination = buffer.AsSpan ( offset, count );
+        if (destination.Length < 2)
+            throw new ArgumentException ( "The provided buffer slice must be at least 2 bytes long.", nameof ( count ) );
+
+        Span<byte> readBuffer = stackalloc byte [ Math.Min ( destination.Length - 2, CHUNKED_MAX_SIZE ) ];
         int read = _stream.Read ( readBuffer );
         byte [] readBytesEncoded = Encoding.ASCII.GetBytes ( $"{read:x}\r\n" );
 
+        if (destination.Length < readBytesEncoded.Length + read + 2)
+            throw new ArgumentException ( "The provided buffer slice is not large enough to hold the chunked response.", nameof ( count ) );
+
         if (read == 0) {
             innerStreamReturnedZero = true;
         }
 
-        Array.Copy (
-            sourceArray: readBytesEncoded,
-            sourceIndex: 0,
-            destinationArray: buffer,
-            destinationIndex: 0,
-            length: readBytesEncoded.Length );
-
-        int copyStart = readBytesEncoded.Length;
+        ReadOnlySpan<byte> headerSpan = readBytesEncoded.AsSpan ();
+        headerSpan.CopyTo ( destination );
 
-        readBuffer [ 0..read ].CopyTo ( buffer.AsSpan () [ copyStart.. ] );
+        int copyStart = headerSpan.Length;
+        readBuffer [ 0..read ].CopyTo ( destination [ copyStart.. ] );
 
-        int bufferEnd = readBytesEncoded.Length + read;
-        buffer [ bufferEnd + 0 ] = 0x0D;
-        buffer [ bufferEnd + 1 ] = 0x0A;
+        int bufferEnd = headerSpan.Length + read;
+        destination [ bufferEnd + 0 ] = 0x0D;
+        destination [ bufferEnd + 1 ] = 0x0A;
 
         written += read;
 

extensions/Sisk.SslProxy/CertificateUtil.cs

@@ -73,6 +73,9 @@ public static X509Certificate2 CreateTrustedDevelopmentCertificate ( params stri
     /// </summary>
     /// <param name="dnsNames">The certificate DNS names.</param>
     public static X509Certificate2 CreateDevelopmentCertificate ( params string [] dnsNames ) {
+        if (dnsNames.Length == 0)
+            throw new ArgumentException ( "At least one DNS name must be specified.", nameof ( dnsNames ) );
+
         SubjectAlternativeNameBuilder sanBuilder = new SubjectAlternativeNameBuilder ();
         sanBuilder.AddIpAddress ( IPAddress.Loopback );
         sanBuilder.AddIpAddress ( IPAddress.IPv6Loopback );