Browse Source

[PM-5619] Revert VaultSharp version update to fix HashiCorp cert errors (#111)

pull/114/head
Todd Martin 2 years ago committed by GitHub
parent
commit
facc13d6c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      src/KeyConnector/KeyConnector.csproj
  2. 9
      src/KeyConnector/Services/HashicorpVaultCertificateProviderService.cs

2
src/KeyConnector/KeyConnector.csproj

@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1"/>
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1"/>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
<PackageReference Include="VaultSharp" Version="1.13.0.1"/>
<PackageReference Include="VaultSharp" Version="1.7.0"/>
</ItemGroup>
</Project>

9
src/KeyConnector/Services/HashicorpVaultCertificateProviderService.cs

@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
using System;
using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using VaultSharp;
using VaultSharp.V1.AuthMethods.Token;
@ -9,10 +10,12 @@ namespace Bit.KeyConnector.Services @@ -9,10 +10,12 @@ namespace Bit.KeyConnector.Services
public class HashicorpVaultCertificateProviderService : ICertificateProviderService
{
private readonly KeyConnectorSettings _settings;
private readonly ILogger<HashicorpVaultCertificateProviderService> _logger;
public HashicorpVaultCertificateProviderService(KeyConnectorSettings settings)
public HashicorpVaultCertificateProviderService(KeyConnectorSettings settings, ILogger<HashicorpVaultCertificateProviderService> logger)
{
_settings = settings;
_logger = logger;
}
public async Task<X509Certificate2> GetCertificateAsync()
@ -33,6 +36,10 @@ namespace Bit.KeyConnector.Services @@ -33,6 +36,10 @@ namespace Bit.KeyConnector.Services
return new X509Certificate2(Convert.FromBase64String(certData),
_settings.Certificate.VaultSecretFilePassword);
}
else
{
_logger.LogError("No secret found in Hashicorp Vault with key {key}", _settings.Certificate.VaultSecretDataKey);
}
return null;
}

Loading…
Cancel
Save