Skip to content

enable SslStream_ClientCertificate_SendsChain test on macOS #48209

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

Closed
wants to merge 5 commits into from
Closed

enable SslStream_ClientCertificate_SendsChain test on macOS #48209

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
783660f
increase timeout on WebRequest timeout test
wfurt Nov 12, 2020
0703dbc
Merge branch 'master' of https://github.com/dotnet/runtime
wfurt Nov 18, 2020
bff1a54
Merge branch 'master' of https://github.com/dotnet/runtime
wfurt Jan 22, 2021
78fc0f8
Merge branch 'master' of https://github.com/dotnet/runtime
wfurt Feb 12, 2021
8df5253
enable SslStream_ClientCertificate_SendsChain on macOS
wfurt Feb 12, 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
3 changes: 1 addition & 2 deletions src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,13 +350,12 @@ public async Task SslStream_UntrustedCaWithCustomCallback_Throws(bool customCall
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/46837", TestPlatforms.OSX)]
public async Task SslStream_ClientCertificate_SendsChain()
{
List<SslStream> streams = new List<SslStream>();
TestHelper.CleanupCertificates("SslStream_ClinetCertificate_SendsChain");
(X509Certificate2 clientCertificate, X509Certificate2Collection clientChain) = TestHelper.GenerateCertificates("SslStream_ClinetCertificate_SendsChain", serverCertificate: false);
using (X509Store store = new X509Store(StoreName.CertificateAuthority, StoreLocation.CurrentUser))
using (X509Store store = new X509Store(PlatformDetection.IsOSXLike ? StoreName.My : StoreName.CertificateAuthority, StoreLocation.CurrentUser))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a comment explaining why OSX is different?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok. I will. It is primarily #48207 but there still seems to be another trickery in CI. I'm looking into it and I'll hold this back until clean CI pass.

{
// add chain certificate so we can construct chain since there is no way how to pass intermediates directly.
store.Open(OpenFlags.ReadWrite);
Expand Down
30 changes: 11 additions & 19 deletions src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,38 +83,30 @@ internal static (NetworkStream ClientStream, NetworkStream ServerStream) GetConn

internal static void CleanupCertificates(string testName)
{
string caName = $"O={testName}";
try
{
using (X509Store store = new X509Store(StoreName.CertificateAuthority, StoreLocation.LocalMachine))
string name = $"O={testName}";
X509Store[] stores = new X509Store[]
{
store.Open(OpenFlags.ReadWrite);
foreach (X509Certificate2 cert in store.Certificates)
{
if (cert.Subject.Contains(caName))
{
store.Remove(cert);
}
}
}
}
catch { };
new X509Store(StoreName.CertificateAuthority, StoreLocation.LocalMachine),
new X509Store(StoreName.CertificateAuthority, StoreLocation.CurrentUser),
new X509Store(StoreName.My, StoreLocation.CurrentUser)
};

try
foreach (X509Store store in stores)
{
using (X509Store store = new X509Store(StoreName.CertificateAuthority, StoreLocation.CurrentUser))
try
{
store.Open(OpenFlags.ReadWrite);
foreach (X509Certificate2 cert in store.Certificates)
{
if (cert.Subject.Contains(caName))
if (cert.Subject.Contains(name))
{
store.Remove(cert);
}
}
}
catch { };
store.Dispose();
}
catch { };
}

internal static (X509Certificate2 certificate, X509Certificate2Collection) GenerateCertificates(string targetName, [CallerMemberName] string? testName = null, bool longChain = false, bool serverCertificate = true)
Expand Down