[PS-40] Upgrade to .NET 6 (#2056)

* Bump to .NET 6 * Update Docker images * Update docs * Update workflow for linter * Add all common versions to props file * Update tools manifest * Update csproj files * Update packages.lock.json files * Switch to setup-dotnet * Remove msbuild * Fix deps breaking changes * Manually install msbuild * Use msbuild for build * Fix verbosity switch * Remove unused exceptions * Address linter feedback * Make Obsolete warnings suggestions for now. * Force Evaluate * Format on tests * Run formatting again. * Use windows 2022 * force evaluate * Fix restore * Fix linter * Skip test * Update Directory.Build.props Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Address PR feedback * Add IntegationTest for Rate limiter * Fix test * Reenable test * Reorder test * Skip test again * Add tracking link * Update .github/workflows/build.yml Co-authored-by: Micaiah Martin <77340197+mimartin12@users.noreply.github.com> Co-authored-by: Matt Gibson <mgibson@bitwarden.com> Co-authored-by: Micaiah Martin <77340197+mimartin12@users.noreply.github.com>
2025-12-25 20:53:16 +00:00 · 2022-06-24 10:39:34 -04:00
parent b8d41b47f1
commit daeaa42851
95 changed files with 15042 additions and 32574 deletions
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -20,37 +20,36 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="AWSSDK.SimpleEmail" Version="3.3.101.182" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.3.103.15" />
+    <PackageReference Include="AWSSDK.SimpleEmail" Version="3.7.0.150" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.7.2.47" />
    <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.3.2" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.11.0" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.9.0" />
    <PackageReference Include="BitPay.Light" Version="1.0.1907" />
    <PackageReference Include="Fido2.AspNet" Version="3.0.0-beta2" />
-    <PackageReference Include="Handlebars.Net" Version="1.10.1" />
+    <PackageReference Include="Handlebars.Net" Version="2.1.2" />
    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="MailKit" Version="2.8.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
-    <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.7" />
-    <PackageReference Include="Microsoft.Azure.NotificationHubs" Version="3.3.0" />
-    <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.9" />
-    <PackageReference Include="Quartz" Version="3.1.0" />
-    <PackageReference Include="SendGrid" Version="9.25.3" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
+    <PackageReference Include="MailKit" Version="3.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
+    <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
+    <PackageReference Include="Microsoft.Azure.NotificationHubs" Version="4.1.0" />
+    <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.4" />
+    <PackageReference Include="Quartz" Version="3.4.0" />
+    <PackageReference Include="SendGrid" Version="9.27.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
    <PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
-    <PackageReference Include="Sentry.Serilog" Version="2.1.5" />
-    <PackageReference Include="IdentityServer4" Version="4.0.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Serilog.Sinks.AzureCosmosDB" Version="1.0.0" />
-    <PackageReference Include="Serilog.Sinks.SyslogMessages" Version="1.0.5" />
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
-    <PackageReference Include="AspNetCoreRateLimit" Version="2.1.0" />
-    <PackageReference Include="Braintree" Version="4.18.0" />
-    <PackageReference Include="Stripe.net" Version="37.26.0" />
+    <PackageReference Include="Sentry.Serilog" Version="3.16.0" />
+    <PackageReference Include="IdentityServer4" Version="4.1.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Serilog.Sinks.AzureCosmosDB" Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.SyslogMessages" Version="2.0.6" />
+    <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
+    <PackageReference Include="Braintree" Version="5.12.0" />
+    <PackageReference Include="Stripe.net" Version="39.107.0" />
    <PackageReference Include="Otp.NET" Version="1.2.2" />
    <PackageReference Include="YubicoDotNetClient" Version="1.2.0" />
    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
--- a/src/Core/Services/Implementations/AzureAttachmentStorageService.cs
+++ b/src/Core/Services/Implementations/AzureAttachmentStorageService.cs
@@ -9,6 +9,7 @@ using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Settings;
+using Microsoft.Extensions.Logging;

 namespace Bit.Core.Services
 {
@@ -21,6 +22,8 @@ namespace Bit.Core.Services
        private static readonly TimeSpan blobLinkLiveTime = TimeSpan.FromMinutes(1);
        private readonly BlobServiceClient _blobServiceClient;
        private readonly Dictionary<string, BlobContainerClient> _attachmentContainers = new Dictionary<string, BlobContainerClient>();
+        private readonly ILogger<AzureAttachmentStorageService> _logger;
+
        private string BlobName(Guid cipherId, CipherAttachment.MetaData attachmentData, Guid? organizationId = null, bool temp = false) =>
            string.Concat(
                temp ? "temp/" : "",
@@ -53,9 +56,11 @@ namespace Bit.Core.Services
        }

        public AzureAttachmentStorageService(
-            GlobalSettings globalSettings)
+            GlobalSettings globalSettings,
+            ILogger<AzureAttachmentStorageService> logger)
        {
            _blobServiceClient = new BlobServiceClient(globalSettings.Attachment.ConnectionString);
+            _logger = logger;
        }

        public async Task<string> GetAttachmentDownloadUrlAsync(Cipher cipher, CipherAttachment.MetaData attachmentData)
@@ -226,6 +231,7 @@ namespace Bit.Core.Services
            }
            catch (Exception ex)
            {
+                _logger.LogError(ex, "Unhandled error in ValidateFileAsync");
                return (false, null);
            }
        }
