Merge pull request #645 from justcoding121/master

beta

Author: honfika

src/Titanium.Web.Proxy/CertificateHandler.cs

@@ -53,11 +53,11 @@ internal bool ValidateServerCertificate(object sender, X509Certificate certifica
         /// <param name="remoteCertificate">The remote certificate of server.</param>
         /// <param name="acceptableIssuers">The acceptable issues for client certificate as listed by server.</param>
         /// <returns></returns>
-        internal X509Certificate SelectClientCertificate(object sender, string targetHost,
+        internal X509Certificate? SelectClientCertificate(object sender, string targetHost,
             X509CertificateCollection localCertificates,
             X509Certificate remoteCertificate, string[] acceptableIssuers)
         {
-            X509Certificate clientCertificate = null;
+            X509Certificate? clientCertificate = null;
 
             if (acceptableIssuers != null && acceptableIssuers.Length > 0 && localCertificates != null &&
                 localCertificates.Count > 0)

src/Titanium.Web.Proxy/Compression/CompressionFactory.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.IO.Compression;
-using Titanium.Web.Proxy.Helpers;
 using Titanium.Web.Proxy.Http;
 
 namespace Titanium.Web.Proxy.Compression

src/Titanium.Web.Proxy/Compression/DecompressionFactory.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.IO.Compression;
-using Titanium.Web.Proxy.Helpers;
 using Titanium.Web.Proxy.Http;
 
 namespace Titanium.Web.Proxy.Compression

src/Titanium.Web.Proxy/EventArguments/BeforeSslAuthenticateEventArgs.cs

@@ -10,16 +10,17 @@ public class BeforeSslAuthenticateEventArgs : EventArgs
     {
         internal readonly CancellationTokenSource TaskCancellationSource;
 
-        internal BeforeSslAuthenticateEventArgs(CancellationTokenSource taskCancellationSource)
+        internal BeforeSslAuthenticateEventArgs(CancellationTokenSource taskCancellationSource, string sniHostName)
         {
             TaskCancellationSource = taskCancellationSource;
+            SniHostName = sniHostName;
         }
 
         /// <summary>
         ///     The server name indication hostname if available. Otherwise the generic certificate hostname of
         ///     TransparentEndPoint.
         /// </summary>
-        public string SniHostName { get; internal set; }
+        public string SniHostName { get; }
 
         /// <summary>
         ///     Should we decrypt the SSL request?

src/Titanium.Web.Proxy/EventArguments/CertificateSelectionEventArgs.cs

@@ -11,31 +11,31 @@ public class CertificateSelectionEventArgs : EventArgs
         /// <summary>
         ///     The proxy server instance.
         /// </summary>
-        public object Sender { get; internal set; }
+        public object? Sender { get; internal set; }
 
         /// <summary>
         ///     The remote hostname to which we are authenticating against.
         /// </summary>
-        public string TargetHost { get; internal set; }
+        public string? TargetHost { get; internal set; }
 
         /// <summary>
         ///     Local certificates in store with matching issuers requested by TargetHost website.
         /// </summary>
-        public X509CertificateCollection LocalCertificates { get; internal set; }
+        public X509CertificateCollection? LocalCertificates { get; internal set; }
 
         /// <summary>
         ///     Certificate of the remote server.
         /// </summary>
-        public X509Certificate RemoteCertificate { get; internal set; }
+        public X509Certificate? RemoteCertificate { get; internal set; }
 
         /// <summary>
         ///     Acceptable issuers as listed by remote server.
         /// </summary>
-        public string[] AcceptableIssuers { get; internal set; }
+        public string[]? AcceptableIssuers { get; internal set; }
 
         /// <summary>
         ///     Client Certificate we selected. Set this value to override.
         /// </summary>
-        public X509Certificate ClientCertificate { get; set; }
+        public X509Certificate? ClientCertificate { get; set; }
     }
 }

src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs

@@ -43,7 +43,7 @@ internal SessionEventArgs(ProxyServer server, ProxyEndPoint endPoint,
         }
 
         protected SessionEventArgs(ProxyServer server, ProxyEndPoint endPoint,
-            Request request, CancellationTokenSource cancellationTokenSource)
+            Request? request, CancellationTokenSource cancellationTokenSource)
             : base(server, endPoint, cancellationTokenSource, request)
         {
         }
@@ -70,7 +70,7 @@ public bool ReRequest
         /// <summary>
         /// Occurs when multipart request part sent.
         /// </summary>
-        public event EventHandler<MultipartRequestPartSentEventArgs> MultipartRequestPartSent;
+        public event EventHandler<MultipartRequestPartSentEventArgs>? MultipartRequestPartSent;
 
         private ICustomStreamReader getStreamReader(bool isRequest)
         {
@@ -105,7 +105,7 @@ private async Task readRequestBodyAsync(CancellationToken cancellationToken)
                     request.ReadHttp2BodyTaskCompletionSource = tcs;
 
                     // signal to HTTP/2 copy frame method to continue
-                    request.ReadHttp2BeforeHandlerTaskCompletionSource.SetResult(true);
+                    request.ReadHttp2BeforeHandlerTaskCompletionSource!.SetResult(true);
 
                     await tcs.Task;
 
@@ -135,11 +135,11 @@ internal async Task ClearResponse(CancellationToken cancellationToken)
             HttpClient.Response = new Response();
         }
 
-        internal void OnMultipartRequestPartSent(string boundary, HeaderCollection headers)
+        internal void OnMultipartRequestPartSent(ReadOnlySpan<char> boundary, HeaderCollection headers)
         {
             try
             {
-                MultipartRequestPartSent?.Invoke(this, new MultipartRequestPartSentEventArgs(boundary, headers));
+                MultipartRequestPartSent?.Invoke(this, new MultipartRequestPartSentEventArgs(boundary.ToString(), headers));
             }
             catch (Exception ex)
             {
@@ -177,7 +177,7 @@ private async Task readResponseBodyAsync(CancellationToken cancellationToken)
                     response.ReadHttp2BodyTaskCompletionSource = tcs;
 
                     // signal to HTTP/2 copy frame method to continue
-                    response.ReadHttp2BeforeHandlerTaskCompletionSource.SetResult(true);
+                    response.ReadHttp2BeforeHandlerTaskCompletionSource!.SetResult(true);
 
                     await tcs.Task;
 
@@ -252,7 +252,7 @@ internal async Task CopyRequestBodyAsync(HttpWriter writer, TransformationMode t
             if (contentLength > 0 && hasMulipartEventSubscribers && request.IsMultipartFormData)
             {
                 var reader = getStreamReader(true);
-                string boundary = HttpHelper.GetBoundaryFromContentType(request.ContentType);
+                var boundary = HttpHelper.GetBoundaryFromContentType(request.ContentType);
 
                 using (var copyStream = new CopyStream(reader, writer, BufferPool))
                 {
@@ -268,7 +268,7 @@ internal async Task CopyRequestBodyAsync(HttpWriter writer, TransformationMode t
                         {
                             var headers = new HeaderCollection();
                             await HeaderParser.ReadHeaders(copyStream, headers, cancellationToken);
-                            OnMultipartRequestPartSent(boundary, headers);
+                            OnMultipartRequestPartSent(boundary.Span, headers);
                         }
                     }
 
@@ -286,7 +286,7 @@ internal async Task CopyResponseBodyAsync(HttpWriter writer, TransformationMode
             await copyBodyAsync(false, false, writer, transformation, OnDataReceived, cancellationToken);
         }
 
-        private async Task copyBodyAsync(bool isRequest, bool useOriginalHeaderValues, HttpWriter writer, TransformationMode transformation, Action<byte[], int, int> onCopy, CancellationToken cancellationToken)
+        private async Task copyBodyAsync(bool isRequest, bool useOriginalHeaderValues, HttpWriter writer, TransformationMode transformation, Action<byte[], int, int>? onCopy, CancellationToken cancellationToken)
         {
             var stream = getStreamReader(isRequest);
 
@@ -302,9 +302,9 @@ private async Task copyBodyAsync(bool isRequest, bool useOriginalHeaderValues, H
             }
 
             LimitedStream limitedStream;
-            Stream decompressStream = null;
+            Stream? decompressStream = null;
 
-            string contentEncoding = useOriginalHeaderValues ? requestResponse.OriginalContentEncoding : requestResponse.ContentEncoding;
+            string? contentEncoding = useOriginalHeaderValues ? requestResponse.OriginalContentEncoding : requestResponse.ContentEncoding;
 
             Stream s = limitedStream = new LimitedStream(stream, BufferPool, isChunked, contentLength);
 
@@ -333,7 +333,7 @@ private async Task copyBodyAsync(bool isRequest, bool useOriginalHeaderValues, H
         /// Read a line from the byte stream
         /// </summary>
         /// <returns></returns>
-        private async Task<long> readUntilBoundaryAsync(ICustomStreamReader reader, long totalBytesToRead, string boundary, CancellationToken cancellationToken)
+        private async Task<long> readUntilBoundaryAsync(ICustomStreamReader reader, long totalBytesToRead, ReadOnlyMemory<char> boundary, CancellationToken cancellationToken)
         {
             int bufferDataLength = 0;
 
@@ -360,7 +360,7 @@ private async Task<long> readUntilBoundaryAsync(ICustomStreamReader reader, long
                             bool ok = true;
                             for (int i = 0; i < boundary.Length; i++)
                             {
-                                if (buffer[startIdx + i] != boundary[i])
+                                if (buffer[startIdx + i] != boundary.Span[i])
                                 {
                                     ok = false;
                                     break;
@@ -519,7 +519,7 @@ public void SetResponseBodyString(string body)
         /// <param name="html">HTML content to sent.</param>
         /// <param name="headers">HTTP response headers.</param>
         /// <param name="closeServerConnection">Close the server connection used by request if any?</param>
-        public void Ok(string html, Dictionary<string, HttpHeader> headers = null,
+        public void Ok(string html, Dictionary<string, HttpHeader>? headers = null,
             bool closeServerConnection = false)
         {
             var response = new OkResponse();
@@ -541,7 +541,7 @@ public void Ok(string html, Dictionary<string, HttpHeader> headers = null,
         /// <param name="result">The html content bytes.</param>
         /// <param name="headers">The HTTP headers.</param>
         /// <param name="closeServerConnection">Close the server connection used by request if any?</param>
-        public void Ok(byte[] result, Dictionary<string, HttpHeader> headers = null,
+        public void Ok(byte[] result, Dictionary<string, HttpHeader>? headers = null,
             bool closeServerConnection = false)
         {
             var response = new OkResponse();
@@ -562,7 +562,7 @@ public void Ok(byte[] result, Dictionary<string, HttpHeader> headers = null,
         /// <param name="headers">The HTTP headers.</param>
         /// <param name="closeServerConnection">Close the server connection used by request if any?</param>
         public void GenericResponse(string html, HttpStatusCode status,
-            Dictionary<string, HttpHeader> headers = null, bool closeServerConnection = false)
+            Dictionary<string, HttpHeader>? headers = null, bool closeServerConnection = false)
         {
             var response = new GenericResponse(status);
             response.HttpVersion = HttpClient.Request.HttpVersion;

src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs

@@ -49,7 +49,7 @@ private SessionEventArgsBase(ProxyServer server)
 
         protected SessionEventArgsBase(ProxyServer server, ProxyEndPoint endPoint,
             CancellationTokenSource cancellationTokenSource,
-            Request request) : this(server)
+            Request? request) : this(server)
         {
             CancellationTokenSource = cancellationTokenSource;
 
@@ -70,7 +70,7 @@ protected SessionEventArgsBase(ProxyServer server, ProxyEndPoint endPoint,
         ///     Returns a user data for this request/response session which is
         ///     same as the user data of HttpClient.
         /// </summary>
-        public object UserData
+        public object? UserData
         {
             get => HttpClient.UserData;
             set => HttpClient.UserData = value;
@@ -112,7 +112,7 @@ public bool EnableWinAuth
         /// <summary>
         ///     Are we using a custom upstream HTTP(S) proxy?
         /// </summary>
-        public ExternalProxy CustomUpStreamProxyUsed { get; internal set; }
+        public ExternalProxy? CustomUpStreamProxyUsed { get; internal set; }
 
         /// <summary>
         ///     Local endpoint via which we make the request.
@@ -127,7 +127,7 @@ public bool EnableWinAuth
         /// <summary>
         ///     The last exception that happened.
         /// </summary>
-        public Exception Exception { get; internal set; }
+        public Exception? Exception { get; internal set; }
 
         /// <summary>
         ///     Implements cleanup here.
@@ -146,12 +146,12 @@ public virtual void Dispose()
         /// <summary>
         ///     Fired when data is sent within this session to server/client.
         /// </summary>
-        public event EventHandler<DataEventArgs> DataSent;
+        public event EventHandler<DataEventArgs>? DataSent;
 
         /// <summary>
         ///     Fired when data is received within this session from client/server.
         /// </summary>
-        public event EventHandler<DataEventArgs> DataReceived;
+        public event EventHandler<DataEventArgs>? DataReceived;
 
         internal void OnDataSent(byte[] buffer, int offset, int count)
         {

src/Titanium.Web.Proxy/EventArguments/TunnelConnectEventArgs.cs

@@ -45,12 +45,12 @@ public bool IsHttpsConnect
         /// <summary>
         ///     Fired when decrypted data is sent within this session to server/client.
         /// </summary>
-        public event EventHandler<DataEventArgs> DecryptedDataSent;
+        public event EventHandler<DataEventArgs>? DecryptedDataSent;
 
         /// <summary>
         ///     Fired when decrypted data is received within this session from client/server.
         /// </summary>
-        public event EventHandler<DataEventArgs> DecryptedDataReceived;
+        public event EventHandler<DataEventArgs>? DecryptedDataReceived;
 
         internal void OnDecryptedDataSent(byte[] buffer, int offset, int count)
         {

src/Titanium.Web.Proxy/ExceptionHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Titanium.Web.Proxy
 {

src/Titanium.Web.Proxy/Exceptions/ProxyException.cs

@@ -22,7 +22,7 @@ protected ProxyException(string message) : base(message)
         /// </summary>
         /// <param name="message">Exception message</param>
         /// <param name="innerException">Inner exception associated</param>
-        protected ProxyException(string message, Exception innerException) : base(message, innerException)
+        protected ProxyException(string message, Exception? innerException) : base(message, innerException)
         {
         }
     }