Merge pull request #8548 from abpframework/maliming/AbpWildcardSubdomainCorsPolicyService

Add AbpWildcardSubdomainCorsPolicyService.

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs

@@ -40,7 +40,7 @@ namespace Volo.Abp.IdentityServer
                     AbsoluteExpirationRelativeToNow = Options.Caching.CorsExpiration
                 });
 
-            var isAllowed = cacheItem.AllowedOrigins.Contains(origin, StringComparer.OrdinalIgnoreCase);
+            var isAllowed = await IsOriginAllowedAsync(cacheItem.AllowedOrigins, origin);
 
             if (!isAllowed)
             {
@@ -63,5 +63,10 @@ namespace Volo.Abp.IdentityServer
                 };
             }
         }
+
+        protected virtual Task<bool> IsOriginAllowedAsync(string[] allowedOrigins, string origin)
+        {
+            return Task.FromResult(allowedOrigins.Contains(origin, StringComparer.OrdinalIgnoreCase));
+        }
     }
 }

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerServiceCollectionExtensions.cs

@@ -1,4 +1,5 @@
-using IdentityServer4.Validation;
+using IdentityServer4.Services;
+using IdentityServer4.Validation;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
@@ -15,5 +16,10 @@ namespace Volo.Abp.IdentityServer
         {
             services.Replace(ServiceDescriptor.Transient<IClientConfigurationValidator, AbpClientConfigurationValidator>());
         }
+
+        public static void AddAbpWildcardSubdomainCorsPolicyService(this IServiceCollection services)
+        {
+            services.Replace(ServiceDescriptor.Transient<ICorsPolicyService, AbpWildcardSubdomainCorsPolicyService>());
+        }
     }
 }

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Threading.Tasks;
+using IdentityServer4.Configuration;
+using Microsoft.Extensions.Options;
+using Volo.Abp.Caching;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Text.Formatting;
+
+namespace Volo.Abp.IdentityServer
+{
+    public class AbpWildcardSubdomainCorsPolicyService : AbpCorsPolicyService
+    {
+        public AbpWildcardSubdomainCorsPolicyService(
+            IDistributedCache<AllowedCorsOriginsCacheItem> cache,
+            IHybridServiceScopeFactory hybridServiceScopeFactory,
+            IOptions<IdentityServerOptions> options)
+                : base(cache, hybridServiceScopeFactory, options)
+        {
+
+        }
+
+        protected override async Task<bool> IsOriginAllowedAsync(string[] allowedOrigins, string origin)
+        {
+            var isAllowed = await base.IsOriginAllowedAsync(allowedOrigins, origin);
+            if (isAllowed)
+            {
+                return true;
+            }
+
+            foreach (var url in allowedOrigins)
+            {
+                var extractResult = FormattedStringValueExtracter.Extract(origin, url, ignoreCase: true);
+                if (extractResult.IsMatch)
+                {
+                    return true;
+                }
+
+                if (url.Replace("{0}.", "").Contains(origin, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}

modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService_Tests.cs

@@ -0,0 +1,40 @@
+using System.Threading.Tasks;
+using IdentityServer4.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.IdentityServer
+{
+    public class AbpWildcardSubdomainCorsPolicyService_Tests : AbpIdentityServerTestBase
+    {
+        private readonly ICorsPolicyService _corsPolicyService;
+
+        public AbpWildcardSubdomainCorsPolicyService_Tests()
+        {
+            _corsPolicyService = GetRequiredService<ICorsPolicyService>();
+        }
+
+        protected override void AfterAddApplication(IServiceCollection services)
+        {
+            services.AddAbpWildcardSubdomainCorsPolicyService();
+        }
+
+        [Fact]
+        public void Should_Register_AbpWildcardSubdomainCorsPolicyService()
+        {
+            _corsPolicyService.GetType().ShouldBe(typeof(AbpWildcardSubdomainCorsPolicyService));
+        }
+
+        [Fact]
+        public async Task IsOriginAllowedAsync()
+        {
+            (await _corsPolicyService.IsOriginAllowedAsync("https://client1-origin.com")).ShouldBeTrue();
+            (await _corsPolicyService.IsOriginAllowedAsync("https://client2-origin.com")).ShouldBeFalse();
+
+            (await _corsPolicyService.IsOriginAllowedAsync("https://abp.io")).ShouldBeTrue();
+            (await _corsPolicyService.IsOriginAllowedAsync("https://t1.abp.io")).ShouldBeTrue();
+            (await _corsPolicyService.IsOriginAllowedAsync("https://t1.ng.abp.io")).ShouldBeTrue();
+        }
+    }
+}

modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs

@@ -148,6 +148,7 @@ namespace Volo.Abp.IdentityServer
             };
 
             client.AddCorsOrigin("https://client1-origin.com");
+            client.AddCorsOrigin("https://{0}.abp.io");
             client.AddClaim(nameof(ClientClaim.Value), nameof(ClientClaim.Type));
             client.AddGrantType(nameof(ClientGrantType.GrantType));
             client.AddIdentityProviderRestriction(nameof(ClientIdPRestriction.Provider));