Merge pull request #200 from Aguafrommars/master

fix 4.0.1
Aguafrommars · Mar 6, 2023 · 7f6fc9b · 7f6fc9b
2 parents 219d0ab + 22a45c1
commit 7f6fc9b
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 63 deletions.
diff --git a/TheIdServer.Duende/src/TIS.BlazorApp/TIS.BlazorApp.csproj b/TheIdServer.Duende/src/TIS.BlazorApp/TIS.BlazorApp.csproj
@@ -11,27 +11,27 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Api" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Apis" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Client" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Clients" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Culture" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Cultures" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Identities" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Identity" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Import" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Keys" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Role" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Roles" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.User" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Users" Version="7.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />		
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Api" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Apis" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Client" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Clients" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Culture" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Cultures" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Identities" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Identity" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Import" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Keys" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Role" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Roles" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.User" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.BlazorApp.Pages.Users" Version="7.1.2" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.3" PrivateAssets="all" />		
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/TheIdServer.Duende/src/TIS/Extensions/DataProtectionBuilderExtentions.cs b/TheIdServer.Duende/src/TIS/Extensions/DataProtectionBuilderExtentions.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 using Aguacongas.IdentityServer.Admin.Configuration;
 using Aguacongas.IdentityServer.EntityFramework.Store;
-using Aguacongas.IdentityServer.KeysRotation.RavenDb;
 using Azure.Identity;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
@@ -12,8 +11,8 @@
 using Microsoft.Win32;
 using StackExchange.Redis;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
 using TIS.Models;
 
@@ -71,6 +70,11 @@ public static IDataProtectionBuilder ConfigureDataProtection(this IDataProtectio
                         builder.ProtectKeysWithAzureKeyVault(new Uri(protectOptions.AzureKeyVaultKeyId), new DefaultAzureCredential());
                         break;
                     case KeyProtectionKind.WindowsDpApi:
+                        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                        {
+                            throw new PlatformNotSupportedException();
+                        }
+
                         builder.ProtectKeysWithDpapi(protectOptions.WindowsDPAPILocalMachine);
                         break;
                     case KeyProtectionKind.WindowsDpApiNg:
@@ -102,6 +106,11 @@ private static void ConfigureEncryptionAlgorithm(IDataProtectionBuilder builder,
 
         private static void ConfigureWindowsDpApiNg(IDataProtectionBuilder builder, KeyProtectionOptions protectOptions)
         {
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                throw new PlatformNotSupportedException();
+            }
+
             if (!string.IsNullOrEmpty(protectOptions.WindowsDpApiNgCerticate))
             {
                 builder.ProtectKeysWithDpapiNG($"CERTIFICATE=HashId:{protectOptions.WindowsDpApiNgCerticate}", flags: DpapiNGProtectionDescriptorFlags.None);

diff --git a/TheIdServer.Duende/src/TIS/Quickstart/Account/AccountController.cs b/TheIdServer.Duende/src/TIS/Quickstart/Account/AccountController.cs
@@ -20,6 +20,7 @@
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using TIS.Quickstart.Account;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace IdentityServerHost.Quickstart.UI
 {
@@ -352,7 +353,10 @@ private async Task<LoggedOutViewModel> BuildLoggedOutViewModelAsync(string logou
                 var idp = User.FindFirst(JwtClaimTypes.IdentityProvider)?.Value;
                 if (idp != null && idp != IdentityServerConstants.LocalIdentityProvider)
                 {
-                    var providerSupportsSignout = await HttpContext.GetSchemeSupportsSignOutAsync(idp);
+                    var provider = HttpContext.RequestServices.GetRequiredService<IAuthenticationHandlerProvider>();
+                    var handler = await provider.GetHandlerAsync(HttpContext, idp);
+                    var providerSupportsSignout = handler is IAuthenticationSignOutHandler;
+
                     if (providerSupportsSignout)
                     {
                         if (vm.LogoutId == null)

diff --git a/TheIdServer.Duende/src/TIS/TIS.csproj b/TheIdServer.Duende/src/TIS/TIS.csproj
@@ -8,41 +8,42 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Aguacongas.DynamicConfiguration.Redis" Version="1.0.0" />
-		<PackageReference Include="Aguacongas.DynamicConfiguration.WebApi" Version="1.0.0" />
+		<PackageReference Include="Aguacongas.DynamicConfiguration.Redis" Version="1.0.1" />
+		<PackageReference Include="Aguacongas.DynamicConfiguration.WebApi" Version="1.0.1" />
 		<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />
 		<PackageReference Include="AspNetCore.HealthChecks.RavenDb" Version="6.0.2" />
 		<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="6.0.4" />
-		<PackageReference Include="Aguacongas.IdentityServer.Admin.Duende" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.IdentityServer.EntityFramework.Store.Duende" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.IdentityServer.MongoDb.Store.Duende" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.IdentityServer.RavenDb.Store.Duende" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.IdentityServer.Http.Store" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.IdentityServer.WsFederation.Duende" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.Authentication" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.Identity" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.Migrations.MySql" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.Migrations.Oracle" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.Migrations.PostgreSQL" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.Migrations.Sqlite" Version="7.0.0" />
-		<PackageReference Include="Aguacongas.TheIdServer.Migrations.SqlServer" Version="7.0.0" />
-		<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.3" />
-		<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.1.0" />
-		<PackageReference Include="Azure.Identity" Version="1.8.0" />
+		<PackageReference Include="Aguacongas.IdentityServer.Admin.Duende" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.IdentityServer.EntityFramework.Store.Duende" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.IdentityServer.MongoDb.Store.Duende" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.IdentityServer.RavenDb.Store.Duende" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.IdentityServer.Http.Store" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.IdentityServer.WsFederation.Duende" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.Authentication" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.Identity" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.Migrations.MySql" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.Migrations.Oracle" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.Migrations.PostgreSQL" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.Migrations.Sqlite" Version="7.1.2" />
+		<PackageReference Include="Aguacongas.TheIdServer.Migrations.SqlServer" Version="7.1.2" />
+		<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.0" />
+		<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.0" />
+		<PackageReference Include="Azure.Identity" Version="1.8.2" />
 		<PackageReference Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="7.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.3" />
+		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="7.0.3" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.3" />		
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
-		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.0" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" PrivateAssets="All" />
 		<PackageReference Include="SendGrid" Version="9.28.1" />
 		<PackageReference Include="Serilog" Version="2.12.0" />
-		<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+		<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
 		<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
 		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
 		<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
@@ -54,4 +55,4 @@
 	<ItemGroup>
 		<ProjectReference Include="..\TIS.BlazorApp\TIS.BlazorApp.csproj" />
 	</ItemGroup>
-</Project>
+</Project>
diff --git a/...st/Microsoft.AspNetCore.Components.Testing/Microsoft.AspNetCore.Components.Testing.csproj b/...st/Microsoft.AspNetCore.Components.Testing/Microsoft.AspNetCore.Components.Testing.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.3" />
     <PackageReference Include="Fizzler.Systems.HtmlAgilityPack" Version="1.2.1" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
   </ItemGroup>

diff --git a/TheIdServer.Duende/test/TIS.IntegrationTest/TIS.IntegrationTest.csproj b/TheIdServer.Duende/test/TIS.IntegrationTest/TIS.IntegrationTest.csproj
@@ -11,12 +11,12 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-		<PackageReference Include="Moq" Version="4.18.2" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+		<PackageReference Include="Moq" Version="4.18.4" />
 		<PackageReference Include="xunit" Version="2.4.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 			<PrivateAssets>all</PrivateAssets>

diff --git a/TheIdServer.Duende/test/TIS.Test/TIS.Test.csproj b/TheIdServer.Duende/test/TIS.Test/TIS.Test.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>

diff --git a/appveyor.yml b/appveyor.yml
@@ -30,7 +30,7 @@ artifacts:
 deploy:
   - provider: NuGet
     api_key:
-      secure: bvkKhXIKsDM1ThfcWTbuusND0sOBiDoJGOoD2fYijGoj4C9xx22QKfR7Y9q+j7eX
+      secure: L5Ol2yiygLW8nUF6j5/rwx4feonMPly+S69GjoX1ilEUklPMixlX5RW2l8FJScNK
     on:
       branch: 
       - /preview\/*/