Commit a863fd15 authored by justcoding121's avatar justcoding121

fix lock issues causing memory violation

parent 3b8ae98b
...@@ -16,9 +16,7 @@ namespace Titanium.Web.Proxy.Examples.Basic ...@@ -16,9 +16,7 @@ namespace Titanium.Web.Proxy.Examples.Basic
public class ProxyTestController public class ProxyTestController
{ {
private readonly SemaphoreSlim @lock = new SemaphoreSlim(1); private readonly SemaphoreSlim @lock = new SemaphoreSlim(1);
private readonly ProxyServer proxyServer; private readonly ProxyServer proxyServer;
private ExplicitProxyEndPoint explicitEndPoint; private ExplicitProxyEndPoint explicitEndPoint;
public ProxyTestController() public ProxyTestController()
...@@ -32,27 +30,13 @@ namespace Titanium.Web.Proxy.Examples.Basic ...@@ -32,27 +30,13 @@ namespace Titanium.Web.Proxy.Examples.Basic
proxyServer.ExceptionFunc = async exception => proxyServer.ExceptionFunc = async exception =>
{ {
await @lock.WaitAsync();
try
{
var color = Console.ForegroundColor;
Console.ForegroundColor = ConsoleColor.Red;
if (exception is ProxyHttpException phex) if (exception is ProxyHttpException phex)
{ {
Console.WriteLine(exception.Message + ": " + phex.InnerException?.Message); await WriteToConsole(exception.Message + ": " + phex.InnerException?.Message, ConsoleColor.Red);
} }
else else
{ {
Console.WriteLine(exception.Message); await WriteToConsole(exception.Message, ConsoleColor.Red);
}
Console.ForegroundColor = color;
}
finally
{
@lock.Release();
} }
}; };
proxyServer.ForwardToUpstreamGateway = true; proxyServer.ForwardToUpstreamGateway = true;
...@@ -110,7 +94,7 @@ namespace Titanium.Web.Proxy.Examples.Basic ...@@ -110,7 +94,7 @@ namespace Titanium.Web.Proxy.Examples.Basic
// Only explicit proxies can be set as system proxy! // Only explicit proxies can be set as system proxy!
//proxyServer.SetAsSystemHttpProxy(explicitEndPoint); //proxyServer.SetAsSystemHttpProxy(explicitEndPoint);
//proxyServer.SetAsSystemHttpsProxy(explicitEndPoint); //proxyServer.SetAsSystemHttpsProxy(explicitEndPoint);
if(RunTime.IsWindows) if (RunTime.IsWindows)
{ {
proxyServer.SetAsSystemProxy(explicitEndPoint, ProxyProtocolType.AllHttp); proxyServer.SetAsSystemProxy(explicitEndPoint, ProxyProtocolType.AllHttp);
} }
...@@ -281,6 +265,24 @@ namespace Titanium.Web.Proxy.Examples.Basic ...@@ -281,6 +265,24 @@ namespace Titanium.Web.Proxy.Examples.Basic
{ {
await @lock.WaitAsync(); await @lock.WaitAsync();
ConsoleColor color;
try
{
color = Console.ForegroundColor;
}
finally
{
@lock.Release();
}
await WriteToConsole(message, color);
}
private async Task WriteToConsole(string message, ConsoleColor color)
{
await @lock.WaitAsync();
try try
{ {
Console.WriteLine(message); Console.WriteLine(message);
...@@ -289,6 +291,7 @@ namespace Titanium.Web.Proxy.Examples.Basic ...@@ -289,6 +291,7 @@ namespace Titanium.Web.Proxy.Examples.Basic
{ {
@lock.Release(); @lock.Release();
} }
} }
///// <summary> ///// <summary>
......
...@@ -427,17 +427,16 @@ namespace Titanium.Web.Proxy.Network ...@@ -427,17 +427,16 @@ namespace Titanium.Web.Proxy.Network
certificate = makeCertificate(certificateName, false); certificate = makeCertificate(certificateName, false);
// store as cache // store as cache
Task.Run(() =>
{
try try
{ {
File.WriteAllBytes(certificatePath, certificate.Export(X509ContentType.Pkcs12)); var exported = certificate.Export(X509ContentType.Pkcs12);
File.WriteAllBytes(certificatePath, exported);
} }
catch (Exception e) catch (Exception e)
{ {
ExceptionFunc(new Exception("Failed to save fake certificate.", e)); ExceptionFunc(new Exception("Failed to save fake certificate.", e));
} }
});
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment