Skip to content

Revert cert manager to make sure it reads from both store #351

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
yangpanMS merged 2 commits into from
Jul 30, 2024
Merged

Revert cert manager to make sure it reads from both store #351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00b1442
Revert cert manager to make sure it reads from both store
yangpanMS Jul 29, 2024
0585a5a
Merge branch 'main' into users/yanpan/certmanager-rollback
yangpanMS Jul 30, 2024
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
22 changes: 14 additions & 8 deletions src/VirtualClient/VirtualClient.Core/Identity/CertificateManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ public async Task<X509Certificate2> GetCertificateFromStoreAsync(string thumbpri
}

X509Certificate2 result = null;

string errorMessage = $"Certificate not found. A certificate for user '{Environment.UserName}' with matching thumbprint '{thumbprint}' " +
$"was not found in any one of the following expected certificate stores: ";
foreach (StoreLocation storeLocation in storeLocations)
{
try
Expand All @@ -66,6 +67,10 @@ public async Task<X509Certificate2> GetCertificateFromStoreAsync(string thumbpri
// Certificate access permissions issue
throw;
}
catch (Exception exc)
{
errorMessage = errorMessage + $"Message from location '{storeLocation.ToString()}': {exc.Message}.";
}

if (result != null)
{
Expand All @@ -75,9 +80,7 @@ public async Task<X509Certificate2> GetCertificateFromStoreAsync(string thumbpri

if (result == null)
{
throw new CryptographicException(
$"Certificate not found. A certificate for user '{Environment.UserName}' with matching thumbprint '{thumbprint}' was not found in any one of the following expected certificate stores: " +
$"{string.Join(", ", storeLocations.Select(loc => $"{loc}/{storeName}"))}");
throw new CryptographicException(errorMessage);
}

return result;
Expand All @@ -95,7 +98,8 @@ public async Task<X509Certificate2> GetCertificateFromStoreAsync(string issuer,
}

X509Certificate2 result = null;

string errorMessage = $"Certificate not found. A certificate for user '{Environment.UserName}' with matching issuer '{issuer}' and subject '{subject}' " +
$"was not found in any one of the following expected certificate stores: ";
foreach (StoreLocation storeLocation in storeLocations)
{
try
Expand All @@ -115,6 +119,10 @@ public async Task<X509Certificate2> GetCertificateFromStoreAsync(string issuer,
// Certificate access permissions issue
throw;
}
catch (Exception exc)
{
errorMessage = errorMessage + $"Message from location '{storeLocation.ToString()}': {exc.Message}.";
}

if (result != null)
{
Expand All @@ -124,9 +132,7 @@ public async Task<X509Certificate2> GetCertificateFromStoreAsync(string issuer,

if (result == null)
{
throw new CryptographicException(
$"Certificate not found. A certificate for user '{Environment.UserName}' with matching issuer '{issuer}' and subject '{subject}' was not found in any one of the following expected certificate stores: " +
$"{string.Join(", ", storeLocations.Select(loc => $"{loc}/{storeName}"))}");
throw new CryptographicException(errorMessage);
}

return result;
Expand Down