Merge pull request #617 from justcoding121/master

Master to beta
justcoding121 · Jul 21, 2019 · c2e5c44 · c2e5c44
2 parents 0e8e25c + 1b3d813
commit c2e5c44
Show file tree

Hide file tree

Showing 20 changed files with 315 additions and 73 deletions.
diff --git a/docs/api/Titanium.Web.Proxy.ProxyServer.html b/docs/api/Titanium.Web.Proxy.ProxyServer.html
@@ -1245,7 +1245,7 @@ <h5 class="parameters">Parameters</h5>
     <a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_ProxyServer_DisableAllSystemProxies.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.ProxyServer.DisableAllSystemProxies%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L536">View Source</a>
+    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L550">View Source</a>
   </span>
   <a id="Titanium_Web_Proxy_ProxyServer_DisableAllSystemProxies_" data-uid="Titanium.Web.Proxy.ProxyServer.DisableAllSystemProxies*"></a>
   <h4 id="Titanium_Web_Proxy_ProxyServer_DisableAllSystemProxies" data-uid="Titanium.Web.Proxy.ProxyServer.DisableAllSystemProxies">DisableAllSystemProxies()</h4>
@@ -1293,7 +1293,7 @@ <h5 class="decalaration">Declaration</h5>
     <a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_ProxyServer_DisableSystemProxy_Titanium_Web_Proxy_Models_ProxyProtocolType_.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.ProxyServer.DisableSystemProxy(Titanium.Web.Proxy.Models.ProxyProtocolType)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L522">View Source</a>
+    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L536">View Source</a>
   </span>
   <a id="Titanium_Web_Proxy_ProxyServer_DisableSystemProxy_" data-uid="Titanium.Web.Proxy.ProxyServer.DisableSystemProxy*"></a>
   <h4 id="Titanium_Web_Proxy_ProxyServer_DisableSystemProxy_Titanium_Web_Proxy_Models_ProxyProtocolType_" data-uid="Titanium.Web.Proxy.ProxyServer.DisableSystemProxy(Titanium.Web.Proxy.Models.ProxyProtocolType)">DisableSystemProxy(ProxyProtocolType)</h4>
@@ -1326,7 +1326,7 @@ <h5 class="parameters">Parameters</h5>
     <a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_ProxyServer_Dispose.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.ProxyServer.Dispose%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L884">View Source</a>
+    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L898">View Source</a>
   </span>
   <a id="Titanium_Web_Proxy_ProxyServer_Dispose_" data-uid="Titanium.Web.Proxy.ProxyServer.Dispose*"></a>
   <h4 id="Titanium_Web_Proxy_ProxyServer_Dispose" data-uid="Titanium.Web.Proxy.ProxyServer.Dispose">Dispose()</h4>
@@ -1372,6 +1372,22 @@ <h5 class="parameters">Parameters</h5>
       </tr>
     </tbody>
   </table>
+  <span class="small pull-right mobile-hide">
+    <span class="divider">|</span>
+    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_ProxyServer_RestoreOriginalProxySettings.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.ProxyServer.RestoreOriginalProxySettings%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
+  </span>
+  <span class="small pull-right mobile-hide">
+    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L522">View Source</a>
+  </span>
+  <a id="Titanium_Web_Proxy_ProxyServer_RestoreOriginalProxySettings_" data-uid="Titanium.Web.Proxy.ProxyServer.RestoreOriginalProxySettings*"></a>
+  <h4 id="Titanium_Web_Proxy_ProxyServer_RestoreOriginalProxySettings" data-uid="Titanium.Web.Proxy.ProxyServer.RestoreOriginalProxySettings">RestoreOriginalProxySettings()</h4>
+  <div class="markdown level1 summary"><p>Restores the original proxy settings.</p>
+</div>
+  <div class="markdown level1 conceptual"></div>
+  <h5 class="decalaration">Declaration</h5>
+  <div class="codewrapper">
+    <pre><code class="lang-csharp hljs">public void RestoreOriginalProxySettings()</code></pre>
+  </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
     <a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_ProxyServer_SetAsSystemHttpProxy_Titanium_Web_Proxy_Models_ExplicitProxyEndPoint_.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.ProxyServer.SetAsSystemHttpProxy(Titanium.Web.Proxy.Models.ExplicitProxyEndPoint)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
