diff --git a/bitwarden_license/src/Commercial.Core/packages.lock.json b/bitwarden_license/src/Commercial.Core/packages.lock.json index e87e310e8c..a432e7ac38 100644 --- a/bitwarden_license/src/Commercial.Core/packages.lock.json +++ b/bitwarden_license/src/Commercial.Core/packages.lock.json @@ -162,6 +162,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -198,49 +216,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -318,10 +295,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -354,8 +331,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2450,10 +2427,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json index 7fc67e1eb7..86b2eec18d 100644 --- a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json +++ b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json @@ -180,6 +180,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -216,49 +234,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -350,10 +327,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -386,8 +363,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2613,10 +2590,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/bitwarden_license/src/Scim/packages.lock.json b/bitwarden_license/src/Scim/packages.lock.json index e3b83c4ed4..152fab7bf3 100644 --- a/bitwarden_license/src/Scim/packages.lock.json +++ b/bitwarden_license/src/Scim/packages.lock.json @@ -184,6 +184,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -220,49 +238,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -354,10 +331,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -390,8 +367,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2617,10 +2594,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/bitwarden_license/src/Sso/Controllers/AccountController.cs b/bitwarden_license/src/Sso/Controllers/AccountController.cs index 40d4d1f42a..0df6894175 100644 --- a/bitwarden_license/src/Sso/Controllers/AccountController.cs +++ b/bitwarden_license/src/Sso/Controllers/AccountController.cs @@ -16,14 +16,15 @@ using Bit.Core.Tokens; using Bit.Core.Utilities; using Bit.Sso.Models; using Bit.Sso.Utilities; +using Duende.IdentityServer; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using IdentityModel; -using IdentityServer4; -using IdentityServer4.Extensions; -using IdentityServer4.Services; -using IdentityServer4.Stores; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; +using DIM = Duende.IdentityServer.Models; namespace Bit.Sso.Controllers; @@ -717,7 +718,7 @@ public class AccountController : Controller return (logoutId, logout?.PostLogoutRedirectUri, externalAuthenticationScheme); } - public bool IsNativeClient(IdentityServer4.Models.AuthorizationRequest context) + public bool IsNativeClient(DIM.AuthorizationRequest context) { return !context.RedirectUri.StartsWith("https", StringComparison.Ordinal) && !context.RedirectUri.StartsWith("http", StringComparison.Ordinal); diff --git a/bitwarden_license/src/Sso/Controllers/HomeController.cs b/bitwarden_license/src/Sso/Controllers/HomeController.cs index ee15fefc90..7be9d86215 100644 --- a/bitwarden_license/src/Sso/Controllers/HomeController.cs +++ b/bitwarden_license/src/Sso/Controllers/HomeController.cs @@ -1,6 +1,6 @@ using System.Diagnostics; using Bit.Sso.Models; -using IdentityServer4.Services; +using Duende.IdentityServer.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Diagnostics; using Microsoft.AspNetCore.Mvc; diff --git a/bitwarden_license/src/Sso/IdentityServer/OidcIdentityClient.cs b/bitwarden_license/src/Sso/IdentityServer/OidcIdentityClient.cs index 8629da07e7..ce835e378b 100644 --- a/bitwarden_license/src/Sso/IdentityServer/OidcIdentityClient.cs +++ b/bitwarden_license/src/Sso/IdentityServer/OidcIdentityClient.cs @@ -1,6 +1,6 @@ using Bit.Core.Settings; -using IdentityServer4; -using IdentityServer4.Models; +using Duende.IdentityServer; +using Duende.IdentityServer.Models; namespace Bit.Sso.IdentityServer; diff --git a/bitwarden_license/src/Sso/Models/ErrorViewModel.cs b/bitwarden_license/src/Sso/Models/ErrorViewModel.cs index 46ae8edd90..1f6e9735e7 100644 --- a/bitwarden_license/src/Sso/Models/ErrorViewModel.cs +++ b/bitwarden_license/src/Sso/Models/ErrorViewModel.cs @@ -1,4 +1,4 @@ -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace Bit.Sso.Models; diff --git a/bitwarden_license/src/Sso/Startup.cs b/bitwarden_license/src/Sso/Startup.cs index 635c91f441..f6be418bd8 100644 --- a/bitwarden_license/src/Sso/Startup.cs +++ b/bitwarden_license/src/Sso/Startup.cs @@ -6,7 +6,7 @@ using Bit.Core.Settings; using Bit.Core.Utilities; using Bit.SharedWeb.Utilities; using Bit.Sso.Utilities; -using IdentityServer4.Extensions; +using Duende.IdentityServer.Extensions; using Microsoft.IdentityModel.Logging; using Stripe; diff --git a/bitwarden_license/src/Sso/Utilities/DiscoveryResponseGenerator.cs b/bitwarden_license/src/Sso/Utilities/DiscoveryResponseGenerator.cs index 7a7f569638..73ac789ea7 100644 --- a/bitwarden_license/src/Sso/Utilities/DiscoveryResponseGenerator.cs +++ b/bitwarden_license/src/Sso/Utilities/DiscoveryResponseGenerator.cs @@ -1,13 +1,14 @@ using Bit.Core.Settings; using Bit.Core.Utilities; -using IdentityServer4.Configuration; -using IdentityServer4.Services; -using IdentityServer4.Stores; -using IdentityServer4.Validation; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Validation; +using DIR = Duende.IdentityServer.ResponseHandling; namespace Bit.Sso.Utilities; -public class DiscoveryResponseGenerator : IdentityServer4.ResponseHandling.DiscoveryResponseGenerator +public class DiscoveryResponseGenerator : DIR.DiscoveryResponseGenerator { private readonly GlobalSettings _globalSettings; diff --git a/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs b/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs index 1487697279..17a7b9e8c7 100644 --- a/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs +++ b/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs @@ -7,9 +7,9 @@ using Bit.Core.Settings; using Bit.Core.Utilities; using Bit.Sso.Models; using Bit.Sso.Utilities; +using Duende.IdentityServer; +using Duende.IdentityServer.Infrastructure; using IdentityModel; -using IdentityServer4; -using IdentityServer4.Infrastructure; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.Extensions.Options; @@ -34,7 +34,7 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider private readonly Dictionary _cachedSchemes; private readonly Dictionary _cachedHandlerSchemes; private readonly SemaphoreSlim _semaphore; - private readonly IHttpContextAccessor _httpContextAccessor; + private readonly IServiceProvider _serviceProvider; private DateTime? _lastSchemeLoad; private IEnumerable _schemesCopy = Array.Empty(); @@ -50,7 +50,7 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider ILogger logger, GlobalSettings globalSettings, SamlEnvironment samlEnvironment, - IHttpContextAccessor httpContextAccessor) + IServiceProvider serviceProvider) : base(options) { _oidcPostConfigureOptions = oidcPostConfigureOptions; @@ -77,7 +77,7 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider _cachedSchemes = new Dictionary(); _cachedHandlerSchemes = new Dictionary(); _semaphore = new SemaphoreSlim(1); - _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor)); + _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider)); } private bool CacheIsValid @@ -324,7 +324,7 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider oidcOptions.Scope.AddIfNotExists(OpenIdConnectScopes.Acr); } - oidcOptions.StateDataFormat = new DistributedCacheStateDataFormatter(_httpContextAccessor, name); + oidcOptions.StateDataFormat = new DistributedCacheStateDataFormatter(_serviceProvider, name); // see: https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest (acr_values) if (!string.IsNullOrWhiteSpace(config.AcrValues)) diff --git a/bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs b/bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs index cd4aa707d6..a64374b652 100644 --- a/bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs +++ b/bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs @@ -4,8 +4,8 @@ using Bit.Core.Utilities; using Bit.SharedWeb.Utilities; using Bit.Sso.IdentityServer; using Bit.Sso.Models; -using IdentityServer4.Models; -using IdentityServer4.ResponseHandling; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.ResponseHandling; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Sustainsys.Saml2.AspNetCore2; @@ -59,6 +59,7 @@ public static class ServiceCollectionExtensions options.UserInteraction.ErrorIdParameter = "errorId"; } options.InputLengthRestrictions.UserName = 256; + options.KeyManagement.Enabled = false; }) .AddInMemoryCaching() .AddInMemoryClients(new List diff --git a/bitwarden_license/src/Sso/packages.lock.json b/bitwarden_license/src/Sso/packages.lock.json index d428050d50..ce589b096b 100644 --- a/bitwarden_license/src/Sso/packages.lock.json +++ b/bitwarden_license/src/Sso/packages.lock.json @@ -209,6 +209,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -245,49 +263,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -421,10 +398,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -457,8 +434,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.AspNetCore.Http.Abstractions": { "type": "Transitive", @@ -2777,10 +2754,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/bitwarden_license/test/Commercial.Core.Test/packages.lock.json b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json index 7b4ee1f8ce..4b2b6fdd5e 100644 --- a/bitwarden_license/test/Commercial.Core.Test/packages.lock.json +++ b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json @@ -239,6 +239,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -283,49 +301,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -412,10 +389,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -448,8 +425,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2710,10 +2687,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json b/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json index 529d7d8377..3f5575a874 100644 --- a/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json +++ b/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json @@ -282,6 +282,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -326,49 +344,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -469,10 +446,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -505,8 +482,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.AspNetCore.TestHost": { "type": "Transitive", @@ -3019,10 +2996,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/bitwarden_license/test/Scim.Test/packages.lock.json b/bitwarden_license/test/Scim.Test/packages.lock.json index c74090345c..d7f1ce34b2 100644 --- a/bitwarden_license/test/Scim.Test/packages.lock.json +++ b/bitwarden_license/test/Scim.Test/packages.lock.json @@ -270,6 +270,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -314,49 +332,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -457,10 +434,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -493,8 +470,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2872,10 +2849,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/perf/MicroBenchmarks/packages.lock.json b/perf/MicroBenchmarks/packages.lock.json index aa71419abb..f8fabd2ea6 100644 --- a/perf/MicroBenchmarks/packages.lock.json +++ b/perf/MicroBenchmarks/packages.lock.json @@ -192,6 +192,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -233,49 +251,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -353,10 +330,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -389,8 +366,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2557,10 +2534,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/Admin/packages.lock.json b/src/Admin/packages.lock.json index 2282e9217b..a7edbdf763 100644 --- a/src/Admin/packages.lock.json +++ b/src/Admin/packages.lock.json @@ -223,6 +223,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -259,49 +277,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -393,10 +370,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -429,8 +406,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2834,10 +2811,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/Api/Program.cs b/src/Api/Program.cs index b44ffa835f..2fd25eaefa 100644 --- a/src/Api/Program.cs +++ b/src/Api/Program.cs @@ -31,8 +31,8 @@ public class Program return e.Level >= globalSettings.MinLogLevel.ApiSettings.IpRateLimit; } - if (context.Contains("IdentityServer4.Validation.TokenValidator") || - context.Contains("IdentityServer4.Validation.TokenRequestValidator")) + if (context.Contains("Duende.IdentityServer.Validation.TokenValidator") || + context.Contains("Duende.IdentityServer.Validation.TokenRequestValidator")) { return e.Level >= globalSettings.MinLogLevel.ApiSettings.IdentityToken; } diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json index 3ad880ecb3..432d80cab6 100644 --- a/src/Api/packages.lock.json +++ b/src/Api/packages.lock.json @@ -307,6 +307,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -343,49 +361,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -477,10 +454,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -513,8 +490,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2814,10 +2791,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/Billing/packages.lock.json b/src/Billing/packages.lock.json index e3b83c4ed4..152fab7bf3 100644 --- a/src/Billing/packages.lock.json +++ b/src/Billing/packages.lock.json @@ -184,6 +184,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -220,49 +238,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -354,10 +331,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -390,8 +367,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2617,10 +2594,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index 28415e8c03..1b06babb7c 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -31,7 +31,6 @@ - @@ -48,7 +47,7 @@ - + diff --git a/src/Core/IdentityServer/ApiScopes.cs b/src/Core/IdentityServer/ApiScopes.cs index ad2f242f73..6e3ce0d140 100644 --- a/src/Core/IdentityServer/ApiScopes.cs +++ b/src/Core/IdentityServer/ApiScopes.cs @@ -1,4 +1,4 @@ -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace Bit.Core.IdentityServer; diff --git a/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs b/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs index 084f98a275..476159b760 100644 --- a/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs +++ b/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs @@ -1,5 +1,5 @@ using Bit.Core.Settings; -using IdentityServer4.Configuration; +using Duende.IdentityServer.Configuration; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Caching.StackExchangeRedis; diff --git a/src/Core/packages.lock.json b/src/Core/packages.lock.json index 42e7ee5b6f..a716238631 100644 --- a/src/Core/packages.lock.json +++ b/src/Core/packages.lock.json @@ -131,6 +131,16 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Direct", + "requested": "[6.0.4, )", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, "Fido2.AspNet": { "type": "Direct", "requested": "[3.0.1, )", @@ -150,29 +160,6 @@ "Microsoft.CSharp": "4.7.0" } }, - "IdentityServer4": { - "type": "Direct", - "requested": "[4.1.2, )", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Direct", - "requested": "[3.0.1, )", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, "LaunchDarkly.ServerSdk": { "type": "Direct", "requested": "[8.0.0, )", @@ -465,6 +452,15 @@ "resolved": "2.2.1", "contentHash": "A6Zr52zVqJKt18ZBsTnX0qhG0kwIQftVAjLmszmkiR/trSp8H+xj1gUOzk7XHwaKgyREMSV1v9XaKrBUeIOdvQ==" }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -484,28 +480,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -554,10 +530,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -590,8 +566,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", diff --git a/src/Events/Program.cs b/src/Events/Program.cs index e09cfc17e6..6b53e4b18c 100644 --- a/src/Events/Program.cs +++ b/src/Events/Program.cs @@ -16,8 +16,8 @@ public class Program logging.AddSerilog(hostingContext, (e, globalSettings) => { var context = e.Properties["SourceContext"].ToString(); - if (context.Contains("IdentityServer4.Validation.TokenValidator") || - context.Contains("IdentityServer4.Validation.TokenRequestValidator")) + if (context.Contains("Duende.IdentityServer.Validation.TokenValidator") || + context.Contains("Duende.IdentityServer.Validation.TokenRequestValidator")) { return e.Level >= globalSettings.MinLogLevel.EventsSettings.IdentityToken; } diff --git a/src/Events/packages.lock.json b/src/Events/packages.lock.json index e3b83c4ed4..152fab7bf3 100644 --- a/src/Events/packages.lock.json +++ b/src/Events/packages.lock.json @@ -184,6 +184,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -220,49 +238,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -354,10 +331,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -390,8 +367,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2617,10 +2594,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/EventsProcessor/packages.lock.json b/src/EventsProcessor/packages.lock.json index e3b83c4ed4..152fab7bf3 100644 --- a/src/EventsProcessor/packages.lock.json +++ b/src/EventsProcessor/packages.lock.json @@ -184,6 +184,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -220,49 +238,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -354,10 +331,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -390,8 +367,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2617,10 +2594,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/Icons/packages.lock.json b/src/Icons/packages.lock.json index 0d79d90e31..705ea80ff8 100644 --- a/src/Icons/packages.lock.json +++ b/src/Icons/packages.lock.json @@ -193,6 +193,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -229,49 +247,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -363,10 +340,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -399,8 +376,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2626,10 +2603,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/Identity/Controllers/SsoController.cs b/src/Identity/Controllers/SsoController.cs index e5fc6a0eb4..e5dfc0ac60 100644 --- a/src/Identity/Controllers/SsoController.cs +++ b/src/Identity/Controllers/SsoController.cs @@ -5,9 +5,9 @@ using Bit.Core.Entities; using Bit.Core.Models.Api; using Bit.Core.Repositories; using Bit.Identity.Models; +using Duende.IdentityServer; +using Duende.IdentityServer.Services; using IdentityModel; -using IdentityServer4; -using IdentityServer4.Services; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Mvc; @@ -267,7 +267,7 @@ public class SsoController : Controller } } - private bool IsNativeClient(IdentityServer4.Models.AuthorizationRequest context) + private bool IsNativeClient(Duende.IdentityServer.Models.AuthorizationRequest context) { return !context.RedirectUri.StartsWith("https", StringComparison.Ordinal) && !context.RedirectUri.StartsWith("http", StringComparison.Ordinal); diff --git a/src/Identity/IdentityServer/ApiClient.cs b/src/Identity/IdentityServer/ApiClient.cs index 7457a8d0e9..d4eafe1d48 100644 --- a/src/Identity/IdentityServer/ApiClient.cs +++ b/src/Identity/IdentityServer/ApiClient.cs @@ -1,5 +1,5 @@ using Bit.Core.Settings; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace Bit.Identity.IdentityServer; diff --git a/src/Identity/IdentityServer/ApiResources.cs b/src/Identity/IdentityServer/ApiResources.cs index d23c06d7db..aa4104127c 100644 --- a/src/Identity/IdentityServer/ApiResources.cs +++ b/src/Identity/IdentityServer/ApiResources.cs @@ -1,7 +1,7 @@ using Bit.Core.Identity; using Bit.Core.IdentityServer; +using Duende.IdentityServer.Models; using IdentityModel; -using IdentityServer4.Models; namespace Bit.Identity.IdentityServer; diff --git a/src/Identity/IdentityServer/AuthorizationCodeStore.cs b/src/Identity/IdentityServer/AuthorizationCodeStore.cs index da63d9c4ad..8215532ba8 100644 --- a/src/Identity/IdentityServer/AuthorizationCodeStore.cs +++ b/src/Identity/IdentityServer/AuthorizationCodeStore.cs @@ -1,13 +1,12 @@ -using IdentityServer4; -using IdentityServer4.Extensions; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Stores; -using IdentityServer4.Stores.Serialization; +using Duende.IdentityServer; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Stores.Serialization; namespace Bit.Identity.IdentityServer; -// ref: https://raw.githubusercontent.com/IdentityServer/IdentityServer4/3.1.3/src/IdentityServer4/src/Stores/Default/DefaultAuthorizationCodeStore.cs public class AuthorizationCodeStore : DefaultGrantStore, IAuthorizationCodeStore { public AuthorizationCodeStore( diff --git a/src/Identity/IdentityServer/BaseRequestValidator.cs b/src/Identity/IdentityServer/BaseRequestValidator.cs index c01dc22303..40db804be3 100644 --- a/src/Identity/IdentityServer/BaseRequestValidator.cs +++ b/src/Identity/IdentityServer/BaseRequestValidator.cs @@ -22,7 +22,7 @@ using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Tokens; using Bit.Core.Utilities; -using IdentityServer4.Validation; +using Duende.IdentityServer.Validation; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Caching.Distributed; diff --git a/src/Identity/IdentityServer/ClientStore.cs b/src/Identity/IdentityServer/ClientStore.cs index 259898f209..19a4f8ffa8 100644 --- a/src/Identity/IdentityServer/ClientStore.cs +++ b/src/Identity/IdentityServer/ClientStore.cs @@ -11,9 +11,9 @@ using Bit.Core.SecretsManager.Repositories; using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Utilities; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Stores; using IdentityModel; -using IdentityServer4.Models; -using IdentityServer4.Stores; namespace Bit.Identity.IdentityServer; diff --git a/src/Identity/IdentityServer/CustomTokenRequestValidator.cs b/src/Identity/IdentityServer/CustomTokenRequestValidator.cs index 00f563154f..0ebd6f8ae7 100644 --- a/src/Identity/IdentityServer/CustomTokenRequestValidator.cs +++ b/src/Identity/IdentityServer/CustomTokenRequestValidator.cs @@ -10,9 +10,9 @@ using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Tokens; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; using IdentityModel; -using IdentityServer4.Extensions; -using IdentityServer4.Validation; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Caching.Distributed; diff --git a/src/Identity/IdentityServer/PersistedGrantStore.cs b/src/Identity/IdentityServer/PersistedGrantStore.cs index 5a3b15f627..9d8ebffd0d 100644 --- a/src/Identity/IdentityServer/PersistedGrantStore.cs +++ b/src/Identity/IdentityServer/PersistedGrantStore.cs @@ -1,6 +1,6 @@ using Bit.Core.Auth.Repositories; -using IdentityServer4.Models; -using IdentityServer4.Stores; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Stores; using Grant = Bit.Core.Auth.Entities.Grant; namespace Bit.Identity.IdentityServer; diff --git a/src/Identity/IdentityServer/ProfileService.cs b/src/Identity/IdentityServer/ProfileService.cs index bbec6739ba..09866c6b57 100644 --- a/src/Identity/IdentityServer/ProfileService.cs +++ b/src/Identity/IdentityServer/ProfileService.cs @@ -5,8 +5,8 @@ using Bit.Core.Identity; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Utilities; -using IdentityServer4.Models; -using IdentityServer4.Services; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; namespace Bit.Identity.IdentityServer; diff --git a/src/Identity/IdentityServer/ResourceOwnerPasswordValidator.cs b/src/Identity/IdentityServer/ResourceOwnerPasswordValidator.cs index 52e39e64a6..8db6aab7cd 100644 --- a/src/Identity/IdentityServer/ResourceOwnerPasswordValidator.cs +++ b/src/Identity/IdentityServer/ResourceOwnerPasswordValidator.cs @@ -11,8 +11,8 @@ using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Tokens; using Bit.Core.Utilities; -using IdentityServer4.Models; -using IdentityServer4.Validation; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Validation; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Caching.Distributed; diff --git a/src/Identity/IdentityServer/StaticClientStore.cs b/src/Identity/IdentityServer/StaticClientStore.cs index 537f389925..811880dde2 100644 --- a/src/Identity/IdentityServer/StaticClientStore.cs +++ b/src/Identity/IdentityServer/StaticClientStore.cs @@ -1,6 +1,6 @@ using Bit.Core.Enums; using Bit.Core.Settings; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace Bit.Identity.IdentityServer; diff --git a/src/Identity/IdentityServer/VaultCorsPolicyService.cs b/src/Identity/IdentityServer/VaultCorsPolicyService.cs index 867644c54b..f8e76dd527 100644 --- a/src/Identity/IdentityServer/VaultCorsPolicyService.cs +++ b/src/Identity/IdentityServer/VaultCorsPolicyService.cs @@ -1,6 +1,6 @@ using Bit.Core.Settings; using Bit.Core.Utilities; -using IdentityServer4.Services; +using Duende.IdentityServer.Services; namespace Bit.Identity.IdentityServer; diff --git a/src/Identity/IdentityServer/WebAuthnGrantValidator.cs b/src/Identity/IdentityServer/WebAuthnGrantValidator.cs index 8d3761d6c0..a959b63840 100644 --- a/src/Identity/IdentityServer/WebAuthnGrantValidator.cs +++ b/src/Identity/IdentityServer/WebAuthnGrantValidator.cs @@ -11,9 +11,9 @@ using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Tokens; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Validation; using Fido2NetLib; -using IdentityServer4.Models; -using IdentityServer4.Validation; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Caching.Distributed; diff --git a/src/Identity/Program.cs b/src/Identity/Program.cs index 2ca52bffe7..31a69975ad 100644 --- a/src/Identity/Program.cs +++ b/src/Identity/Program.cs @@ -29,8 +29,8 @@ public class Program return e.Level >= globalSettings.MinLogLevel.IdentitySettings.IpRateLimit; } - if (context.Contains("IdentityServer4.Validation.TokenValidator") || - context.Contains("IdentityServer4.Validation.TokenRequestValidator")) + if (context.Contains("Duende.IdentityServer.Validation.TokenValidator") || + context.Contains("Duende.IdentityServer.Validation.TokenRequestValidator")) { return e.Level >= globalSettings.MinLogLevel.IdentitySettings.IdentityToken; } diff --git a/src/Identity/Startup.cs b/src/Identity/Startup.cs index 472dad809f..9a7874820d 100644 --- a/src/Identity/Startup.cs +++ b/src/Identity/Startup.cs @@ -10,7 +10,7 @@ using Bit.Core.Settings; using Bit.Core.Utilities; using Bit.Identity.Utilities; using Bit.SharedWeb.Utilities; -using IdentityServer4.Extensions; +using Duende.IdentityServer.Extensions; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.IdentityModel.Logging; using Microsoft.OpenApi.Models; diff --git a/src/Identity/Utilities/DiscoveryResponseGenerator.cs b/src/Identity/Utilities/DiscoveryResponseGenerator.cs index da06180989..58d9252f2d 100644 --- a/src/Identity/Utilities/DiscoveryResponseGenerator.cs +++ b/src/Identity/Utilities/DiscoveryResponseGenerator.cs @@ -1,13 +1,13 @@ using Bit.Core.Settings; using Bit.Core.Utilities; -using IdentityServer4.Configuration; -using IdentityServer4.Services; -using IdentityServer4.Stores; -using IdentityServer4.Validation; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Validation; namespace Bit.Identity.Utilities; -public class DiscoveryResponseGenerator : IdentityServer4.ResponseHandling.DiscoveryResponseGenerator +public class DiscoveryResponseGenerator : Duende.IdentityServer.ResponseHandling.DiscoveryResponseGenerator { private readonly GlobalSettings _globalSettings; diff --git a/src/Identity/Utilities/ServiceCollectionExtensions.cs b/src/Identity/Utilities/ServiceCollectionExtensions.cs index 53b9c49e90..e1dd510ecc 100644 --- a/src/Identity/Utilities/ServiceCollectionExtensions.cs +++ b/src/Identity/Utilities/ServiceCollectionExtensions.cs @@ -2,9 +2,9 @@ using Bit.Core.Settings; using Bit.Identity.IdentityServer; using Bit.SharedWeb.Utilities; -using IdentityServer4.ResponseHandling; -using IdentityServer4.Services; -using IdentityServer4.Stores; +using Duende.IdentityServer.ResponseHandling; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; namespace Bit.Identity.Utilities; @@ -35,6 +35,7 @@ public static class ServiceCollectionExtensions options.Authentication.CookieSameSiteMode = Microsoft.AspNetCore.Http.SameSiteMode.Unspecified; } options.InputLengthRestrictions.UserName = 256; + options.KeyManagement.Enabled = false; }) .AddInMemoryCaching() .AddInMemoryApiResources(ApiResources.GetApiResources()) diff --git a/src/Identity/packages.lock.json b/src/Identity/packages.lock.json index 39d46d594b..76b71301d4 100644 --- a/src/Identity/packages.lock.json +++ b/src/Identity/packages.lock.json @@ -193,6 +193,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -229,49 +247,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -363,10 +340,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -399,8 +376,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2639,10 +2616,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/Infrastructure.Dapper/packages.lock.json b/src/Infrastructure.Dapper/packages.lock.json index 54c4ee47e3..a1e930670e 100644 --- a/src/Infrastructure.Dapper/packages.lock.json +++ b/src/Infrastructure.Dapper/packages.lock.json @@ -168,6 +168,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -204,49 +222,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -324,10 +301,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -360,8 +337,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2456,10 +2433,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/Infrastructure.EntityFramework/packages.lock.json b/src/Infrastructure.EntityFramework/packages.lock.json index 4726641520..11b1e49bcb 100644 --- a/src/Infrastructure.EntityFramework/packages.lock.json +++ b/src/Infrastructure.EntityFramework/packages.lock.json @@ -242,6 +242,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -278,49 +296,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -403,10 +380,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -439,8 +416,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2619,10 +2596,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/Notifications/Program.cs b/src/Notifications/Program.cs index 48221c2c4e..072c2404c4 100644 --- a/src/Notifications/Program.cs +++ b/src/Notifications/Program.cs @@ -17,8 +17,8 @@ public class Program logging.AddSerilog(hostingContext, (e, globalSettings) => { var context = e.Properties["SourceContext"].ToString(); - if (context.Contains("IdentityServer4.Validation.TokenValidator") || - context.Contains("IdentityServer4.Validation.TokenRequestValidator")) + if (context.Contains("Duende.IdentityServer.Validation.TokenValidator") || + context.Contains("Duende.IdentityServer.Validation.TokenRequestValidator")) { return e.Level >= globalSettings.MinLogLevel.NotificationsSettings.IdentityToken; } diff --git a/src/Notifications/packages.lock.json b/src/Notifications/packages.lock.json index 093b338ca5..945466f30f 100644 --- a/src/Notifications/packages.lock.json +++ b/src/Notifications/packages.lock.json @@ -205,6 +205,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -241,49 +259,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -394,10 +371,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Connections.Abstractions": { @@ -439,8 +416,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.AspNetCore.SignalR.Common": { "type": "Transitive", @@ -2667,10 +2644,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs index 2a2a06efe0..a526ee7420 100644 --- a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs +++ b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs @@ -33,10 +33,10 @@ using Bit.Core.Vault.Services; using Bit.Infrastructure.Dapper; using Bit.Infrastructure.EntityFramework; using DnsClient; +using Duende.IdentityServer.Configuration; using IdentityModel; -using IdentityServer4.AccessTokenValidation; -using IdentityServer4.Configuration; using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; @@ -435,16 +435,24 @@ public static class ServiceCollectionExtensions this IServiceCollection services, GlobalSettings globalSettings, IWebHostEnvironment environment, Action addAuthorization) { - services - .AddAuthentication(IdentityServerAuthenticationDefaults.AuthenticationScheme) - .AddIdentityServerAuthentication(options => + services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) + .AddJwtBearer(options => { + options.MapInboundClaims = false; options.Authority = globalSettings.BaseServiceUri.InternalIdentity; options.RequireHttpsMetadata = !environment.IsDevelopment() && globalSettings.BaseServiceUri.InternalIdentity.StartsWith("https"); - options.TokenRetriever = TokenRetrieval.FromAuthorizationHeaderOrQueryString(); - options.NameClaimType = ClaimTypes.Email; - options.SupportedTokens = SupportedTokens.Jwt; + options.TokenValidationParameters.ValidateAudience = false; + options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" }; + options.TokenValidationParameters.NameClaimType = ClaimTypes.Email; + options.Events = new JwtBearerEvents + { + OnMessageReceived = (context) => + { + context.Token = TokenRetrieval.FromAuthorizationHeaderOrQueryString()(context.Request); + return Task.CompletedTask; + } + }; }); if (addAuthorization != null) diff --git a/src/SharedWeb/packages.lock.json b/src/SharedWeb/packages.lock.json index 1eb437f1e9..49f69e5168 100644 --- a/src/SharedWeb/packages.lock.json +++ b/src/SharedWeb/packages.lock.json @@ -184,6 +184,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -220,49 +238,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -354,10 +331,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -390,8 +367,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2617,10 +2594,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/Api.IntegrationTest/Factories/ApiApplicationFactory.cs b/test/Api.IntegrationTest/Factories/ApiApplicationFactory.cs index dc27ad5068..90a2335c22 100644 --- a/test/Api.IntegrationTest/Factories/ApiApplicationFactory.cs +++ b/test/Api.IntegrationTest/Factories/ApiApplicationFactory.cs @@ -1,6 +1,6 @@ using Bit.Core.Auth.Models.Api.Request.Accounts; using Bit.IntegrationTestCommon.Factories; -using IdentityServer4.AccessTokenValidation; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.TestHost; using Microsoft.Data.Sqlite; @@ -27,12 +27,12 @@ public class ApiApplicationFactory : WebApplicationFactoryBase builder.ConfigureTestServices(services => { // Remove scheduled background jobs to prevent errors in parallel test execution - var jobService = services.First(sd => sd.ServiceType == typeof(Microsoft.Extensions.Hosting.IHostedService) && sd.ImplementationType == typeof(Bit.Api.Jobs.JobsHostedService)); + var jobService = services.First(sd => sd.ServiceType == typeof(IHostedService) && sd.ImplementationType == typeof(Jobs.JobsHostedService)); services.Remove(jobService); - services.PostConfigure(IdentityServerAuthenticationDefaults.AuthenticationScheme, options => + services.Configure(JwtBearerDefaults.AuthenticationScheme, options => { - options.JwtBackChannelHandler = _identityApplicationFactory.Server.CreateHandler(); + options.BackchannelHttpHandler = _identityApplicationFactory.Server.CreateHandler(); }); }); } diff --git a/test/Api.IntegrationTest/packages.lock.json b/test/Api.IntegrationTest/packages.lock.json index f9546c72f3..d6a2819d25 100644 --- a/test/Api.IntegrationTest/packages.lock.json +++ b/test/Api.IntegrationTest/packages.lock.json @@ -364,6 +364,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -408,49 +426,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -551,10 +528,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -587,8 +564,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.AspNetCore.Mvc.Testing": { "type": "Transitive", @@ -3202,10 +3179,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/Api.Test/packages.lock.json b/test/Api.Test/packages.lock.json index 2021ff15c1..b693e7a651 100644 --- a/test/Api.Test/packages.lock.json +++ b/test/Api.Test/packages.lock.json @@ -374,6 +374,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -418,49 +436,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -561,10 +538,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -597,8 +574,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -3079,10 +3056,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/Billing.Test/packages.lock.json b/test/Billing.Test/packages.lock.json index a96af9daaa..6b13d059d9 100644 --- a/test/Billing.Test/packages.lock.json +++ b/test/Billing.Test/packages.lock.json @@ -280,6 +280,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -324,49 +342,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -467,10 +444,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -503,8 +480,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2889,10 +2866,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/Common/packages.lock.json b/test/Common/packages.lock.json index 73363ce175..4884fdbc15 100644 --- a/test/Common/packages.lock.json +++ b/test/Common/packages.lock.json @@ -254,6 +254,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -298,49 +316,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -418,10 +395,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -454,8 +431,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2690,10 +2667,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/Core.Test/packages.lock.json b/test/Core.Test/packages.lock.json index 323fe132db..0a6178c3e3 100644 --- a/test/Core.Test/packages.lock.json +++ b/test/Core.Test/packages.lock.json @@ -260,6 +260,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -304,49 +322,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -424,10 +401,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -460,8 +437,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2708,10 +2685,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/Icons.Test/packages.lock.json b/test/Icons.Test/packages.lock.json index f0262577a7..01fe4b7877 100644 --- a/test/Icons.Test/packages.lock.json +++ b/test/Icons.Test/packages.lock.json @@ -278,6 +278,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -322,49 +340,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -465,10 +442,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -501,8 +478,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2880,10 +2857,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/Identity.IntegrationTest/Endpoints/IdentityServerSsoTests.cs b/test/Identity.IntegrationTest/Endpoints/IdentityServerSsoTests.cs index 8e9e82c6b7..d9d8d17886 100644 --- a/test/Identity.IntegrationTest/Endpoints/IdentityServerSsoTests.cs +++ b/test/Identity.IntegrationTest/Endpoints/IdentityServerSsoTests.cs @@ -15,9 +15,9 @@ using Bit.Core.Services; using Bit.Core.Utilities; using Bit.IntegrationTestCommon.Factories; using Bit.Test.Common.Helpers; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Stores; using IdentityModel; -using IdentityServer4.Models; -using IdentityServer4.Stores; using Microsoft.EntityFrameworkCore; using NSubstitute; using Xunit; @@ -564,7 +564,7 @@ public class IdentityServerSsoTests new Claim(JwtClaimTypes.SessionId, "SOMETHING"), new Claim(JwtClaimTypes.AuthenticationMethod, "external"), new Claim(JwtClaimTypes.AuthenticationTime, DateTime.UtcNow.AddMinutes(-1).ToEpochTime().ToString()) - }, "IdentityServer4", JwtClaimTypes.Name, JwtClaimTypes.Role)); + }, "Duende.IdentityServer", JwtClaimTypes.Name, JwtClaimTypes.Role)); authorizationCode.Subject = subject; diff --git a/test/Identity.IntegrationTest/openid-configuration.json b/test/Identity.IntegrationTest/openid-configuration.json index 97e8105f48..e593a93007 100644 --- a/test/Identity.IntegrationTest/openid-configuration.json +++ b/test/Identity.IntegrationTest/openid-configuration.json @@ -4,6 +4,7 @@ "authorization_endpoint": "http://localhost:33656/connect/authorize", "token_endpoint": "http://localhost:33656/connect/token", "device_authorization_endpoint": "http://localhost:33656/connect/deviceauthorization", + "backchannel_authentication_endpoint": "http://localhost:33656/connect/ciba", "scopes_supported": [ "api", "api.push", @@ -39,6 +40,7 @@ "implicit", "password", "urn:ietf:params:oauth:grant-type:device_code", + "urn:openid:params:grant-type:ciba", "webauthn" ], "response_types_supported": [ @@ -58,5 +60,22 @@ "id_token_signing_alg_values_supported": ["RS256"], "subject_types_supported": ["public"], "code_challenge_methods_supported": ["plain", "S256"], - "request_parameter_supported": true + "request_parameter_supported": true, + "request_object_signing_alg_values_supported": [ + "RS256", + "RS384", + "RS512", + "PS256", + "PS384", + "PS512", + "ES256", + "ES384", + "ES512", + "HS256", + "HS384", + "HS512" + ], + "authorization_response_iss_parameter_supported": true, + "backchannel_token_delivery_modes_supported": ["poll"], + "backchannel_user_code_parameter_supported": true } diff --git a/test/Identity.IntegrationTest/packages.lock.json b/test/Identity.IntegrationTest/packages.lock.json index ea0971bf85..987f1dd8ed 100644 --- a/test/Identity.IntegrationTest/packages.lock.json +++ b/test/Identity.IntegrationTest/packages.lock.json @@ -282,6 +282,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -326,49 +344,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -469,10 +446,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -505,8 +482,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.AspNetCore.TestHost": { "type": "Transitive", @@ -3019,10 +2996,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/Identity.Test/packages.lock.json b/test/Identity.Test/packages.lock.json index 46c741ee13..e75c99c888 100644 --- a/test/Identity.Test/packages.lock.json +++ b/test/Identity.Test/packages.lock.json @@ -271,6 +271,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -315,49 +333,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -458,10 +435,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -494,8 +471,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2894,10 +2871,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/Infrastructure.EFIntegration.Test/packages.lock.json b/test/Infrastructure.EFIntegration.Test/packages.lock.json index 25b11c6713..681f903f63 100644 --- a/test/Infrastructure.EFIntegration.Test/packages.lock.json +++ b/test/Infrastructure.EFIntegration.Test/packages.lock.json @@ -272,6 +272,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -316,49 +334,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -459,10 +436,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -495,8 +472,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2874,10 +2851,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/Infrastructure.IntegrationTest/packages.lock.json b/test/Infrastructure.IntegrationTest/packages.lock.json index 760c2e0a17..19af74e817 100644 --- a/test/Infrastructure.IntegrationTest/packages.lock.json +++ b/test/Infrastructure.IntegrationTest/packages.lock.json @@ -254,6 +254,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -290,49 +308,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -424,10 +401,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -460,8 +437,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2732,10 +2709,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/test/IntegrationTestCommon/packages.lock.json b/test/IntegrationTestCommon/packages.lock.json index 7057b9d5c8..efd3418b75 100644 --- a/test/IntegrationTestCommon/packages.lock.json +++ b/test/IntegrationTestCommon/packages.lock.json @@ -249,6 +249,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -293,49 +311,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "Kralizek.AutoFixture.Extensions.MockHttp": { "type": "Transitive", @@ -436,10 +413,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -472,8 +449,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.AspNetCore.TestHost": { "type": "Transitive", @@ -3004,10 +2981,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/util/Migrator/packages.lock.json b/util/Migrator/packages.lock.json index 0996e6bb86..af385f825f 100644 --- a/util/Migrator/packages.lock.json +++ b/util/Migrator/packages.lock.json @@ -195,6 +195,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -231,49 +249,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -351,10 +328,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -387,8 +364,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2654,10 +2631,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/util/MsSqlMigratorUtility/packages.lock.json b/util/MsSqlMigratorUtility/packages.lock.json index 10f060423a..8920d9d057 100644 --- a/util/MsSqlMigratorUtility/packages.lock.json +++ b/util/MsSqlMigratorUtility/packages.lock.json @@ -217,6 +217,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -253,49 +271,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -373,10 +350,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -409,8 +386,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2692,10 +2669,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/util/MySqlMigrations/packages.lock.json b/util/MySqlMigrations/packages.lock.json index 928d2b5bac..6ed5a13382 100644 --- a/util/MySqlMigrations/packages.lock.json +++ b/util/MySqlMigrations/packages.lock.json @@ -191,6 +191,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -232,49 +250,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -366,10 +343,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -402,8 +379,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2642,10 +2619,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/util/PostgresMigrations/packages.lock.json b/util/PostgresMigrations/packages.lock.json index 928d2b5bac..6ed5a13382 100644 --- a/util/PostgresMigrations/packages.lock.json +++ b/util/PostgresMigrations/packages.lock.json @@ -191,6 +191,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -232,49 +250,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -366,10 +343,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -402,8 +379,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2642,10 +2619,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/util/Setup/packages.lock.json b/util/Setup/packages.lock.json index 65d2baadff..e4a9d303b6 100644 --- a/util/Setup/packages.lock.json +++ b/util/Setup/packages.lock.json @@ -209,6 +209,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -237,49 +255,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -357,10 +334,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -393,8 +370,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2660,10 +2637,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/util/SqlServerEFScaffold/packages.lock.json b/util/SqlServerEFScaffold/packages.lock.json index 3955596862..f0316096f5 100644 --- a/util/SqlServerEFScaffold/packages.lock.json +++ b/util/SqlServerEFScaffold/packages.lock.json @@ -299,6 +299,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -340,49 +358,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -474,10 +451,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -510,8 +487,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2853,10 +2830,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", diff --git a/util/SqliteMigrations/packages.lock.json b/util/SqliteMigrations/packages.lock.json index 928d2b5bac..6ed5a13382 100644 --- a/util/SqliteMigrations/packages.lock.json +++ b/util/SqliteMigrations/packages.lock.json @@ -191,6 +191,24 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Duende.IdentityServer": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "4HVjzx1F8v5J+U7oa8RGAQGj2QzmzNSu87r18Sh+dlh10uyZZL8teAaT/FaVLDObnfItGdPFvN8mwpF/HkI3Xw==", + "dependencies": { + "Duende.IdentityServer.Storage": "6.0.4", + "Microsoft.AspNetCore.Authentication.OpenIdConnect": "6.0.0" + } + }, + "Duende.IdentityServer.Storage": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "s5gAjfbpr2IMgI+fU2Nx+2AZdzstmbt9gpo13iX7GwvqSeSaBVqj9ZskAN0R2KF1OemPdZuGnfaTcevdXMUrrw==", + "dependencies": { + "IdentityModel": "6.0.0", + "Microsoft.AspNetCore.DataProtection.Abstractions": "6.0.0" + } + }, "Fido2": { "type": "Transitive", "resolved": "3.0.1", @@ -232,49 +250,8 @@ }, "IdentityModel": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b18wrIx5wnZlMxAX7oVsE+nDtAJ4hajYlH0xPlaRvo4r/fz08K6pPeZvbiqS9nfNbzfIgLFmNX+FL9qR9ZR5PA==", - "dependencies": { - "Newtonsoft.Json": "11.0.2", - "System.Text.Encodings.Web": "4.7.0" - } - }, - "IdentityModel.AspNetCore.OAuth2Introspection": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "ZNdMZMaj9fqR3j50vYsu+1U3QGd6n8+fqwf+a8mCTcmXGor+HgFDfdq0mM34bsmD6uEgAQup7sv2ZW5kR36dbA==", - "dependencies": { - "IdentityModel": "4.0.0" - } - }, - "IdentityServer4": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "blaxxGuOA7v/w1q+fxn97wZ+x2ecG1ZD4mc/N/ZOXMNeFZZhqv+4LF26Gecyik3nWrJPmbMEtQbLmRsKG8k61w==", - "dependencies": { - "IdentityModel": "4.4.0", - "IdentityServer4.Storage": "4.1.2", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "3.1.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.6.0", - "Newtonsoft.Json": "12.0.2" - } - }, - "IdentityServer4.AccessTokenValidation": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "qu/M6UyN4o9NVep7q545Ms7hYAnsQqSdLbN1Fjjrn4m35lyBfeQPSSNzDryAKHbodyWOQfHaOqKEyMEJQ5Rpgw==", - "dependencies": { - "IdentityModel.AspNetCore.OAuth2Introspection": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "3.0.0" - } - }, - "IdentityServer4.Storage": { - "type": "Transitive", - "resolved": "4.1.2", - "contentHash": "KoSffyZyyeCNTIyJiZnCuPakJ1QbCHlpty6gbWUj/7yl+w0PXIchgmmJnJSvddzBb8iZ2xew/vGlxWUIP17P2g==", - "dependencies": { - "IdentityModel": "4.4.0" - } + "resolved": "6.0.0", + "contentHash": "eVHCR7a6m/dm5RFcBzE3qs/Jg5j9R5Rjpu8aTOv9e4AFvaQtBXb5ah7kmwU+YwA0ufRwz4wf1hnIvsD2hSnI4g==" }, "LaunchDarkly.Cache": { "type": "Transitive", @@ -366,10 +343,10 @@ }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "O1cAQYUTU8EfRqwc5/rfTns4E4hKlFlg59fuKRrST+PzsxI6H07KqRN/JjdYhAuVYxF8jPnIGbj+zuc5paOWUw==", + "resolved": "6.0.0", + "contentHash": "cJxdro36spFzk/K2OFCddM6vZ+yoj6ug8mTFRH3Gdv1Pul/buSuCtfb/FSCp31UmS5S4C1315dU7wX3ErLFuDg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "5.5.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, "Microsoft.AspNetCore.Cryptography.Internal": { @@ -402,8 +379,8 @@ }, "Microsoft.AspNetCore.DataProtection.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + "resolved": "6.0.0", + "contentHash": "Z/UU4NEBm5UgNufJmw+j5baW26ytCOIZ0G7sZocPaOzsUeBon1bkM3lSMNZQG2GmDjAIVP2XMSODf2jzSGbibw==" }, "Microsoft.Azure.Amqp": { "type": "Transitive", @@ -2642,10 +2619,9 @@ "BitPay.Light": "[1.0.1907, )", "Braintree": "[5.19.0, )", "DnsClient": "[1.7.0, )", + "Duende.IdentityServer": "[6.0.4, )", "Fido2.AspNet": "[3.0.1, )", "Handlebars.Net": "[2.1.2, )", - "IdentityServer4": "[4.1.2, )", - "IdentityServer4.AccessTokenValidation": "[3.0.1, )", "LaunchDarkly.ServerSdk": "[8.0.0, )", "MailKit": "[4.2.0, )", "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )",