nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-07 05:58:13 -05:00
Code

Async GetEmbeddedCertificate

Browse Source
This commit is contained in:
Kyle Spearrin 2020-01-13 15:35:50 -05:00
parent 3f4a4bac2a
commit dda3c3a123
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Services/Implementations/LicensingService.cs
View File

@ -46,7 +46,8 @@ namespace Bit.Core.Services
"‎B34876439FCDA2846505B2EFBBA6C4A951313EBE"; "‎B34876439FCDA2846505B2EFBBA6C4A951313EBE";
if(_globalSettings.SelfHosted) if(_globalSettings.SelfHosted)
{ {
_certificate = CoreHelpers.GetEmbeddedCertificate("licensing.cer", null); _certificate = CoreHelpers.GetEmbeddedCertificateAsync("licensing.cer", null)
.GetAwaiter().GetResult();
} }
else if(CoreHelpers.SettingHasValue(_globalSettings.Storage?.ConnectionString) && else if(CoreHelpers.SettingHasValue(_globalSettings.Storage?.ConnectionString) &&
CoreHelpers.SettingHasValue(_globalSettings.LicenseCertificatePassword)) CoreHelpers.SettingHasValue(_globalSettings.LicenseCertificatePassword))

4
src/Core/Utilities/CoreHelpers.cs
View File

@ -169,13 +169,13 @@ namespace Bit.Core.Utilities
return new X509Certificate2(file, password); return new X509Certificate2(file, password);
} }
public static X509Certificate2 GetEmbeddedCertificate(string file, string password) public async static Task<X509Certificate2> GetEmbeddedCertificateAsync(string file, string password)
{ {
var assembly = typeof(CoreHelpers).GetTypeInfo().Assembly; var assembly = typeof(CoreHelpers).GetTypeInfo().Assembly;
using(var s = assembly.GetManifestResourceStream($"Bit.Core.{file}")) using(var s = assembly.GetManifestResourceStream($"Bit.Core.{file}"))
using(var ms = new MemoryStream()) using(var ms = new MemoryStream())
{ {
s.CopyTo(ms); await s.CopyToAsync(ms);
return new X509Certificate2(ms.ToArray(), password); return new X509Certificate2(ms.ToArray(), password);
} }
} }