starred/WireMock.Net-wiremock
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-04-25 17:58:33 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Fixed https proxy for netstandard 1.3 and netstandard 2.0 (#85)

Browse Source
This commit is contained in:
Stef Heyenrath
2018-02-02 22:52:08 +01:00
parent 061eb93fd0
commit 361d40189b
19 changed files with 356 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
View File

@@ -1,5 +1,8 @@
#if NETSTANDARD
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using JetBrains.Annotations;
@@ -14,7 +17,7 @@ namespace WireMock.Owin
{
private readonly CancellationTokenSource _cts = new CancellationTokenSource();
private readonly WireMockMiddlewareOptions _options;
private readonly string[] _uriPrefixes;
private readonly string[] _urls;
private IWebHost _host;
@@ -38,7 +41,7 @@ namespace WireMock.Owin
}
_options = options;
_uriPrefixes = uriPrefixes;
_urls = uriPrefixes;
}
public Task StartAsync()
@@ -51,12 +54,38 @@ namespace WireMock.Owin
appBuilder.UseMiddleware<WireMockMiddleware>(_options);
_options.PostWireMockMiddlewareInit?.Invoke(appBuilder);
})
.UseKestrel()
.UseUrls(_uriPrefixes)
.UseKestrel(options =>
{
#if NETSTANDARD1_3
if (_urls.Any(u => u.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
{
options.UseHttps("self-signed-certificate.pfx");
}
#else
// https://docs.microsoft.com/en-us/aspnet/core/fundamentals/servers/kestrel?tabs=aspnetcore2x
foreach (string url in _urls.Where(u => u.StartsWith("http://", StringComparison.OrdinalIgnoreCase)))
{
PortUtil.TryExtractProtocolAndPort(url, out string host, out int port);
options.Listen(IPAddress.Loopback, port);
}
foreach (string url in _urls.Where(u => u.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
{
PortUtil.TryExtractProtocolAndPort(url, out string host, out int port);
options.Listen(IPAddress.Loopback, port, listenOptions =>
{
listenOptions.UseHttps("self-signed-certificate.pfx");
});
}
#endif
})
#if NETSTANDARD1_3
.UseUrls(_urls)
#endif
.Build();
#if NETSTANDARD1_3
System.Console.WriteLine("WireMock.Net server using netstandard1.3");
Console.WriteLine("WireMock.Net server using netstandard1.3");
return Task.Run(() =>
{
_host.Run(_cts.Token);
@@ -65,7 +94,11 @@ namespace WireMock.Owin
#else
System.Console.WriteLine("WireMock.Net server using netstandard2.0");
IsStarted = true;
return _host.RunAsync(_cts.Token);
return Task.Run(() =>
{
_host.Run();
IsStarted = true;
}, _cts.Token);
#endif
}