Skip to content

Commit d9dd817

Browse files
authored
Add long-term certificate for unit/functional testing. Note that this certificate is only valid for unit/functional testing. (#614)
1 parent d6485ee commit d9dd817

3 files changed

Lines changed: 11 additions & 13 deletions

File tree

src/VirtualClient/VirtualClient.Core.UnitTests/Identity/CertificateManagerTest.cs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ namespace VirtualClient.Identity
55
{
66
using System;
77
using System.Collections.Generic;
8-
using System.IO.Abstractions;
98
using System.Linq;
109
using System.Security.Cryptography;
1110
using System.Security.Cryptography.X509Certificates;
12-
using System.Threading;
1311
using System.Threading.Tasks;
1412
using AutoFixture;
1513
using Moq;
@@ -35,7 +33,7 @@ public void InitializeTest()
3533
[Test]
3634
[TestCase("AME")]
3735
[TestCase("GBL")]
38-
[TestCase("AME Infra CA 0")]
36+
[TestCase("AME Infra Test CA 7")]
3937
[TestCase("DC=AME")]
4038
[TestCase("DC=GBL")]
4139
[TestCase("CN=AME")]
@@ -47,15 +45,15 @@ public void CertificateManagerSearchesSupportsARangeOfFormatsForIssuersOnCertifi
4745

4846
[Test]
4947
[TestCase("ABC")]
50-
[TestCase("AME Infra CA 06")]
48+
[TestCase("AME Infra Test CA 06")]
5149
[TestCase("DC=ABC")]
5250
[TestCase("DC=GBB")]
53-
[TestCase("DC=AME Infra CA 06")]
51+
[TestCase("DC=Infra Test CA 777")]
5452
[TestCase("CN=ABC")]
55-
[TestCase("CN=AME Infra CA 06")]
56-
[TestCase("CN=ABC Infra CA 01, DC=AME, DC=GBL")]
57-
[TestCase("CN=AME Infra CA 06, DC=ABC, DC=GBL")]
58-
[TestCase("CN=AME Infra CA 06, DC=AME, DC=GBB")]
53+
[TestCase("CN=AME Infra Test CA 06")]
54+
[TestCase("CN=ABC Infra Test CA 777, DC=AME, DC=GBL")]
55+
[TestCase("CN=AME Infra Test CA 777, DC=ABC, DC=GBL")]
56+
[TestCase("CN=AME Infra Test CA 777, DC=AME, DC=GBB")]
5957
public void CertificateManagerDoesNotMismatchIssuersOnCertificates(string issuer)
6058
{
6159
X509Certificate2 certificate = this.mockFixture.Create<X509Certificate2>();
@@ -144,7 +142,7 @@ public async Task CertificateManagerSearchesTheExpectedDirectoryForCertificates(
144142
[Test]
145143
[TestCase("AME", "virtualclient.test.corp.azure.com")]
146144
[TestCase("GBL", "virtualclient.test.corp.azure.com")]
147-
[TestCase("AME Infra CA 0", "virtualclient")]
145+
[TestCase("AME Infra Test CA 7", "virtualclient")]
148146
[TestCase("DC=AME", "corp.azure.com")]
149147
[TestCase("DC=GBL", "azure.com")]
150148
[TestCase("CN=AME", "virtualclient.test.corp.azure.com")]
@@ -154,7 +152,7 @@ public async Task CertificateManagerHandlesDifferentIssuerAndSubjectNameFormats(
154152
this.testCertificateManager = new TestCertificateManager(this.mockFixture);
155153

156154
string expectedDirectory = string.Format(CertificateManager.DefaultUnixCertificateDirectory, Environment.UserName.ToLowerInvariant());
157-
string expectedCertificateFile = this.mockFixture.Combine(expectedDirectory, "C3F4A77CAD588341B8D62EE4DA02D85E8F100EFA");
155+
string expectedCertificateFile = this.mockFixture.Combine(expectedDirectory, "6E68322DBFF09EEB4CDB00AE94E00EF2037653EF");
158156
bool confirmedDir = false;
159157
bool confirmedFile = false;
160158

src/VirtualClient/VirtualClient.TestExtensions/AutoFixtureExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static X509Certificate2 CreateCertificate(this Fixture fixture, bool with
5656
{
5757
certificate = X509CertificateLoader.LoadPkcs12(
5858
File.ReadAllBytes(Path.Combine(resourcesDirectory, "test-certificate.private")),
59-
null,
59+
"CRC",
6060
X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
6161
}
6262
else
@@ -69,7 +69,7 @@ public static X509Certificate2 CreateCertificate(this Fixture fixture, bool with
6969
{
7070
certificate = new X509Certificate2(
7171
File.ReadAllBytes(Path.Combine(resourcesDirectory, "test-certificate.private")),
72-
string.Empty,
72+
"CRC",
7373
X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
7474
}
7575
else
Binary file not shown.

0 commit comments

Comments
 (0)