Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WinHttpHandler: HttpClientHandlerTestBase.AllowAllCertificates should not be static #48817

Merged
merged 3 commits into from
Mar 2, 2021
Merged

WinHttpHandler: HttpClientHandlerTestBase.AllowAllCertificates should not be static #48817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29969b4
HttpClientHandlerTestBase.AllowAllCertificates should not be static
antonfirsov Feb 26, 2021
0332b0e
revert previous attempt
antonfirsov Feb 26, 2021
05b85ab
AllowAllCertificates: use parameter instead of static property
antonfirsov Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ServerCertificates.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ public abstract partial class HttpClientHandler_ServerCertificates_Test : HttpCl

public HttpClientHandler_ServerCertificates_Test(ITestOutputHelper output) : base(output) { }

// This enables customizing ServerCertificateCustomValidationCallback in WinHttpHandler variants:
protected bool AllowAllHttp2Certificates { get; set; } = true;
protected new HttpClientHandler CreateHttpClientHandler() => CreateHttpClientHandler(UseVersion, allowAllHttp2Certificates: AllowAllHttp2Certificates);

[Fact]
public void Ctor_ExpectedDefaultValues()
{
Expand Down Expand Up @@ -451,15 +455,19 @@ public void HttpClientUsesSslCertEnvironmentVariables()
File.WriteAllText(sslCertFile, "");
psi.Environment.Add("SSL_CERT_FILE", sslCertFile);

RemoteExecutor.Invoke(async (useVersionString) =>
RemoteExecutor.Invoke(async (useVersionString, allowAllHttp2CertificatesString) =>
{
const string Url = "https://www.microsoft.com";

using (HttpClient client = CreateHttpClient(useVersionString))
HttpClientHandler handler = CreateHttpClientHandler(
Version.Parse(useVersionString),
allowAllHttp2Certificates: bool.Parse(allowAllHttp2CertificatesString));

using (HttpClient client = CreateHttpClient(handler, useVersionString))
{
await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync(Url));
}
}, UseVersion.ToString(), new RemoteInvokeOptions { StartInfo = psi }).Dispose();
}, UseVersion.ToString(), AllowAllHttp2Certificates.ToString(), new RemoteInvokeOptions { StartInfo = psi }).Dispose();
}
}
}
6 changes: 2 additions & 4 deletions ...Net.Http.WinHttpHandler/tests/FunctionalTests/HttpClientHandlerTestBase.WinHttpHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ public abstract partial class HttpClientHandlerTestBase : FileCleanupTestBase
{
protected static bool IsWinHttpHandler => true;

protected static bool AllowAllCertificates { get; set; } = true;

protected static WinHttpClientHandler CreateHttpClientHandler(Version useVersion = null)
protected static WinHttpClientHandler CreateHttpClientHandler(Version useVersion = null, bool allowAllHttp2Certificates = true)
{
useVersion ??= HttpVersion.Version11;

WinHttpClientHandler handler = new WinHttpClientHandler(useVersion);

if (useVersion >= HttpVersion20.Value && AllowAllCertificates)
if (useVersion >= HttpVersion20.Value && allowAllHttp2Certificates)
{
handler.ServerCertificateCustomValidationCallback = TestHelper.AllowAllCertificates;
}
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/PlatformHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public sealed class PlatformHandler_HttpClientHandler_ServerCertificates_Http2_T
protected override Version UseVersion => HttpVersion20.Value;

public PlatformHandler_HttpClientHandler_ServerCertificates_Http2_Test(ITestOutputHelper output) : base(output) {
AllowAllCertificates = false;
AllowAllHttp2Certificates = false;
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...ies/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.SocketsHttpHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ public abstract partial class HttpClientHandlerTestBase : FileCleanupTestBase

public static bool IsMsQuicSupported => QuicImplementationProviders.MsQuic.IsSupported;

protected static HttpClientHandler CreateHttpClientHandler(Version useVersion = null, QuicImplementationProvider quicImplementationProvider = null)
protected static HttpClientHandler CreateHttpClientHandler(Version useVersion = null, QuicImplementationProvider quicImplementationProvider = null, bool allowAllHttp2Certificates = true)
{
useVersion ??= HttpVersion.Version11;

HttpClientHandler handler = (PlatformDetection.SupportsAlpn && useVersion != HttpVersion.Version30) ? new HttpClientHandler() : new VersionHttpClientHandler(useVersion);

if (useVersion >= HttpVersion.Version20)
if (useVersion >= HttpVersion.Version20 && allowAllHttp2Certificates)
{
handler.ServerCertificateCustomValidationCallback = TestHelper.AllowAllCertificates;
}
Expand Down