Merge branch 'develop' of https://github.com/justcoding121/titanium-web-proxy into develop

honfika · honfika · commit f56ed3f3c206 · 2022-01-23T23:30:35.000+01:00
diff --git a/src/Titanium.Web.Proxy/Network/TcpConnection/TcpConnectionFactory.cs b/src/Titanium.Web.Proxy/Network/TcpConnection/TcpConnectionFactory.cs
@@ -538,6 +538,8 @@ internal Task<TcpServerConnection> GetServerConnection(ProxyServer proxyServer,
                         connectRequest.Headers.AddHeader(HttpHeader.GetProxyAuthorizationHeader(externalProxy.UserName, externalProxy.Password));
                     }
 
+                    await proxyServer.onBeforeUpStreamConnectRequest(connectRequest);
+
                     await stream.WriteRequestAsync(connectRequest, cancellationToken);
 
                     var httpStatus = await stream.ReadResponseStatus(cancellationToken);
diff --git a/src/Titanium.Web.Proxy/ProxyServer.cs b/src/Titanium.Web.Proxy/ProxyServer.cs
@@ -11,6 +11,7 @@
 using Titanium.Web.Proxy.Extensions;
 using Titanium.Web.Proxy.Helpers;
 using Titanium.Web.Proxy.Helpers.WinHttp;
+using Titanium.Web.Proxy.Http;
 using Titanium.Web.Proxy.Models;
 using Titanium.Web.Proxy.Network;
 using Titanium.Web.Proxy.Network.Tcp;
@@ -387,6 +388,11 @@ public ExceptionHandler ExceptionFunc
         /// </summary>
         public event AsyncEventHandler<Socket>? OnServerConnectionCreate;
 
+        /// <summary>
+        ///     Intercept connect request sent to upstream proxy.
+        /// </summary>
+        public event AsyncEventHandler<ConnectRequest>? BeforeUpStreamConnectRequest;
+
         /// <summary>
         /// Customize the minimum ThreadPool size (increase it on a server)
         /// </summary>
diff --git a/src/Titanium.Web.Proxy/RequestHandler.cs b/src/Titanium.Web.Proxy/RequestHandler.cs
@@ -406,6 +406,19 @@ private async Task onBeforeRequest(SessionEventArgs args)
             }
         }
 
+        /// <summary>
+        ///     Invoke before request handler if it is set.
+        /// </summary>
+        /// <param name="request">The COONECT request.</param>
+        /// <returns></returns>
+        internal async Task onBeforeUpStreamConnectRequest(ConnectRequest request)
+        {
+            if (BeforeUpStreamConnectRequest != null)
+            {
+                await BeforeUpStreamConnectRequest.InvokeAsync(this, request, ExceptionFunc);
+            }
+        }
+
 #if DEBUG
         internal bool ShouldCallBeforeRequestBodyWrite()
         {

Original file line number	Diff line number	Diff line change
`@@ -538,6 +538,8 @@ internal Task<TcpServerConnection> GetServerConnection(ProxyServer proxyServer,`
`538`	`538`	`connectRequest.Headers.AddHeader(HttpHeader.GetProxyAuthorizationHeader(externalProxy.UserName, externalProxy.Password));`
`539`	`539`	`}`
`540`	`540`
	`541`	`+ await proxyServer.onBeforeUpStreamConnectRequest(connectRequest);`
	`542`	`+`
`541`	`543`	`await stream.WriteRequestAsync(connectRequest, cancellationToken);`
`542`	`544`
`543`	`545`	`var httpStatus = await stream.ReadResponseStatus(cancellationToken);`
Original file line number	Diff line number	Diff line change
`@@ -406,6 +406,19 @@ private async Task onBeforeRequest(SessionEventArgs args)`
`406`	`406`	`}`
`407`	`407`	`}`
`408`	`408`
	`409`	`+ /// <summary>`
	`410`	`+ /// Invoke before request handler if it is set.`
	`411`	`+ /// </summary>`
	`412`	`+ /// <param name="request">The COONECT request.</param>`
	`413`	`+ /// <returns></returns>`
	`414`	`+ internal async Task onBeforeUpStreamConnectRequest(ConnectRequest request)`
	`415`	`+ {`
	`416`	`+ if (BeforeUpStreamConnectRequest != null)`
	`417`	`+ {`
	`418`	`+ await BeforeUpStreamConnectRequest.InvokeAsync(this, request, ExceptionFunc);`
	`419`	`+ }`
	`420`	`+ }`
	`421`	`+`
`409`	`422`	`#if DEBUG`
`410`	`423`	`internal bool ShouldCallBeforeRequestBodyWrite()`
`411`	`424`	`{`