From 7d40b3835279c2ea8336eeb434551b21361a2545 Mon Sep 17 00:00:00 2001 From: Shane Melton Date: Tue, 19 Jul 2022 11:58:32 -0700 Subject: [PATCH] [PS-93] Distributed Ip rate limiting (#2060) * Upgrade AspNetCoreRateLimiter and enable redis distributed cache for rate limiting. - Upgrades AspNetCoreRateLimiter to 4.0.2, which required updating NewtonSoft.Json to 13.0.1. - Replaces Microsoft.Extensions.Caching.Redis with Microsoft.Extensions.Caching.StackExchangeRedis as the original was deprecated and conflicted with the latest AspNetCoreRateLimiter - Adds startup task to Program.cs for Api/Identity projects to support AspNetCoreRateLimiters breaking changes for seeding its stores. - Adds a Redis connection string option to GlobalSettings Signed-off-by: Shane Melton * Cleanup Redis distributed cache registration - Add new AddDistributedCache service collection extension to add either a Memory or Redis distributed cache. - Remove distributed cache registration from Identity service collection extension. - Add IpRateLimitSeedStartupService.cs to run at application startup to seed the Ip rate limiting policies. Signed-off-by: Shane Melton * Add caching configuration to SSO Startup.cs Signed-off-by: Shane Melton * Add ProjectName as an instance name for Redis options Signed-off-by: Shane Melton * Use distributed cache in CustomIpRateLimitMiddleware.cs Signed-off-by: Shane Melton * Undo changes to Program.cs and launchSettings.json * Move new service collection extensions to SharedWeb * Upgrade Caching.StackExchangeRedis package to v6 * Cleanup and fix leftover merge conflicts * Remove use of Newtonsoft.Json in distributed cache extensions * Cleanup more formatting * Fix formatting * Fix startup issue caused by merge and fix integration test Signed-off-by: Shane Melton * Linting fix Signed-off-by: Shane Melton --- .../src/CommCore/packages.lock.json | 146 ++++++++-------- bitwarden_license/src/Sso/Startup.cs | 4 + bitwarden_license/src/Sso/packages.lock.json | 153 +++++++++-------- .../test/CmmCore.Test/packages.lock.json | 155 +++++++++-------- src/Admin/packages.lock.json | 152 +++++++++-------- src/Api/Startup.cs | 11 +- src/Api/packages.lock.json | 155 +++++++++-------- src/Billing/packages.lock.json | 148 ++++++++-------- src/Core/Core.csproj | 3 +- .../IpRateLimitSeedStartupService.cs | 41 +++++ ...onfigureOpenIdConnectDistributedOptions.cs | 2 +- .../IdentityServer/RedisCacheTicketStore.cs | 3 +- src/Core/Settings/GlobalSettings.cs | 1 + .../Utilities/CustomIpRateLimitMiddleware.cs | 23 +-- .../Utilities/DistributedCacheExtensions.cs | 48 ++++++ src/Core/packages.lock.json | 146 ++++++++-------- src/Events/packages.lock.json | 153 +++++++++-------- src/EventsProcessor/packages.lock.json | 153 +++++++++-------- src/Icons/packages.lock.json | 149 ++++++++-------- src/Identity/Startup.cs | 11 +- src/Identity/packages.lock.json | 153 +++++++++-------- src/Infrastructure.Dapper/packages.lock.json | 143 +++++++++------- .../packages.lock.json | 146 ++++++++-------- src/Notifications/packages.lock.json | 124 ++++++-------- .../Utilities/ServiceCollectionExtensions.cs | 71 ++++++-- src/SharedWeb/packages.lock.json | 147 ++++++++-------- test/Api.Test/packages.lock.json | 149 ++++++++-------- test/Billing.Test/packages.lock.json | 148 ++++++++-------- test/Common/packages.lock.json | 145 +++++++++------- test/Core.Test/packages.lock.json | 149 ++++++++-------- test/Icons.Test/packages.lock.json | 137 ++++++++------- .../packages.lock.json | 152 +++++++++-------- test/Identity.Test/packages.lock.json | 153 +++++++++-------- .../Factories/WebApplicationFactoryBase.cs | 3 + test/IntegrationTestCommon/packages.lock.json | 148 ++++++++-------- util/Migrator/packages.lock.json | 146 ++++++++-------- util/MySqlMigrations/packages.lock.json | 161 ++++++++++-------- util/PostgresMigrations/packages.lock.json | 161 ++++++++++-------- util/Setup/packages.lock.json | 148 ++++++++-------- 39 files changed, 2331 insertions(+), 1910 deletions(-) create mode 100644 src/Core/HostedServices/IpRateLimitSeedStartupService.cs create mode 100644 src/Core/Utilities/DistributedCacheExtensions.cs diff --git a/bitwarden_license/src/CommCore/packages.lock.json b/bitwarden_license/src/CommCore/packages.lock.json index 3eac7282e..70e358c14 100644 --- a/bitwarden_license/src/CommCore/packages.lock.json +++ b/bitwarden_license/src/CommCore/packages.lock.json @@ -13,6 +13,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AWSSDK.Core": { "type": "Transitive", "resolved": "3.7.10.11", @@ -410,14 +419,14 @@ "Microsoft.Extensions.Options": "3.1.8" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -663,8 +672,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "VdLJOCXhZaEMY7Hm2GKiULmn7IEPFE4XC5LPSfBVCUIA8YLZVh846gtfBJalsPQF2PlzdD7ecX7DZEulJ402ZQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -702,11 +711,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "+FWlwd//+Tt56316p00hVePBCouXyEzT86Jb3+AuRotTND0IYn0OO3obs1gnQEs/txEnt+rF2JBGLItTG+Be6A==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.5.0", - "System.Security.Principal.Windows": "4.5.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -793,6 +802,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Portable.BouncyCastle": { "type": "Transitive", "resolved": "1.9.0", @@ -1095,34 +1112,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1186,15 +1182,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1250,6 +1246,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1475,6 +1482,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1575,23 +1587,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2167,11 +2179,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "U77HfRXlZlOeIXd//Yoj6Jnk8AXlbeisf1oq1os+hxOGVnuG+lGSfGqTwTZBoORFF6j/0q7HXIl8cqwQ9aUGqQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0" - } + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2438,6 +2447,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2452,7 +2462,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", diff --git a/bitwarden_license/src/Sso/Startup.cs b/bitwarden_license/src/Sso/Startup.cs index 50ebdd498..6116d86c2 100644 --- a/bitwarden_license/src/Sso/Startup.cs +++ b/bitwarden_license/src/Sso/Startup.cs @@ -42,6 +42,10 @@ namespace Bit.Sso // Context services.AddScoped(); + // Caching + services.AddMemoryCache(); + services.AddDistributedCache(globalSettings); + // Mvc services.AddControllersWithViews(); diff --git a/bitwarden_license/src/Sso/packages.lock.json b/bitwarden_license/src/Sso/packages.lock.json index 7cbfd02eb..440f572e0 100644 --- a/bitwarden_license/src/Sso/packages.lock.json +++ b/bitwarden_license/src/Sso/packages.lock.json @@ -25,6 +25,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -569,14 +578,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -865,8 +874,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -904,11 +913,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1019,6 +1028,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1356,34 +1373,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1463,15 +1459,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1542,6 +1538,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1767,6 +1774,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1867,23 +1879,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2459,8 +2471,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2727,6 +2739,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2741,7 +2754,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2762,7 +2775,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2771,7 +2784,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2781,9 +2794,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/bitwarden_license/test/CmmCore.Test/packages.lock.json b/bitwarden_license/test/CmmCore.Test/packages.lock.json index 7e8994075..877c7a3eb 100644 --- a/bitwarden_license/test/CmmCore.Test/packages.lock.json +++ b/bitwarden_license/test/CmmCore.Test/packages.lock.json @@ -46,6 +46,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoFixture": { "type": "Transitive", "resolved": "4.17.0", @@ -597,14 +606,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -850,8 +859,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -912,11 +921,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1049,6 +1058,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1391,34 +1408,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1636,6 +1632,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1860,6 +1867,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1960,23 +1972,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2557,8 +2569,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2868,25 +2880,25 @@ "type": "Project", "dependencies": { "Azure.Messaging.EventGrid": "4.10.0", - "CommCore": "2022.5.2", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "CommCore": "2022.6.0", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore": "6.3.1" } }, "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "common": { "type": "Project", "dependencies": { - "Api": "2022.5.2", + "Api": "2022.6.0", "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -2899,6 +2911,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2913,7 +2926,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2934,11 +2947,11 @@ "core.test": { "type": "Project", "dependencies": { - "Api": "2022.5.2", + "Api": "2022.6.0", "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Common": "2022.5.2", - "Core": "2022.5.2", + "Common": "2022.6.0", + "Core": "2022.6.0", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "Moq": "4.17.2", @@ -2949,7 +2962,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2958,7 +2971,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2968,9 +2981,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/src/Admin/packages.lock.json b/src/Admin/packages.lock.json index 4f0336bc2..1c29b2c5a 100644 --- a/src/Admin/packages.lock.json +++ b/src/Admin/packages.lock.json @@ -45,6 +45,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -759,14 +768,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -1024,8 +1033,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "2.1.2", - "contentHash": "mOJy3M0UN+LUG21dLGMxaWZEP6xYpQEpLuvuEQBaownaX4YuhH6NmNUlN9si+vNkAS6dwJ//N1O4DmLf2CikVg==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -1141,11 +1150,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1329,6 +1338,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1666,34 +1683,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1760,15 +1756,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1935,6 +1931,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -2265,23 +2272,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2862,8 +2869,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -3141,7 +3148,7 @@ "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "core": { @@ -3150,6 +3157,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -3164,7 +3172,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -3185,7 +3193,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -3194,7 +3202,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -3204,7 +3212,7 @@ "migrator": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.Extensions.Logging": "6.0.0", "dbup-sqlserver": "4.5.0" } @@ -3212,9 +3220,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs index b86542bd5..87249f026 100644 --- a/src/Api/Startup.cs +++ b/src/Api/Startup.cs @@ -11,6 +11,7 @@ using System.Globalization; using Microsoft.IdentityModel.Logging; using Microsoft.OpenApi.Models; using Bit.SharedWeb.Utilities; +using Microsoft.Extensions.DependencyInjection.Extensions; #if !OSS using Bit.CommCore.Utilities; @@ -61,22 +62,18 @@ namespace Bit.Api // Context services.AddScoped(); + services.TryAddSingleton(); // Caching services.AddMemoryCache(); + services.AddDistributedCache(globalSettings); // BitPay services.AddSingleton(); if (!globalSettings.SelfHosted) { - // Rate limiting - services.AddSingleton(); - services.AddSingleton(); - // Ref: https://github.com/stefanprodan/AspNetCoreRateLimit/issues/216 - services.AddSingleton(); - // Ref: https://github.com/stefanprodan/AspNetCoreRateLimit/issues/66 - services.AddSingleton(); + services.AddIpRateLimiting(globalSettings); } // Identity diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json index b34cc1ef9..2bd85f7b2 100644 --- a/src/Api/packages.lock.json +++ b/src/Api/packages.lock.json @@ -36,6 +36,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -511,14 +520,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -764,8 +773,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -808,11 +817,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -923,6 +932,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1260,34 +1277,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1375,15 +1371,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1454,6 +1450,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1679,6 +1686,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1779,23 +1791,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2371,8 +2383,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2636,7 +2648,7 @@ "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "core": { @@ -2645,6 +2657,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2659,7 +2672,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2680,7 +2693,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2689,7 +2702,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2699,9 +2712,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/src/Billing/packages.lock.json b/src/Billing/packages.lock.json index 27151fe29..f4b6accd3 100644 --- a/src/Billing/packages.lock.json +++ b/src/Billing/packages.lock.json @@ -25,6 +25,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -740,14 +749,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -1002,8 +1011,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "2.1.2", - "contentHash": "mOJy3M0UN+LUG21dLGMxaWZEP6xYpQEpLuvuEQBaownaX4YuhH6NmNUlN9si+vNkAS6dwJ//N1O4DmLf2CikVg==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -1119,11 +1128,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1307,6 +1316,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1644,34 +1661,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1738,15 +1734,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1913,6 +1909,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -2243,23 +2250,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2839,8 +2846,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -3121,6 +3128,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -3135,7 +3143,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -3156,7 +3164,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -3165,7 +3173,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -3175,9 +3183,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index 961cc164c..db5153aac 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -20,6 +20,7 @@ + @@ -52,7 +53,7 @@ - + diff --git a/src/Core/HostedServices/IpRateLimitSeedStartupService.cs b/src/Core/HostedServices/IpRateLimitSeedStartupService.cs new file mode 100644 index 000000000..dd77982cb --- /dev/null +++ b/src/Core/HostedServices/IpRateLimitSeedStartupService.cs @@ -0,0 +1,41 @@ +using AspNetCoreRateLimit; +using Microsoft.Extensions.Hosting; + +namespace Bit.Core.HostedServices +{ + /// + /// A startup service that will seed the IP rate limiting stores with any values in the + /// GlobalSettings configuration. + /// + /// + /// Using an here because it runs before the request processing pipeline + /// is configured, so that any rate limiting configuration is seeded/applied before any requests come in. + /// + /// + /// This is a cleaner alternative to modifying Program.cs in every project that requires rate limiting as + /// described/suggested here: + /// https://github.com/stefanprodan/AspNetCoreRateLimit/wiki/Version-3.0.0-Breaking-Changes + /// + /// + public class IpRateLimitSeedStartupService : IHostedService + { + private readonly IIpPolicyStore _ipPolicyStore; + private readonly IClientPolicyStore _clientPolicyStore; + + public IpRateLimitSeedStartupService(IIpPolicyStore ipPolicyStore, IClientPolicyStore clientPolicyStore) + { + _ipPolicyStore = ipPolicyStore; + _clientPolicyStore = clientPolicyStore; + } + + public async Task StartAsync(CancellationToken cancellationToken) + { + // Seed the policies from GlobalSettings + await _ipPolicyStore.SeedAsync(); + await _clientPolicyStore.SeedAsync(); + } + + // noop + public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask; + } +} diff --git a/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs b/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs index 3b1c390a8..b3846e81f 100644 --- a/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs +++ b/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs @@ -2,7 +2,7 @@ using IdentityServer4.Configuration; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Caching.Redis; +using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Options; namespace Bit.Core.IdentityServer diff --git a/src/Core/IdentityServer/RedisCacheTicketStore.cs b/src/Core/IdentityServer/RedisCacheTicketStore.cs index eaec72a44..f7aa8c0a9 100644 --- a/src/Core/IdentityServer/RedisCacheTicketStore.cs +++ b/src/Core/IdentityServer/RedisCacheTicketStore.cs @@ -1,8 +1,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.Extensions.Caching.Distributed; -using Microsoft.Extensions.Caching.Memory; -using Microsoft.Extensions.Caching.Redis; +using Microsoft.Extensions.Caching.StackExchangeRedis; namespace Bit.Core.IdentityServer { diff --git a/src/Core/Settings/GlobalSettings.cs b/src/Core/Settings/GlobalSettings.cs index b79a5250d..f0bdca4ef 100644 --- a/src/Core/Settings/GlobalSettings.cs +++ b/src/Core/Settings/GlobalSettings.cs @@ -49,6 +49,7 @@ public virtual MailSettings Mail { get; set; } = new MailSettings(); public virtual IConnectionStringSettings Storage { get; set; } = new ConnectionStringSettings(); public virtual ConnectionStringSettings Events { get; set; } = new ConnectionStringSettings(); + public virtual IConnectionStringSettings Redis { get; set; } = new ConnectionStringSettings(); public virtual NotificationsSettings Notifications { get; set; } = new NotificationsSettings(); public virtual IFileStorageSettings Attachment { get; set; } public virtual FileStorageSettings Send { get; set; } diff --git a/src/Core/Utilities/CustomIpRateLimitMiddleware.cs b/src/Core/Utilities/CustomIpRateLimitMiddleware.cs index c38700bde..529495e09 100644 --- a/src/Core/Utilities/CustomIpRateLimitMiddleware.cs +++ b/src/Core/Utilities/CustomIpRateLimitMiddleware.cs @@ -2,7 +2,7 @@ using Bit.Core.Models.Api; using Bit.Core.Services; using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -10,13 +10,13 @@ namespace Bit.Core.Utilities { public class CustomIpRateLimitMiddleware : IpRateLimitMiddleware { - private readonly IpRateLimitOptions _options; - private readonly IMemoryCache _memoryCache; private readonly IBlockIpService _blockIpService; private readonly ILogger _logger; + private readonly IDistributedCache _distributedCache; + private readonly IpRateLimitOptions _options; public CustomIpRateLimitMiddleware( - IMemoryCache memoryCache, + IDistributedCache distributedCache, IBlockIpService blockIpService, RequestDelegate next, IProcessingStrategy processingStrategy, @@ -26,7 +26,7 @@ namespace Bit.Core.Utilities ILogger logger) : base(next, processingStrategy, options, policyStore, rateLimitConfiguration, logger) { - _memoryCache = memoryCache; + _distributedCache = distributedCache; _blockIpService = blockIpService; _options = options.Value; _logger = logger; @@ -34,12 +34,13 @@ namespace Bit.Core.Utilities public override Task ReturnQuotaExceededResponse(HttpContext httpContext, RateLimitRule rule, string retryAfter) { - var message = string.IsNullOrWhiteSpace(_options.QuotaExceededMessage) ? - $"Slow down! Too many requests. Try again in {rule.Period}." : _options.QuotaExceededMessage; + var message = string.IsNullOrWhiteSpace(_options.QuotaExceededMessage) + ? $"Slow down! Too many requests. Try again in {rule.Period}." + : _options.QuotaExceededMessage; httpContext.Response.Headers["Retry-After"] = retryAfter; httpContext.Response.StatusCode = _options.HttpStatusCode; var errorModel = new ErrorResponseModel { Message = message }; - return httpContext.Response.WriteAsJsonAsync(errorModel, cancellationToken: httpContext.RequestAborted); + return httpContext.Response.WriteAsJsonAsync(errorModel, httpContext.RequestAborted); } protected override void LogBlockedRequest(HttpContext httpContext, ClientRequestIdentity identity, @@ -48,7 +49,7 @@ namespace Bit.Core.Utilities base.LogBlockedRequest(httpContext, identity, counter, rule); var key = $"blockedIp_{identity.ClientIp}"; - _memoryCache.TryGetValue(key, out int blockedCount); + _distributedCache.TryGetValue(key, out int blockedCount); blockedCount++; if (blockedCount > 10) @@ -61,8 +62,8 @@ namespace Bit.Core.Utilities { _logger.LogInformation(Constants.BypassFiltersEventId, null, "Request blocked {0}. \nInfo: \n{1}", identity.ClientIp, GetRequestInfo(httpContext)); - _memoryCache.Set(key, blockedCount, - new MemoryCacheEntryOptions().SetSlidingExpiration(new TimeSpan(0, 5, 0))); + _distributedCache.Set(key, blockedCount, + new DistributedCacheEntryOptions().SetSlidingExpiration(new TimeSpan(0, 5, 0))); } } diff --git a/src/Core/Utilities/DistributedCacheExtensions.cs b/src/Core/Utilities/DistributedCacheExtensions.cs new file mode 100644 index 000000000..d27d0ee46 --- /dev/null +++ b/src/Core/Utilities/DistributedCacheExtensions.cs @@ -0,0 +1,48 @@ +using System.Text.Json; +using Microsoft.Extensions.Caching.Distributed; + +namespace Bit.Core.Utilities +{ + public static class DistributedCacheExtensions + { + public static void Set(this IDistributedCache cache, string key, T value) + { + Set(cache, key, value, new DistributedCacheEntryOptions()); + } + + public static void Set(this IDistributedCache cache, string key, T value, + DistributedCacheEntryOptions options) + { + var bytes = JsonSerializer.SerializeToUtf8Bytes(value); + cache.Set(key, bytes, options); + } + + public static Task SetAsync(this IDistributedCache cache, string key, T value) + { + return SetAsync(cache, key, value, new DistributedCacheEntryOptions()); + } + + public static Task SetAsync(this IDistributedCache cache, string key, T value, + DistributedCacheEntryOptions options) + { + var bytes = JsonSerializer.SerializeToUtf8Bytes(value); + return cache.SetAsync(key, bytes, options); + } + + public static bool TryGetValue(this IDistributedCache cache, string key, out T value) + { + var val = cache.Get(key); + value = default; + if (val == null) return false; + try + { + value = JsonSerializer.Deserialize(val); + } + catch + { + return false; + } + return true; + } + } +} diff --git a/src/Core/packages.lock.json b/src/Core/packages.lock.json index 0f37401ea..a2911f770 100644 --- a/src/Core/packages.lock.json +++ b/src/Core/packages.lock.json @@ -14,6 +14,16 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Direct", + "requested": "[1.0.1, )", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AWSSDK.SimpleEmail": { "type": "Direct", "requested": "[3.7.0.150, )", @@ -177,15 +187,15 @@ "System.IdentityModel.Tokens.Jwt": "5.4.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Direct", - "requested": "[2.2.0, )", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "requested": "[6.0.6, )", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration.EnvironmentVariables": { @@ -811,8 +821,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "VdLJOCXhZaEMY7Hm2GKiULmn7IEPFE4XC5LPSfBVCUIA8YLZVh846gtfBJalsPQF2PlzdD7ecX7DZEulJ402ZQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -850,11 +860,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "+FWlwd//+Tt56316p00hVePBCouXyEzT86Jb3+AuRotTND0IYn0OO3obs1gnQEs/txEnt+rF2JBGLItTG+Be6A==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.5.0", - "System.Security.Principal.Windows": "4.5.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -931,6 +941,14 @@ "libsodium": "[1.0.18, 1.0.19)" } }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Portable.BouncyCastle": { "type": "Transitive", "resolved": "1.9.0", @@ -1145,34 +1163,13 @@ "System.Text.Encoding.Extensions": "4.0.11" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1227,15 +1224,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1291,6 +1288,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1516,6 +1524,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1616,23 +1629,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2208,11 +2221,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "U77HfRXlZlOeIXd//Yoj6Jnk8AXlbeisf1oq1os+hxOGVnuG+lGSfGqTwTZBoORFF6j/0q7HXIl8cqwQ9aUGqQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0" - } + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", diff --git a/src/Events/packages.lock.json b/src/Events/packages.lock.json index 1260953af..e44b465d2 100644 --- a/src/Events/packages.lock.json +++ b/src/Events/packages.lock.json @@ -13,6 +13,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -483,14 +492,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -736,8 +745,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -775,11 +784,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -890,6 +899,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1227,34 +1244,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1321,15 +1317,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1400,6 +1396,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1625,6 +1632,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1725,23 +1737,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2317,8 +2329,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2585,6 +2597,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2599,7 +2612,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2620,7 +2633,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2629,7 +2642,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2639,9 +2652,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/src/EventsProcessor/packages.lock.json b/src/EventsProcessor/packages.lock.json index 1260953af..e44b465d2 100644 --- a/src/EventsProcessor/packages.lock.json +++ b/src/EventsProcessor/packages.lock.json @@ -13,6 +13,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -483,14 +492,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -736,8 +745,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -775,11 +784,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -890,6 +899,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1227,34 +1244,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1321,15 +1317,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1400,6 +1396,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1625,6 +1632,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1725,23 +1737,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2317,8 +2329,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2585,6 +2597,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2599,7 +2612,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2620,7 +2633,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2629,7 +2642,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2639,9 +2652,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/src/Icons/packages.lock.json b/src/Icons/packages.lock.json index 4615840ce..78b7488de 100644 --- a/src/Icons/packages.lock.json +++ b/src/Icons/packages.lock.json @@ -23,6 +23,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -493,14 +502,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -785,11 +794,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -900,6 +909,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1237,34 +1254,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1331,15 +1327,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1410,6 +1406,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1635,6 +1642,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1735,23 +1747,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2327,8 +2339,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2603,6 +2615,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2617,7 +2630,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2638,7 +2651,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2647,7 +2660,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2657,9 +2670,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/src/Identity/Startup.cs b/src/Identity/Startup.cs index 711f2f375..e0c67c536 100644 --- a/src/Identity/Startup.cs +++ b/src/Identity/Startup.cs @@ -9,6 +9,7 @@ using Bit.Core.Utilities; using Bit.Identity.Utilities; using Bit.SharedWeb.Utilities; using IdentityServer4.Extensions; +using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.IdentityModel.Logging; using Microsoft.OpenApi.Models; @@ -37,10 +38,6 @@ namespace Bit.Identity { services.Configure(Configuration.GetSection("IpRateLimitOptions")); services.Configure(Configuration.GetSection("IpRateLimitPolicies")); - // Ref: https://github.com/stefanprodan/AspNetCoreRateLimit/issues/216 - services.AddSingleton(); - // Ref: https://github.com/stefanprodan/AspNetCoreRateLimit/issues/66 - services.AddSingleton(); } // Data Protection @@ -51,9 +48,11 @@ namespace Bit.Identity // Context services.AddScoped(); + services.TryAddSingleton(); // Caching services.AddMemoryCache(); + services.AddDistributedCache(globalSettings); // Mvc services.AddMvc(config => @@ -68,9 +67,7 @@ namespace Bit.Identity if (!globalSettings.SelfHosted) { - // Rate limiting - services.AddSingleton(); - services.AddSingleton(); + services.AddIpRateLimiting(globalSettings); } // Cookies diff --git a/src/Identity/packages.lock.json b/src/Identity/packages.lock.json index 13c8f1e01..f4e8bee14 100644 --- a/src/Identity/packages.lock.json +++ b/src/Identity/packages.lock.json @@ -22,6 +22,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -492,14 +501,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -745,8 +754,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -789,11 +798,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -904,6 +913,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1241,34 +1258,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1343,15 +1339,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1422,6 +1418,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1647,6 +1654,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1747,23 +1759,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2339,8 +2351,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2607,6 +2619,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2621,7 +2634,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2642,7 +2655,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2651,7 +2664,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2661,9 +2674,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/src/Infrastructure.Dapper/packages.lock.json b/src/Infrastructure.Dapper/packages.lock.json index 7cc1b22e9..28d4da994 100644 --- a/src/Infrastructure.Dapper/packages.lock.json +++ b/src/Infrastructure.Dapper/packages.lock.json @@ -30,6 +30,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AWSSDK.Core": { "type": "Transitive", "resolved": "3.7.10.11", @@ -427,14 +436,14 @@ "Microsoft.Extensions.Options": "3.1.8" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -680,8 +689,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -719,11 +728,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -810,6 +819,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Portable.BouncyCastle": { "type": "Transitive", "resolved": "1.9.0", @@ -1137,34 +1154,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1228,15 +1224,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1292,6 +1288,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1517,6 +1524,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1617,23 +1629,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2209,8 +2221,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2477,6 +2489,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2491,7 +2504,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", diff --git a/src/Infrastructure.EntityFramework/packages.lock.json b/src/Infrastructure.EntityFramework/packages.lock.json index 5943f62cd..3f992263b 100644 --- a/src/Infrastructure.EntityFramework/packages.lock.json +++ b/src/Infrastructure.EntityFramework/packages.lock.json @@ -66,6 +66,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -504,14 +513,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -757,8 +766,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "VdLJOCXhZaEMY7Hm2GKiULmn7IEPFE4XC5LPSfBVCUIA8YLZVh846gtfBJalsPQF2PlzdD7ecX7DZEulJ402ZQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -796,11 +805,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "+FWlwd//+Tt56316p00hVePBCouXyEzT86Jb3+AuRotTND0IYn0OO3obs1gnQEs/txEnt+rF2JBGLItTG+Be6A==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.5.0", - "System.Security.Principal.Windows": "4.5.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -900,6 +909,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Portable.BouncyCastle": { "type": "Transitive", "resolved": "1.9.0", @@ -1202,34 +1219,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1296,15 +1292,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1365,6 +1361,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1590,6 +1597,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1690,23 +1702,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2282,11 +2294,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "U77HfRXlZlOeIXd//Yoj6Jnk8AXlbeisf1oq1os+hxOGVnuG+lGSfGqTwTZBoORFF6j/0q7HXIl8cqwQ9aUGqQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0" - } + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2553,6 +2562,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2567,7 +2577,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", diff --git a/src/Notifications/packages.lock.json b/src/Notifications/packages.lock.json index 1952c8e6e..2d2f2f653 100644 --- a/src/Notifications/packages.lock.json +++ b/src/Notifications/packages.lock.json @@ -34,6 +34,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -541,14 +550,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -955,10 +964,10 @@ }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "7hzHplEIVOGBl5zOQZGX/DiJDHjq+RVRVrYgDiqXb6RriqWAdacXxp+XO9WSrATCEXyNOUOQg9aqQArsjase/A==", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", "dependencies": { - "System.IO.Pipelines": "5.0.0" + "System.IO.Pipelines": "5.0.1" } }, "Pomelo.EntityFrameworkCore.MySql": { @@ -1300,43 +1309,13 @@ }, "StackExchange.Redis": { "type": "Transitive", - "resolved": "2.2.4", - "contentHash": "wM0OuRyRaZTFndFRjIOvas4jjkeclRJsmNm0eAx5tOju3SQisrLubNaSFT/dBypi4Vh1n7nYc1gWpw9L7ernOg==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "Pipelines.Sockets.Unofficial": "2.2.0", + "Pipelines.Sockets.Unofficial": "2.2.2", "System.Diagnostics.PerformanceCounter": "5.0.0" } }, - "StackExchange.Redis.StrongName": { - "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" - } - }, "starkbank-ecdsa": { "type": "Transitive", "resolved": "1.3.3", @@ -1401,15 +1380,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1821,23 +1800,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2668,6 +2647,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2682,7 +2662,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2703,7 +2683,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2712,7 +2692,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2722,9 +2702,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs index a05e1083a..9102a3a18 100644 --- a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs +++ b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs @@ -1,8 +1,11 @@ using System.Reflection; using System.Security.Claims; using System.Security.Cryptography.X509Certificates; +using AspNetCoreRateLimit; +using AspNetCoreRateLimit.Redis; using Bit.Core.Entities; using Bit.Core.Enums; +using Bit.Core.HostedServices; using Bit.Core.Identity; using Bit.Core.IdentityServer; using Bit.Core.Models.Business.Tokenables; @@ -27,13 +30,17 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc.Localization; +using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Serilog.Context; +using StackExchange.Redis; using NoopRepos = Bit.Core.Repositories.Noop; +using Role = Bit.Core.Entities.Role; using TableStorageRepos = Bit.Core.Repositories.TableStorage; namespace Bit.SharedWeb.Utilities @@ -566,16 +573,6 @@ namespace Bit.SharedWeb.Utilities public static IServiceCollection AddDistributedIdentityServices(this IServiceCollection services, GlobalSettings globalSettings) { - if (string.IsNullOrWhiteSpace(globalSettings.IdentityServer?.RedisConnectionString)) - { - services.AddDistributedMemoryCache(); - } - else - { - services.AddDistributedRedisCache(options => - options.Configuration = globalSettings.IdentityServer.RedisConnectionString); - } - services.AddOidcStateDataFormatterCache(); services.AddSession(); services.ConfigureApplicationCookie(configure => configure.CookieManager = new DistributedCacheCookieManager()); @@ -600,5 +597,59 @@ namespace Bit.SharedWeb.Utilities options.TimestampDriftTolerance = 300000; }); } + + /// + /// Adds either an in-memory or distributed IP rate limiter depending if a Redis connection string is available. + /// + /// + /// + public static void AddIpRateLimiting(this IServiceCollection services, + GlobalSettings globalSettings) + { + services.AddHostedService(); + services.AddSingleton(); + + if (string.IsNullOrEmpty(globalSettings.Redis.ConnectionString)) + { + services.AddInMemoryRateLimiting(); + } + else + { + services.AddRedisRateLimiting(); // Requires a registered IConnectionMultiplexer + } + } + + /// + /// Adds an implementation of to the service collection. Uses a memory + /// cache if self hosted or no Redis connection string is available in GlobalSettings. + /// + public static void AddDistributedCache( + this IServiceCollection services, + GlobalSettings globalSettings) + { + if (globalSettings.SelfHosted || string.IsNullOrEmpty(globalSettings.Redis.ConnectionString)) + { + services.AddDistributedMemoryCache(); + return; + } + + // Register the IConnectionMultiplexer explicitly so it can be accessed via DI + // (e.g. for the IP rate limiting store) + services.AddSingleton( + _ => ConnectionMultiplexer.Connect(globalSettings.Redis.ConnectionString)); + + // Explicitly register IDistributedCache to re-use existing IConnectionMultiplexer + // to reduce the number of redundant connections to the Redis instance + services.AddSingleton(s => + { + return new RedisCache(new RedisCacheOptions + { + // Use "ProjectName:" as an instance name to namespace keys and avoid conflicts between projects + InstanceName = $"{globalSettings.ProjectName}:", + ConnectionMultiplexerFactory = () => + Task.FromResult(s.GetRequiredService()) + }); + }); + } } } diff --git a/src/SharedWeb/packages.lock.json b/src/SharedWeb/packages.lock.json index cf0dda295..9d40730c9 100644 --- a/src/SharedWeb/packages.lock.json +++ b/src/SharedWeb/packages.lock.json @@ -13,6 +13,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -483,14 +492,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -736,8 +745,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -775,11 +784,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -890,6 +899,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1227,34 +1244,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1321,15 +1317,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1400,6 +1396,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1625,6 +1632,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1725,23 +1737,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2317,8 +2329,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2585,6 +2597,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2599,7 +2612,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2620,7 +2633,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2629,7 +2642,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", diff --git a/test/Api.Test/packages.lock.json b/test/Api.Test/packages.lock.json index fc4373c8e..6ce249f9c 100644 --- a/test/Api.Test/packages.lock.json +++ b/test/Api.Test/packages.lock.json @@ -65,6 +65,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoFixture": { "type": "Transitive", "resolved": "4.17.0", @@ -607,14 +616,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -860,8 +869,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -922,11 +931,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1042,6 +1051,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1384,34 +1401,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1629,6 +1625,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1853,6 +1860,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1953,23 +1965,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2550,8 +2562,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2861,25 +2873,25 @@ "type": "Project", "dependencies": { "Azure.Messaging.EventGrid": "4.10.0", - "CommCore": "2022.5.2", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "CommCore": "2022.6.0", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore": "6.3.1" } }, "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "common": { "type": "Project", "dependencies": { - "Api": "2022.5.2", + "Api": "2022.6.0", "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -2892,6 +2904,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2906,7 +2919,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2927,7 +2940,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2936,7 +2949,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2946,9 +2959,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/test/Billing.Test/packages.lock.json b/test/Billing.Test/packages.lock.json index 350412b47..020d78341 100644 --- a/test/Billing.Test/packages.lock.json +++ b/test/Billing.Test/packages.lock.json @@ -65,6 +65,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoFixture": { "type": "Transitive", "resolved": "4.17.0", @@ -852,14 +861,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -1114,8 +1123,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "2.1.2", - "contentHash": "mOJy3M0UN+LUG21dLGMxaWZEP6xYpQEpLuvuEQBaownaX4YuhH6NmNUlN9si+vNkAS6dwJ//N1O4DmLf2CikVg==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -1265,11 +1274,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1453,6 +1462,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1795,34 +1812,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -2136,6 +2132,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -2465,23 +2472,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -3061,8 +3068,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -3386,33 +3393,33 @@ "type": "Project", "dependencies": { "Azure.Messaging.EventGrid": "4.10.0", - "CommCore": "2022.5.2", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "CommCore": "2022.6.0", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore": "6.3.1" } }, "billing": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.VisualStudio.Web.CodeGeneration.Design": "6.0.3", - "SharedWeb": "2022.5.2" + "SharedWeb": "2022.6.0" } }, "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "common": { "type": "Project", "dependencies": { - "Api": "2022.5.2", + "Api": "2022.6.0", "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -3425,6 +3432,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -3439,7 +3447,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -3460,7 +3468,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -3469,7 +3477,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -3479,9 +3487,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/test/Common/packages.lock.json b/test/Common/packages.lock.json index a2140631a..71fdd58ba 100644 --- a/test/Common/packages.lock.json +++ b/test/Common/packages.lock.json @@ -79,6 +79,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoFixture": { "type": "Transitive", "resolved": "4.17.0", @@ -603,14 +612,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -856,8 +865,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -918,11 +927,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1038,6 +1047,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1380,34 +1397,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1625,6 +1621,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1849,6 +1856,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1949,23 +1961,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2546,8 +2558,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2857,16 +2869,16 @@ "type": "Project", "dependencies": { "Azure.Messaging.EventGrid": "4.10.0", - "CommCore": "2022.5.2", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "CommCore": "2022.6.0", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore": "6.3.1" } }, "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "core": { @@ -2875,6 +2887,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2889,7 +2902,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2910,7 +2923,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2919,7 +2932,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2929,9 +2942,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/test/Core.Test/packages.lock.json b/test/Core.Test/packages.lock.json index 474b16331..85b77a805 100644 --- a/test/Core.Test/packages.lock.json +++ b/test/Core.Test/packages.lock.json @@ -95,6 +95,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoFixture": { "type": "Transitive", "resolved": "4.17.0", @@ -619,14 +628,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -872,8 +881,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -934,11 +943,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1054,6 +1063,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1396,34 +1413,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1641,6 +1637,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1865,6 +1872,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1965,23 +1977,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2562,8 +2574,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2873,25 +2885,25 @@ "type": "Project", "dependencies": { "Azure.Messaging.EventGrid": "4.10.0", - "CommCore": "2022.5.2", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "CommCore": "2022.6.0", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore": "6.3.1" } }, "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "common": { "type": "Project", "dependencies": { - "Api": "2022.5.2", + "Api": "2022.6.0", "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -2904,6 +2916,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2918,7 +2931,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2939,7 +2952,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2948,7 +2961,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2958,9 +2971,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/test/Icons.Test/packages.lock.json b/test/Icons.Test/packages.lock.json index 43dab7627..6aef06f4a 100644 --- a/test/Icons.Test/packages.lock.json +++ b/test/Icons.Test/packages.lock.json @@ -64,6 +64,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -556,14 +565,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -866,11 +875,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -986,6 +995,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1323,34 +1340,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1536,6 +1532,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1760,6 +1767,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1860,23 +1872,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2457,8 +2469,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2778,6 +2790,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2792,7 +2805,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2814,14 +2827,14 @@ "type": "Project", "dependencies": { "AngleSharp": "0.16.1", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2" + "Core": "2022.6.0", + "SharedWeb": "2022.6.0" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2830,7 +2843,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2840,9 +2853,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/test/Identity.IntegrationTest/packages.lock.json b/test/Identity.IntegrationTest/packages.lock.json index 9f37dae90..f5b72b04b 100644 --- a/test/Identity.IntegrationTest/packages.lock.json +++ b/test/Identity.IntegrationTest/packages.lock.json @@ -76,6 +76,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoFixture": { "type": "Transitive", "resolved": "4.17.0", @@ -634,14 +643,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -992,8 +1001,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -1054,11 +1063,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1174,6 +1183,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1516,34 +1533,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1766,6 +1762,17 @@ "resolved": "6.0.0", "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw==" }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -2095,23 +2102,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2692,8 +2699,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -3003,25 +3010,25 @@ "type": "Project", "dependencies": { "Azure.Messaging.EventGrid": "4.10.0", - "CommCore": "2022.5.2", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "CommCore": "2022.6.0", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore": "6.3.1" } }, "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "common": { "type": "Project", "dependencies": { - "Api": "2022.5.2", + "Api": "2022.6.0", "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -3034,6 +3041,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -3048,7 +3056,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -3069,15 +3077,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore.SwaggerGen": "6.3.1" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -3086,7 +3094,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -3096,8 +3104,8 @@ "integrationtestcommon": { "type": "Project", "dependencies": { - "Common": "2022.5.2", - "Identity": "2022.5.2", + "Common": "2022.6.0", + "Identity": "2022.6.0", "Microsoft.AspNetCore.Mvc.Testing": "6.0.5", "Microsoft.EntityFrameworkCore.InMemory": "6.0.5", "Microsoft.Extensions.Configuration": "6.0.1" @@ -3106,9 +3114,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/test/Identity.Test/packages.lock.json b/test/Identity.Test/packages.lock.json index 2f2e167ef..324afbb8e 100644 --- a/test/Identity.Test/packages.lock.json +++ b/test/Identity.Test/packages.lock.json @@ -65,6 +65,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoFixture": { "type": "Transitive", "resolved": "4.17.0", @@ -607,14 +616,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -860,8 +869,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -922,11 +931,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1042,6 +1051,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1384,34 +1401,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1629,6 +1625,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1853,6 +1860,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1953,23 +1965,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2550,8 +2562,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2861,25 +2873,25 @@ "type": "Project", "dependencies": { "Azure.Messaging.EventGrid": "4.10.0", - "CommCore": "2022.5.2", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "CommCore": "2022.6.0", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore": "6.3.1" } }, "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "common": { "type": "Project", "dependencies": { - "Api": "2022.5.2", + "Api": "2022.6.0", "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -2892,6 +2904,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2906,7 +2919,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2927,15 +2940,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore.SwaggerGen": "6.3.1" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2944,7 +2957,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2954,9 +2967,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs b/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs index dcc12728a..bed8dc080 100644 --- a/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs +++ b/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs @@ -41,6 +41,9 @@ namespace Bit.IntegrationTestCommon.Factories // DbContextOptions to use an in memory database { "globalSettings:databaseProvider", "postgres" }, { "globalSettings:postgreSql:connectionString", "Host=localhost;Username=test;Password=test;Database=test" }, + + // Clear the redis connection string for distributed caching, forcing an in-memory implementation + { "globalSettings:redis:connectionString", ""} }); }); diff --git a/test/IntegrationTestCommon/packages.lock.json b/test/IntegrationTestCommon/packages.lock.json index 075cbc1b5..7fbcf8623 100644 --- a/test/IntegrationTestCommon/packages.lock.json +++ b/test/IntegrationTestCommon/packages.lock.json @@ -43,6 +43,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoFixture": { "type": "Transitive", "resolved": "4.17.0", @@ -602,14 +611,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -960,8 +969,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -1022,11 +1031,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -1150,6 +1159,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1492,34 +1509,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1742,6 +1738,17 @@ "resolved": "6.0.0", "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw==" }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -2071,23 +2078,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2668,8 +2675,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2989,25 +2996,25 @@ "type": "Project", "dependencies": { "Azure.Messaging.EventGrid": "4.10.0", - "CommCore": "2022.5.2", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "CommCore": "2022.6.0", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore": "6.3.1" } }, "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "common": { "type": "Project", "dependencies": { - "Api": "2022.5.2", + "Api": "2022.6.0", "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -3020,6 +3027,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -3034,7 +3042,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -3055,15 +3063,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore.SwaggerGen": "6.3.1" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -3072,7 +3080,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -3082,9 +3090,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/util/Migrator/packages.lock.json b/util/Migrator/packages.lock.json index 52c15b437..50ad80832 100644 --- a/util/Migrator/packages.lock.json +++ b/util/Migrator/packages.lock.json @@ -37,6 +37,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AWSSDK.Core": { "type": "Transitive", "resolved": "3.7.10.11", @@ -442,14 +451,14 @@ "Microsoft.Extensions.Options": "3.1.8" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -686,8 +695,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "VdLJOCXhZaEMY7Hm2GKiULmn7IEPFE4XC5LPSfBVCUIA8YLZVh846gtfBJalsPQF2PlzdD7ecX7DZEulJ402ZQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -725,11 +734,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "+FWlwd//+Tt56316p00hVePBCouXyEzT86Jb3+AuRotTND0IYn0OO3obs1gnQEs/txEnt+rF2JBGLItTG+Be6A==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.5.0", - "System.Security.Principal.Windows": "4.5.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -816,6 +825,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Portable.BouncyCastle": { "type": "Transitive", "resolved": "1.9.0", @@ -1143,34 +1160,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1234,15 +1230,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1309,6 +1305,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1534,6 +1541,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1634,23 +1646,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2227,11 +2239,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "U77HfRXlZlOeIXd//Yoj6Jnk8AXlbeisf1oq1os+hxOGVnuG+lGSfGqTwTZBoORFF6j/0q7HXIl8cqwQ9aUGqQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0" - } + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2507,6 +2516,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2521,7 +2531,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", diff --git a/util/MySqlMigrations/packages.lock.json b/util/MySqlMigrations/packages.lock.json index 9cd07957a..30468ab7e 100644 --- a/util/MySqlMigrations/packages.lock.json +++ b/util/MySqlMigrations/packages.lock.json @@ -23,6 +23,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -513,14 +522,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -766,8 +775,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -810,11 +819,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -925,6 +934,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1262,34 +1279,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1388,15 +1384,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1467,6 +1463,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1692,6 +1699,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1792,23 +1804,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2384,8 +2396,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2650,16 +2662,16 @@ "type": "Project", "dependencies": { "Azure.Messaging.EventGrid": "4.10.0", - "CommCore": "2022.5.2", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "CommCore": "2022.6.0", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore": "6.3.1" } }, "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "core": { @@ -2668,6 +2680,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2682,7 +2695,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2703,7 +2716,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2712,7 +2725,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2722,9 +2735,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/util/PostgresMigrations/packages.lock.json b/util/PostgresMigrations/packages.lock.json index 9cd07957a..30468ab7e 100644 --- a/util/PostgresMigrations/packages.lock.json +++ b/util/PostgresMigrations/packages.lock.json @@ -23,6 +23,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AutoMapper": { "type": "Transitive", "resolved": "11.0.0", @@ -513,14 +522,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -766,8 +775,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -810,11 +819,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -925,6 +934,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Pomelo.EntityFrameworkCore.MySql": { "type": "Transitive", "resolved": "6.0.1", @@ -1262,34 +1279,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1388,15 +1384,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1467,6 +1463,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1692,6 +1699,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1792,23 +1804,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2384,8 +2396,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2650,16 +2662,16 @@ "type": "Project", "dependencies": { "Azure.Messaging.EventGrid": "4.10.0", - "CommCore": "2022.5.2", - "Core": "2022.5.2", - "SharedWeb": "2022.5.2", + "CommCore": "2022.6.0", + "Core": "2022.6.0", + "SharedWeb": "2022.6.0", "Swashbuckle.AspNetCore": "6.3.1" } }, "commcore": { "type": "Project", "dependencies": { - "Core": "2022.5.2" + "Core": "2022.6.0" } }, "core": { @@ -2668,6 +2680,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2682,7 +2695,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2703,7 +2716,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Dapper": "2.0.123", "System.Data.SqlClient": "4.8.3" } @@ -2712,7 +2725,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.EntityFrameworkCore.Relational": "6.0.4", "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.4", "Pomelo.EntityFrameworkCore.MySql": "6.0.1", @@ -2722,9 +2735,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2022.5.2", - "Infrastructure.Dapper": "2022.5.2", - "Infrastructure.EntityFramework": "2022.5.2" + "Core": "2022.6.0", + "Infrastructure.Dapper": "2022.6.0", + "Infrastructure.EntityFramework": "2022.6.0" } } } diff --git a/util/Setup/packages.lock.json b/util/Setup/packages.lock.json index 4d566d5a6..6019451a6 100644 --- a/util/Setup/packages.lock.json +++ b/util/Setup/packages.lock.json @@ -41,6 +41,15 @@ "Newtonsoft.Json": "13.0.1" } }, + "AspNetCoreRateLimit.Redis": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "CsSGy/7SXt6iBOKg0xCvsRjb/ZHshbtr2Of1MHc912L2sLnZqadUrTboyXZC+ZlgEBeJ14GyjPTu8ZyfEhGUnw==", + "dependencies": { + "AspNetCoreRateLimit": "4.0.2", + "StackExchange.Redis": "2.5.43" + } + }, "AWSSDK.Core": { "type": "Transitive", "resolved": "3.7.10.11", @@ -448,14 +457,14 @@ "Microsoft.Extensions.Options": "3.1.8" } }, - "Microsoft.Extensions.Caching.Redis": { + "Microsoft.Extensions.Caching.StackExchangeRedis": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "cb21miiGDVjlNl8TRBKIi7OEFdlKuV8d4ZoYqFOhKdZhzo7Sv+b8Puy3NLW3y/g+UDclt7FTh+Za7ykurtaVMQ==", + "resolved": "6.0.6", + "contentHash": "bdVQpYm1hcHf0pyAypMjtDw3HjWQJ89UzloyyF1OBs56QlgA1naM498tP2Vjlho5vVRALMGPYzdRKCen8koubw==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "StackExchange.Redis.StrongName": "1.2.6" + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "StackExchange.Redis": "2.2.4" } }, "Microsoft.Extensions.Configuration": { @@ -692,8 +701,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "VdLJOCXhZaEMY7Hm2GKiULmn7IEPFE4XC5LPSfBVCUIA8YLZVh846gtfBJalsPQF2PlzdD7ecX7DZEulJ402ZQ==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -731,11 +740,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "+FWlwd//+Tt56316p00hVePBCouXyEzT86Jb3+AuRotTND0IYn0OO3obs1gnQEs/txEnt+rF2JBGLItTG+Be6A==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Security.AccessControl": "4.5.0", - "System.Security.Principal.Windows": "4.5.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Win32.SystemEvents": { @@ -822,6 +831,14 @@ "resolved": "1.2.2", "contentHash": "2hrZfkbzeWJ3tNXXt/1beg4IY+nS4F3gIfh4NVFvW0f6Pj51hGpiJ4prBz7Dmrr4ZYrA96rTERVGieZ4xYm7jA==" }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.2", + "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, "Portable.BouncyCastle": { "type": "Transitive", "resolved": "1.9.0", @@ -1149,34 +1166,13 @@ "Serilog.Sinks.PeriodicBatching": "2.3.0" } }, - "StackExchange.Redis.StrongName": { + "StackExchange.Redis": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "UFmT1/JYu1PLiRwkyvEPVHk/tVTJa8Ka2rb9yzidzDoQARvhBVRpaWUeaP81373v54jupDBvAoGHGl0EY/HphQ==", + "resolved": "2.5.43", + "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "System.Threading.Timer": "4.3.0" + "Pipelines.Sockets.Unofficial": "2.2.2", + "System.Diagnostics.PerformanceCounter": "5.0.0" } }, "starkbank-ecdsa": { @@ -1240,15 +1236,15 @@ }, "System.Collections.NonGeneric": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "4.0.1", + "contentHash": "hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" } }, "System.Collections.Specialized": { @@ -1315,6 +1311,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1540,6 +1547,11 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, "System.Linq": { "type": "Transitive", "resolved": "4.3.0", @@ -1640,23 +1652,23 @@ }, "System.Net.NameResolution": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "resolved": "4.0.0", + "contentHash": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Net.Primitives": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Handles": "4.0.1", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "runtime.native.System": "4.0.0" } }, "System.Net.NetworkInformation": { @@ -2233,11 +2245,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "U77HfRXlZlOeIXd//Yoj6Jnk8AXlbeisf1oq1os+hxOGVnuG+lGSfGqTwTZBoORFF6j/0q7HXIl8cqwQ9aUGqQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0" - } + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Security.SecureString": { "type": "Transitive", @@ -2513,6 +2522,7 @@ "AWSSDK.SQS": "3.7.2.47", "AWSSDK.SimpleEmail": "3.7.0.150", "AspNetCoreRateLimit": "4.0.2", + "AspNetCoreRateLimit.Redis": "1.0.1", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.2.1", "Azure.Storage.Blobs": "12.11.0", "Azure.Storage.Queues": "12.9.0", @@ -2527,7 +2537,7 @@ "Microsoft.Azure.Cosmos.Table": "1.0.8", "Microsoft.Azure.NotificationHubs": "4.1.0", "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Extensions.Caching.Redis": "2.2.0", + "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", "Microsoft.Extensions.Identity.Stores": "6.0.4", @@ -2548,7 +2558,7 @@ "migrator": { "type": "Project", "dependencies": { - "Core": "2022.5.2", + "Core": "2022.6.0", "Microsoft.Extensions.Logging": "6.0.0", "dbup-sqlserver": "4.5.0" }