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

Upgrade logging packages for .NET 8 (#3798)

Browse Source
This commit is contained in:
Alex Morask 2024-02-13 14:34:55 -05:00 committed by GitHub
parent accff663c5
commit 97018e2501
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Core/Core.csproj
View File

@ -44,13 +44,13 @@
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.25" /> <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.25" />
<PackageReference Include="Quartz" Version="3.4.0" /> <PackageReference Include="Quartz" Version="3.4.0" />
<PackageReference Include="SendGrid" Version="9.29.1" /> <PackageReference Include="SendGrid" Version="9.29.1" />
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" /> <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" /> <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
<PackageReference Include="Sentry.Serilog" Version="3.41.3" /> <PackageReference Include="Sentry.Serilog" Version="3.41.3" />
<PackageReference Include="Duende.IdentityServer" Version="6.3.7" /> <PackageReference Include="Duende.IdentityServer" Version="6.3.7" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog.Sinks.SyslogMessages" Version="2.0.9" /> <PackageReference Include="Serilog.Sinks.SyslogMessages" Version="3.0.1" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="Braintree" Version="5.23.0" /> <PackageReference Include="Braintree" Version="5.23.0" />
<PackageReference Include="Stripe.net" Version="43.7.0" /> <PackageReference Include="Stripe.net" Version="43.7.0" />

10
src/Core/Utilities/LoggerFactoryExtensions.cs
View File

@ -1,5 +1,4 @@
using System.Security.Authentication; using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates;
using Bit.Core.Settings; using Bit.Core.Settings;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
@ -91,20 +90,17 @@ public static class LoggerFactoryExtensions
} }
else if (syslogAddress.Scheme.Equals("tls")) else if (syslogAddress.Scheme.Equals("tls"))
{ {
// TLS v1.1, v1.2 and v1.3 are explicitly selected (leaving out TLS v1.0)
const SslProtocols protocols = SslProtocols.Tls11 | SslProtocols.Tls12 | SslProtocols.Tls13;
if (CoreHelpers.SettingHasValue(globalSettings.Syslog.CertificateThumbprint)) if (CoreHelpers.SettingHasValue(globalSettings.Syslog.CertificateThumbprint))
{ {
config.WriteTo.TcpSyslog(syslogAddress.Host, port, appName, config.WriteTo.TcpSyslog(syslogAddress.Host, port, appName,
secureProtocols: protocols, useTls: true,
certProvider: new CertificateStoreProvider(StoreName.My, StoreLocation.CurrentUser, certProvider: new CertificateStoreProvider(StoreName.My, StoreLocation.CurrentUser,
globalSettings.Syslog.CertificateThumbprint)); globalSettings.Syslog.CertificateThumbprint));
} }
else else
{ {
config.WriteTo.TcpSyslog(syslogAddress.Host, port, appName, config.WriteTo.TcpSyslog(syslogAddress.Host, port, appName,
secureProtocols: protocols, useTls: true,
certProvider: new CertificateFileProvider(globalSettings.Syslog.CertificatePath, certProvider: new CertificateFileProvider(globalSettings.Syslog.CertificatePath,
globalSettings.Syslog?.CertificatePassword ?? string.Empty)); globalSettings.Syslog?.CertificatePassword ?? string.Empty));
} }

2
util/Migrator/Migrator.csproj
View File

@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="dbup-sqlserver" Version="5.0.40" /> <PackageReference Include="dbup-sqlserver" Version="5.0.40" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
util/MsSqlMigratorUtility/MsSqlMigratorUtility.csproj
View File

@ -11,8 +11,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="CommandDotNet" Version="7.0.2" /> <PackageReference Include="CommandDotNet" Version="7.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
util/Setup/Setup.csproj
View File

@ -11,7 +11,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Handlebars.Net" Version="2.1.4" /> <PackageReference Include="Handlebars.Net" Version="2.1.4" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="YamlDotNet" Version="11.2.1" /> <PackageReference Include="YamlDotNet" Version="11.2.1" />
</ItemGroup> </ItemGroup>