@@ -1485,7 +1501,7 @@ <h5 class="parameters">Parameters</h5>
     <a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_ProxyServer_Start.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.ProxyServer.Start%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L550">View Source</a>
+    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L564">View Source</a>
   </span>
   <a id="Titanium_Web_Proxy_ProxyServer_Start_" data-uid="Titanium.Web.Proxy.ProxyServer.Start*"></a>
   <h4 id="Titanium_Web_Proxy_ProxyServer_Start" data-uid="Titanium.Web.Proxy.ProxyServer.Start">Start()</h4>
@@ -1501,7 +1517,7 @@ <h5 class="decalaration">Declaration</h5>
     <a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_ProxyServer_Stop.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.ProxyServer.Stop%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L610">View Source</a>
+    <a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/ProxyServer.cs/#L624">View Source</a>
   </span>
   <a id="Titanium_Web_Proxy_ProxyServer_Stop_" data-uid="Titanium.Web.Proxy.ProxyServer.Stop*"></a>
   <h4 id="Titanium_Web_Proxy_ProxyServer_Stop" data-uid="Titanium.Web.Proxy.ProxyServer.Stop">Stop()</h4>

diff --git a/docs/index.json b/docs/index.json
diff --git a/docs/xrefmap.yml b/docs/xrefmap.yml
@@ -3744,6 +3744,19 @@ references:
   isSpec: "True"
   fullName: Titanium.Web.Proxy.ProxyServer.RemoveEndPoint
   nameWithType: ProxyServer.RemoveEndPoint
+- uid: Titanium.Web.Proxy.ProxyServer.RestoreOriginalProxySettings
+  name: RestoreOriginalProxySettings()
+  href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_RestoreOriginalProxySettings
+  commentId: M:Titanium.Web.Proxy.ProxyServer.RestoreOriginalProxySettings
+  fullName: Titanium.Web.Proxy.ProxyServer.RestoreOriginalProxySettings()
+  nameWithType: ProxyServer.RestoreOriginalProxySettings()
+- uid: Titanium.Web.Proxy.ProxyServer.RestoreOriginalProxySettings*
+  name: RestoreOriginalProxySettings
+  href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_RestoreOriginalProxySettings_
+  commentId: Overload:Titanium.Web.Proxy.ProxyServer.RestoreOriginalProxySettings
+  isSpec: "True"
+  fullName: Titanium.Web.Proxy.ProxyServer.RestoreOriginalProxySettings
+  nameWithType: ProxyServer.RestoreOriginalProxySettings
 - uid: Titanium.Web.Proxy.ProxyServer.ReuseSocket
   name: ReuseSocket
   href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_ReuseSocket

