Skip to content

Commit 0bc23a4

Browse files
committed
SkipValidation -> IsTestMock
1 parent 45b51d7 commit 0bc23a4

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

src/Servers/Kestrel/Core/src/Internal/Certificates/CertificateConfigLoader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public CertificateConfigLoader(IHostEnvironment hostEnvironment, ILogger<Kestrel
2323
public IHostEnvironment HostEnvironment { get; }
2424
public ILogger<KestrelServer> Logger { get; }
2525

26-
public bool SkipValidation => false;
26+
public bool IsTestMock => false;
2727

2828
public X509Certificate2 LoadCertificate(CertificateConfig certInfo, string endpointName)
2929
{

src/Servers/Kestrel/Core/src/Internal/Certificates/ICertificateConfigLoader.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Certificates
77
{
88
internal interface ICertificateConfigLoader
99
{
10-
// SkipValidation is only true in tests.
11-
bool SkipValidation { get; }
10+
bool IsTestMock { get; }
1211

1312
X509Certificate2 LoadCertificate(CertificateConfig certInfo, string endpointName);
1413
}

src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ public SniOptionsSelector(
6868
}
6969
}
7070

71-
// SkipValidation is only true in tests.
72-
if (!certifcateConfigLoader.SkipValidation && sslOptions.ServerCertificate is X509Certificate2 cert2)
71+
if (!certifcateConfigLoader.IsTestMock && sslOptions.ServerCertificate is X509Certificate2 cert2)
7372
{
7473
HttpsConnectionMiddleware.EnsureCertificateIsAllowedForServerAuth(cert2);
7574
}

src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ private class MockCertificateConfigLoader : ICertificateConfigLoader
743743
{
744744
public Dictionary<object, string> CertToPathDictionary { get; } = new Dictionary<object, string>(ReferenceEqualityComparer.Instance);
745745

746-
public bool SkipValidation => true;
746+
public bool IsTestMock => true;
747747

748748
public X509Certificate2 LoadCertificate(CertificateConfig certInfo, string endpointName)
749749
{

0 commit comments

Comments
 (0)