small cleanup

Author: honfika

src/Titanium.Web.Proxy/Helpers/TcpHelper.cs

@@ -100,12 +100,10 @@ private static uint toNetworkByteOrder(uint port)
         /// <param name="onDataSend"></param>
         /// <param name="onDataReceive"></param>
         /// <param name="cancellationTokenSource"></param>
-        /// <param name="exceptionFunc"></param>
         /// <returns></returns>
         private static async Task sendRawTap(Stream clientStream, Stream serverStream, IBufferPool bufferPool,
             Action<byte[], int, int>? onDataSend, Action<byte[], int, int>? onDataReceive,
-            CancellationTokenSource cancellationTokenSource,
-            ExceptionHandler exceptionFunc)
+            CancellationTokenSource cancellationTokenSource)
         {
             // Now async relay all server=>client & client=>server data
             var sendRelay =
@@ -139,8 +137,7 @@ internal static Task SendRaw(Stream clientStream, Stream serverStream, IBufferPo
         {
             // todo: fix APM mode
             return sendRawTap(clientStream, serverStream, bufferPool, onDataSend, onDataReceive,
-                cancellationTokenSource,
-                exceptionFunc);
+                cancellationTokenSource);
         }
     }
 }

src/Titanium.Web.Proxy/Network/Certificate/BCCertificateMaker.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
-using System.Threading;
 using Org.BouncyCastle.Asn1;
 using Org.BouncyCastle.Asn1.Pkcs;
 using Org.BouncyCastle.Asn1.X509;
@@ -219,11 +218,9 @@ private X509Certificate2 makeCertificateInternal(string hostName, string subject
         /// <param name="subject">The s subject cn.</param>
         /// <param name="switchToMtaIfNeeded">if set to <c>true</c> [switch to MTA if needed].</param>
         /// <param name="signingCert">The signing cert.</param>
-        /// <param name="cancellationToken">Task cancellation token</param>
         /// <returns>X509Certificate2.</returns>
         private X509Certificate2 makeCertificateInternal(string subject,
-            bool switchToMtaIfNeeded, X509Certificate2? signingCert = null,
-            CancellationToken cancellationToken = default)
+            bool switchToMtaIfNeeded, X509Certificate2? signingCert = null)
         {
             return makeCertificateInternal(subject, $"CN={subject}",
                 DateTime.UtcNow.AddDays(-certificateGraceDays), DateTime.UtcNow.AddDays(certificateValidDays),

src/Titanium.Web.Proxy/RequestHandler.cs

@@ -291,13 +291,13 @@ private async Task<RetryResult> handleHttpSessionRequest(SessionEventArgs args,
                 }
 
                 // construct the web request that we are going to issue on behalf of the client.
-                await handleHttpSessionRequest(connection, args);
+                await handleHttpSessionRequest(args);
                 return true;
 
             }, generator, serverConnection);
         }
 
-        private async Task handleHttpSessionRequest(TcpServerConnection connection, SessionEventArgs args)
+        private async Task handleHttpSessionRequest(SessionEventArgs args)
         {
             var cancellationToken = args.CancellationTokenSource.Token;
             var request = args.HttpClient.Request;

src/Titanium.Web.Proxy/StreamExtended/SslTools.cs

@@ -154,7 +154,7 @@ internal class SslTools
 
                 if(extensionsStartPosition < recordLength + 5)
                 {
-                    extensions = await ReadExtensions(majorVersion, minorVersion, peekStream, bufferPool, cancellationToken);
+                    extensions = await ReadExtensions(majorVersion, minorVersion, peekStream, cancellationToken);
                 }
 
                 var clientHelloInfo = new ClientHelloInfo(3, majorVersion, minorVersion, random, sessionId, ciphers, peekStream.Position)
@@ -292,7 +292,7 @@ public static async Task<bool> IsServerHello(IPeekStream stream, IBufferPool buf
 
                 if (extensionsStartPosition < recordLength + 5)
                 {
-                   extensions = await ReadExtensions(majorVersion, minorVersion, peekStream, bufferPool, cancellationToken);
+                   extensions = await ReadExtensions(majorVersion, minorVersion, peekStream, cancellationToken);
                 }
 
                 var serverHelloInfo = new ServerHelloInfo(3, majorVersion, minorVersion, random, sessionId, cipherSuite, peekStream.Position)
@@ -308,7 +308,7 @@ public static async Task<bool> IsServerHello(IPeekStream stream, IBufferPool buf
             return null;
         }
 
-        private static async Task<Dictionary<string, SslExtension>?> ReadExtensions(int majorVersion, int minorVersion, PeekStreamReader peekStreamReader, IBufferPool bufferPool, CancellationToken cancellationToken)
+        private static async Task<Dictionary<string, SslExtension>?> ReadExtensions(int majorVersion, int minorVersion, PeekStreamReader peekStreamReader, CancellationToken cancellationToken)
         {
             Dictionary<string, SslExtension>? extensions = null;
             if (majorVersion > 3 || majorVersion == 3 && minorVersion >= 1)

src/Titanium.Web.Proxy/TransparentClientHandler.cs

@@ -75,14 +75,15 @@ private async Task handleClient(TransparentProxyEndPoint endPoint, TcpClientConn
 
                             // HTTPS server created - we can now decrypt the client's traffic
                             clientStream = new HttpClientStream(sslStream, BufferPool);
+                            sslStream = null; // clientStream was created, no need to keep SSL stream reference
                         }
                         catch (Exception e)
                         {
-                            var certname = certificate?.GetNameInfo(X509NameType.SimpleName, false);
+                            var certName = certificate?.GetNameInfo(X509NameType.SimpleName, false);
                             var session = new SessionEventArgs(this, endPoint, clientConnection, clientStream, null,
                                 cancellationTokenSource);
                             throw new ProxyConnectException(
-                                $"Couldn't authenticate host '{httpsHostName}' with certificate '{certname}'.", e, session);
+                                $"Couldn't authenticate host '{httpsHostName}' with certificate '{certName}'.", e, session);
                         }
 
                     }