diff --git a/examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs b/examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
@@ -119,7 +119,7 @@ public void Stop()
         private async Task onBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e)
         {
             string hostname = e.HttpClient.Request.RequestUri.Host;
-            await writeToConsole("Tunnel to: " + hostname);
+            //await writeToConsole("Tunnel to: " + hostname);
 
             if (hostname.Contains("dropbox.com"))
             {
@@ -138,8 +138,8 @@ private Task onBeforeTunnelConnectResponse(object sender, TunnelConnectSessionEv
         // intecept & cancel redirect or update requests
         private async Task onRequest(object sender, SessionEventArgs e)
         {
-            await writeToConsole("Active Client Connections:" + ((ProxyServer)sender).ClientConnectionCount);
-            await writeToConsole(e.HttpClient.Request.Url);
+            //await writeToConsole("Active Client Connections:" + ((ProxyServer)sender).ClientConnectionCount);
+            //await writeToConsole(e.HttpClient.Request.Url);
 
             // store it in the UserData property
             // It can be a simple integer, Guid, or any type
@@ -189,7 +189,7 @@ private async Task multipartRequestPartSent(object sender, MultipartRequestPartS
 
         private async Task onResponse(object sender, SessionEventArgs e)
         {
-            await writeToConsole("Active Server Connections:" + ((ProxyServer)sender).ServerConnectionCount);
+            //await writeToConsole("Active Server Connections:" + ((ProxyServer)sender).ServerConnectionCount);
 
             string ext = System.IO.Path.GetExtension(e.HttpClient.Request.RequestUri.AbsolutePath);
 

diff --git a/examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml b/examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml
@@ -54,6 +54,7 @@
             </TabItem>
         </TabControl>
         <StackPanel Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Orientation="Horizontal">
+            <ToggleButton IsChecked="True" Content="On/Off" Click="ButtonProxyOnOff_OnClick" />
             <TextBlock Text="ClientConnectionCount:" />
             <TextBlock Text="{Binding ClientConnectionCount}" Margin="10,0,20,0" />
             <TextBlock Text="ServerConnectionCount:" />

diff --git a/examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs b/examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using Titanium.Web.Proxy.EventArguments;
@@ -95,7 +96,7 @@ public MainWindow()
                 Dispatcher.Invoke(() => { ServerConnectionCount = proxyServer.ServerConnectionCount; });
             };
             proxyServer.Start();
-
+            
             proxyServer.SetAsSystemProxy(explicitEndPoint, ProxyProtocolType.AllHttp);
 
             InitializeComponent();
@@ -284,30 +285,44 @@ private void ListViewSessions_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Delete)
             {
+                bool isSelected = false;
                 var selectedItems = ((ListView)sender).SelectedItems;
                 Sessions.SuppressNotification = true;
                 foreach (var item in selectedItems.Cast<SessionListItem>().ToArray())
                 {
+                    if (item == SelectedSession)
+                    {
+                        isSelected = true;
+                    }
+
                     Sessions.Remove(item);
                     sessionDictionary.Remove(item.HttpClient);
                 }
 
                 Sessions.SuppressNotification = false;
+
+                if (isSelected)
+                {
+                    SelectedSession = null;
+                }
             }
         }
 
         private void selectedSessionChanged()
         {
             if (SelectedSession == null)
             {
+                TextBoxRequest.Text = null;
+                TextBoxResponse.Text = string.Empty;
+                ImageResponse.Source = null;
                 return;
             }
 
             const int truncateLimit = 1024;
 
             var session = SelectedSession.HttpClient;
             var request = session.Request;
-            var fullData = (request.IsBodyRead ? request.Body : null) ?? new byte[0];
+            var fullData = (request.IsBodyRead ? request.Body : null) ?? Array.Empty<byte>();
             var data = fullData;
             bool truncated = data.Length > truncateLimit;
             if (truncated)
@@ -324,7 +339,7 @@ private void selectedSessionChanged()
             TextBoxRequest.Text = sb.ToString();
 
             var response = session.Response;
-            fullData = (response.IsBodyRead ? response.Body : null) ?? new byte[0];
+            fullData = (response.IsBodyRead ? response.Body : null) ?? Array.Empty<byte>();
             data = fullData;
             truncated = data.Length > truncateLimit;
             if (truncated)
@@ -348,16 +363,33 @@ private void selectedSessionChanged()
 
             try
             {
-                using (MemoryStream stream = new MemoryStream(fullData))
+                if (fullData.Length > 0)
                 {
-                    ImageResponse.Source =
-                        BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
+                    using (var stream = new MemoryStream(fullData))
+                    {
+                        ImageResponse.Source =
+                            BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
+                    }
                 }
             }
             catch
             {
                 ImageResponse.Source = null;
             }
         }
+
+        private void ButtonProxyOnOff_OnClick(object sender, RoutedEventArgs e)
+        {
+            var button = (ToggleButton)sender;
+            if (button.IsChecked == true)
+            {
+                proxyServer.SetAsSystemProxy((ExplicitProxyEndPoint)proxyServer.ProxyEndPoints[0],
+                    ProxyProtocolType.AllHttp);
+            }
+            else
+            {
+                proxyServer.RestoreOriginalProxySettings();
+            }
+        }
     }
 }
diff --git a/src/Titanium.Web.Proxy/ExplicitClientHandler.cs b/src/Titanium.Web.Proxy/ExplicitClientHandler.cs
@@ -265,8 +265,8 @@ await clientStreamWriter.WriteResponseAsync(connectArgs.HttpClient.Response,
 
                                     try
                                     {
-                                        await clientStream.ReadAsync(data, 0, available, cancellationToken);
                                         // clientStream.Available should be at most BufferSize because it is using the same buffer size
+                                        await clientStream.ReadAsync(data, 0, available, cancellationToken);
                                         await connection.StreamWriter.WriteAsync(data, 0, available, true, cancellationToken);
                                     }
                                     finally
@@ -279,10 +279,13 @@ await clientStreamWriter.WriteResponseAsync(connectArgs.HttpClient.Response,
                                 ((ConnectResponse)connectArgs.HttpClient.Response).ServerHelloInfo = serverHelloInfo;
                             }
 
-                            await TcpHelper.SendRaw(clientStream, connection.Stream, BufferPool, BufferSize,
-                                (buffer, offset, count) => { connectArgs.OnDataSent(buffer, offset, count); },
-                                (buffer, offset, count) => { connectArgs.OnDataReceived(buffer, offset, count); },
-                                connectArgs.CancellationTokenSource, ExceptionFunc);
+                            if (!clientStream.IsClosed && !connection.Stream.IsClosed)
+                            {
+                                await TcpHelper.SendRaw(clientStream, connection.Stream, BufferPool, BufferSize,
+                                    (buffer, offset, count) => { connectArgs.OnDataSent(buffer, offset, count); },
+                                    (buffer, offset, count) => { connectArgs.OnDataReceived(buffer, offset, count); },
+                                    connectArgs.CancellationTokenSource, ExceptionFunc);
+                            }
                         }
                         finally
                         {

diff --git a/src/Titanium.Web.Proxy/Helpers/HttpHelper.cs b/src/Titanium.Web.Proxy/Helpers/HttpHelper.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -99,7 +100,13 @@ internal static string GetWildCardDomainName(string hostname)
         {
             // only for subdomains we need wild card
             // example www.google.com or gstatic.google.com
-            // but NOT for google.com
+            // but NOT for google.com or IP address
+
+            if (IPAddress.TryParse(hostname, out _))
+            {
+                return hostname;
+            }
+
             if (hostname.Split(ProxyConstants.DotSplit).Length > 2)
             {
                 int idx = hostname.IndexOf(ProxyConstants.DotSplit);

diff --git a/src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs b/src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
@@ -481,6 +481,7 @@ private async Task clearOutdatedConnections()
             {
                 try
                 {
+                    var cutOff = DateTime.Now.AddSeconds(-1 * Server.ConnectionTimeOutSeconds);
                     foreach (var item in cache)
                     {
                         var queue = item.Value;
@@ -489,7 +490,6 @@ private async Task clearOutdatedConnections()
                         {
                             if (queue.TryDequeue(out var connection))
                             {
-                                var cutOff = DateTime.Now.AddSeconds(-1 * Server.ConnectionTimeOutSeconds);
                                 if (!Server.EnableConnectionPool
                                     || connection.LastAccess < cutOff)
                                 {
@@ -512,7 +512,7 @@ private async Task clearOutdatedConnections()
                         var emptyKeys = cache.Where(x => x.Value.Count == 0).Select(x => x.Key).ToList();
                         foreach (string key in emptyKeys)
                         {
-                            cache.TryRemove(key, out var _);
+                            cache.TryRemove(key, out _);
                         }
                     }
                     finally

diff --git a/src/Titanium.Web.Proxy/ProxyServer.cs b/src/Titanium.Web.Proxy/ProxyServer.cs
@@ -516,6 +516,20 @@ public void DisableSystemHttpsProxy()
             DisableSystemProxy(ProxyProtocolType.Https);
         }
 
+        /// <summary>
+        ///     Restores the original proxy settings.
+        /// </summary>
+        public void RestoreOriginalProxySettings()
+        {
+            if (!RunTime.IsWindows)
+            {
+                throw new NotSupportedException(@"Setting system proxy settings are only supported in Windows.
+                            Please manually configure your operating system to use this proxy's port and address.");
+            }
+
+            systemProxySettingsManager.RestoreOriginalSettings();
+        }
+
         /// <summary>
         ///     Clear the specified proxy setting for current machine.
         /// </summary>
@@ -524,7 +538,7 @@ public void DisableSystemProxy(ProxyProtocolType protocolType)
             if (!RunTime.IsWindows)
             {
                 throw new NotSupportedException(@"Setting system proxy settings are only supported in Windows.
-                            Please manually confugure you operating system to use this proxy's port and address.");
+                            Please manually configure your operating system to use this proxy's port and address.");
             }
 
             systemProxySettingsManager.RemoveProxy(protocolType);