Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
{
// Get CohortManager private key
logger.LogInformation("Pulling Mesh Certificate from KeyVault");
var certClient = new CertificateClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new DefaultAzureCredential());
var certClient = new CertificateClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new ManagedIdentityCredential ());
var certificate = await certClient.DownloadCertificateAsync(config.MeshKeyName);
cohortManagerPrivateKey = certificate.Value;

// Get MESH public certificates (CA chain)
var secretClient = new SecretClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new DefaultAzureCredential());
var secretClient = new SecretClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new ManagedIdentityCredential ());
string base64Cert = (await secretClient.GetSecretAsync(config.MeshCertName)).Value.Value;
meshCerts = CertificateHelper.GetCertificatesFromString(base64Cert);
}
Expand Down Expand Up @@ -82,4 +82,3 @@
logger.LogCritical(ex, "Failed to start up Function");
}


Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
{
// Get CohortManager private key
logger.LogInformation("Pulling Mesh Certificate from KeyVault");
var certClient = new CertificateClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new DefaultAzureCredential());
var certClient = new CertificateClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new ManagedIdentityCredential ());
var certificate = await certClient.DownloadCertificateAsync(config.NemsMeshKeyName);
cohortManagerPrivateKey = certificate.Value;

// Get MESH public certificates (CA chain)
var secretClient = new SecretClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new DefaultAzureCredential());
var secretClient = new SecretClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new ManagedIdentityCredential ());
string base64Cert = (await secretClient.GetSecretAsync(config.NemsMeshCertName)).Value.Value;
meshCerts = CertificateHelper.GetCertificatesFromString(base64Cert);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static IHostBuilder AddServiceBusClient(this IHostBuilder hostBuilder, st
else
{
builder.AddServiceBusClientWithNamespace(serviceBusConnectionString)
.WithCredential(new DefaultAzureCredential());
.WithCredential(new ManagedIdentityCredential ());
}
});
_.AddSingleton<IQueueClient, AzureServiceBusClient>();
Expand Down Expand Up @@ -68,7 +68,7 @@ public static IHostBuilder AddKeyedAzureQueues(this IHostBuilder hostBuilder, bo
else
{
builder.AddServiceBusClientWithNamespace(serviceBusConnectionString)
.WithCredential(new DefaultAzureCredential());
.WithCredential(new ManagedIdentityCredential ());
}
});
_.AddKeyedSingleton<IQueueClient, AzureServiceBusClient>(keyName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ private static IConfiguration CreateConfiguration(string? keyVaultUrl = null, Li
if(keyVaultUrl != null){
try
{
configBuilder.AddAzureKeyVault(new Uri(keyVaultUrl), new DefaultAzureCredential(), new AzureKeyVaultConfigurationOptions());
configBuilder.AddAzureKeyVault(new Uri(keyVaultUrl), new ManagedIdentityCredential (), new AzureKeyVaultConfigurationOptions());
}
catch (Exception ex)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public static IHostBuilder AddJwtTokenSigning(this IHostBuilder hostBuilder, boo
JwtPrivateKey jwtPrivateKey;
try
{
// Azure
// Azure
hostBuilder.AddConfiguration<JwtTokenServiceConfig>(out JwtTokenServiceConfig config);
if (!string.IsNullOrEmpty(config.KeyVaultConnectionString))
{
var certClient = new CertificateClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new DefaultAzureCredential());
var certClient = new CertificateClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new ManagedIdentityCredential ());
Response<X509Certificate2> certResponse = certClient.DownloadCertificate(config.KeyNamePrivateKey);

logger.LogInformation("got certificate from key vault");
Expand Down
Loading