--- a/src/Core/Services/Implementations/AzureSendFileStorageService.cs
+++ b/src/Core/Services/Implementations/AzureSendFileStorageService.cs
@@ -8,6 +8,7 @@ using Azure.Storage.Sas;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Settings;
+using Microsoft.Extensions.Logging;

 namespace Bit.Core.Services
 {
@@ -16,6 +17,7 @@ namespace Bit.Core.Services
        public const string FilesContainerName = "sendfiles";
        private static readonly TimeSpan _downloadLinkLiveTime = TimeSpan.FromMinutes(1);
        private readonly BlobServiceClient _blobServiceClient;
+        private readonly ILogger<AzureSendFileStorageService> _logger;
        private BlobContainerClient _sendFilesContainerClient;

        public FileUploadType FileUploadType => FileUploadType.Azure;
@@ -24,9 +26,11 @@ namespace Bit.Core.Services
        public static string BlobName(Send send, string fileId) => $"{send.Id}/{fileId}";

        public AzureSendFileStorageService(
-            GlobalSettings globalSettings)
+            GlobalSettings globalSettings,
+            ILogger<AzureSendFileStorageService> logger)
        {
            _blobServiceClient = new BlobServiceClient(globalSettings.Send.ConnectionString);
+            _logger = logger;
        }

        public async Task UploadNewFileAsync(Stream stream, Send send, string fileId)
@@ -125,6 +129,7 @@ namespace Bit.Core.Services
            }
            catch (Exception ex)
            {
+                _logger.LogError(ex, "Unhandled error in ValidateFileAsync");
                return (false, null);
            }
        }
--- a/src/Core/Services/Implementations/HandlebarsMailService.cs
+++ b/src/Core/Services/Implementations/HandlebarsMailService.cs
@@ -25,8 +25,8 @@ namespace Bit.Core.Services
        private readonly GlobalSettings _globalSettings;
        private readonly IMailDeliveryService _mailDeliveryService;
        private readonly IMailEnqueuingService _mailEnqueuingService;
-        private readonly Dictionary<string, Func<object, string>> _templateCache =
-            new Dictionary<string, Func<object, string>>();
+        private readonly Dictionary<string, HandlebarsTemplate<object, object>> _templateCache =
+            new Dictionary<string, HandlebarsTemplate<object, object>>();

        private bool _registeredHelpersAndPartials = false;

--- a/src/Core/Services/Implementations/OrganizationService.cs
+++ b/src/Core/Services/Implementations/OrganizationService.cs
@@ -851,7 +851,7 @@ namespace Bit.Core.Services
                if (userCount > license.Seats.Value)
                {
                    throw new BadRequestException($"Your organization currently has {userCount} seats filled. " +
-                        $"Your new license only has ({ license.Seats.Value}) seats. Remove some users.");
+                        $"Your new license only has ({license.Seats.Value}) seats. Remove some users.");
                }
            }

--- a/src/Core/Services/Implementations/StripePaymentService.cs
+++ b/src/Core/Services/Implementations/StripePaymentService.cs
@@ -161,8 +161,9 @@ namespace Bit.Core.Services
                    }
                }
            }
-            catch (Exception e)
+            catch (Exception ex)
            {
+                _logger.LogError(ex, "Error creating customer, walking back operation.");
                if (customer != null)
                {
                    await _stripeAdapter.CustomerDeleteAsync(customer.Id);
--- a/src/Core/Utilities/CustomIpRateLimitMiddleware.cs
+++ b/src/Core/Utilities/CustomIpRateLimitMiddleware.cs
@@ -21,12 +21,12 @@ namespace Bit.Core.Utilities
            IMemoryCache memoryCache,
            IBlockIpService blockIpService,
            RequestDelegate next,
+            IProcessingStrategy processingStrategy,
+            IRateLimitConfiguration rateLimitConfiguration,
            IOptions<IpRateLimitOptions> options,
-            IRateLimitCounterStore counterStore,
            IIpPolicyStore policyStore,
-            ILogger<CustomIpRateLimitMiddleware> logger,
-            IIpAddressParser ipParser = null)
-            : base(next, options, counterStore, policyStore, logger, ipParser)
+            ILogger<CustomIpRateLimitMiddleware> logger)
+            : base(next, processingStrategy, options, policyStore, rateLimitConfiguration, logger)
        {
            _memoryCache = memoryCache;
            _blockIpService = blockIpService;
@@ -44,7 +44,7 @@ namespace Bit.Core.Utilities
            return httpContext.Response.WriteAsJsonAsync(errorModel, cancellationToken: httpContext.RequestAborted);
        }

-        public override void LogBlockedRequest(HttpContext httpContext, ClientRequestIdentity identity,
+        protected override void LogBlockedRequest(HttpContext httpContext, ClientRequestIdentity identity,
            RateLimitCounter counter, RateLimitRule rule)
        {
            base.LogBlockedRequest(httpContext, identity, counter, rule);
--- a/src/Core/packages.lock.json
+++ b/src/Core/packages.lock.json