Skip to content

Make SNI unique in TLS test #47459

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

Merged
aik-jahoda merged 5 commits into from
Jan 28, 2021
Merged

Make SNI unique in TLS test #47459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
318e741
Randomize SNI
Jan 26, 2021
b053bb4
remove debug message
Jan 26, 2021
aacabe1
Fix the http test
Jan 27, 2021
c0b2497
Add explanation comment
Jan 27, 2021
e3b0fbd
Remove accidental indentation
Jan 28, 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.SslProtocols.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static IEnumerable<object[]> GetAsync_AllowedSSLVersion_Succeeds_MemberDa
{
yield return new object[] { protocol, true };
#pragma warning disable 0618 // SSL2/3 are deprecated
// On certain platforms these are completely disabled and cannot be used at all.
// On certain platforms these are completely disabled and cannot be used at all.
if (protocol != SslProtocols.Ssl2 && protocol != SslProtocols.Ssl3)
{
yield return new object[] { protocol, false };
Expand Down Expand Up @@ -126,16 +126,24 @@ public async Task GetAsync_AllowedSSLVersion_Succeeds(SslProtocols acceptedProto
#pragma warning restore 0618
}

// Use a different SNI for each connection to prevent TLS 1.3 renegotiation issue: https://github.com/dotnet/runtime/issues/47378
client.DefaultRequestHeaders.Host = getTestSNIName();

var options = new LoopbackServer.Options { UseSsl = true, SslProtocols = acceptedProtocol };
await LoopbackServer.CreateServerAsync(async (server, url) =>
{
await TestHelper.WhenAllCompletedOrAnyFailed(
server.AcceptConnectionSendResponseAndCloseAsync(),
client.GetAsync(url));
server.AcceptConnectionSendResponseAndCloseAsync(),
client.GetAsync(url));
}, options);

Assert.Equal(1, count);
}

string getTestSNIName()
{
return $"{nameof(GetAsync_AllowedSSLVersion_Succeeds)}_{acceptedProtocol}_{requestOnlyThisProtocol}";
}
}

public static IEnumerable<object[]> SupportedSSLVersionServers()
Expand Down
14 changes: 13 additions & 1 deletion src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ public async Task ClientAndServer_OneOrBothUseDefault_Ok(SslProtocols? clientPro
using (X509Certificate2 serverCertificate = Configuration.Certificates.GetServerCertificate())
using (X509Certificate2 clientCertificate = Configuration.Certificates.GetClientCertificate())
{
string serverHost = serverCertificate.GetNameInfo(X509NameType.SimpleName, false);
// Use a different SNI for each connection to prevent TLS 1.3 renegotiation issue: https://github.com/dotnet/runtime/issues/47378
string serverHost = getTestSNIName();
var clientCertificates = new X509CertificateCollection() { clientCertificate };

await TestConfiguration.WhenAllOrAnyFailedWithTimeout(
Expand All @@ -99,6 +100,16 @@ await TestConfiguration.WhenAllOrAnyFailedWithTimeout(
_clientStream.SslProtocol + " " + _clientStream.HashAlgorithm);
}
}

string getTestSNIName()
{
static string ProtocolToString(SslProtocols? protocol)
{
return (protocol?.ToString() ?? "null").Replace(", ", "_");
}

return $"{nameof(ClientAndServer_OneOrBothUseDefault_Ok)}_{ProtocolToString(clientProtocols)}_{ProtocolToString(serverProtocols)}";
}
}

[ConditionalTheory(nameof(IsNotWindows7))]
Expand Down Expand Up @@ -130,6 +141,7 @@ private bool ClientCertCallback(object sender, X509Certificate certificate, X509
case SslPolicyErrors.None:
case SslPolicyErrors.RemoteCertificateChainErrors:
case SslPolicyErrors.RemoteCertificateNameMismatch:
case SslPolicyErrors.RemoteCertificateChainErrors | SslPolicyErrors.RemoteCertificateNameMismatch:
return true;
case SslPolicyErrors.RemoteCertificateNotAvailable:
default:
Expand Down