Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support wildcard domain in AppUrlProvider . #20628

Merged
merged 3 commits into from
Aug 27, 2024
Merged

Support wildcard domain in AppUrlProvider . #20628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa4a785
Support wildcard domain in `AppUrlProvider `.
maliming Aug 26, 2024
270afea
Rename to `UrlHelper`.
maliming Aug 26, 2024
52c9554
Update UrlHelpers_Tests.cs
maliming Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions framework/src/Volo.Abp.Core/Volo/Abp/Http/UrlHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
using System;

namespace Volo.Abp.Http;

public static class UrlHelpers
{
private const string WildcardSubdomain = "*.";

public static bool IsSubdomainOf(string subdomain, string domain)
{
if (Uri.TryCreate(subdomain, UriKind.Absolute, out var subdomainUri) &&
Uri.TryCreate(domain.Replace(WildcardSubdomain, string.Empty), UriKind.Absolute, out var domainUri))
{
return domainUri == subdomainUri || IsSubdomainOf(subdomainUri, domainUri);
}

return false;
}

public static bool IsSubdomainOf(Uri subdomain, Uri domain)
{
return subdomain.IsAbsoluteUri
&& domain.IsAbsoluteUri
&& subdomain.Scheme == domain.Scheme
&& subdomain.Port == domain.Port
&& subdomain.Host.EndsWith($".{domain.Host}", StringComparison.Ordinal);
}
}
4 changes: 3 additions & 1 deletion framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Http;
using Volo.Abp.MultiTenancy;

namespace Volo.Abp.UI.Navigation.Urls;
Expand Down Expand Up @@ -43,7 +44,8 @@ public virtual async Task<bool> IsRedirectAllowedUrlAsync(string url)
{
redirectAllowedUrls.Add((await NormalizeUrlAsync(redirectAllowedUrl))!);
}
var allow = redirectAllowedUrls.Any(x => url.StartsWith(x, StringComparison.CurrentCultureIgnoreCase));
var allow = redirectAllowedUrls.Any(x => url.StartsWith(x, StringComparison.CurrentCultureIgnoreCase) ||
UrlHelpers.IsSubdomainOf(url, x));
if (!allow)
{
Logger.LogError($"Invalid RedirectUrl: {url}, Use {nameof(AppUrlProvider)} to configure it!");
Expand Down
43 changes: 43 additions & 0 deletions framework/test/Volo.Abp.Core.Tests/Volo/Abp/Http/UrlHelpers_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
using Shouldly;
using Xunit;

namespace Volo.Abp.Http;

public class UrlHelpers_Tests
{
[Theory]
[InlineData(null)]
[InlineData("null")]
[InlineData("http://")]
[InlineData("http://*")]
[InlineData("http://.domain")]
[InlineData("http://.domain/hello")]
public void IsSubdomainOf_ReturnsFalseIfDomainIsMalformedUri(string domain)
{
var actual = UrlHelpers.IsSubdomainOf("http://*.domain", domain);
actual.ShouldBeFalse();
}

[Theory]
[InlineData("http://sub.domain", "http://domain")]
[InlineData("http://sub.domain", "http://*.domain")]
[InlineData("http://sub.sub.domain", "http://*.domain")]
[InlineData("http://sub.sub.domain", "http://*.sub.domain")]
[InlineData("http://sub.domain:4567", "http://*.domain:4567")]
public void IsSubdomainOf_ReturnsTrue_WhenASubdomain(string subdomain, string domain)
{
var actual = UrlHelpers.IsSubdomainOf(subdomain, domain);
actual.ShouldBeTrue();
}

[Theory]
[InlineData("http://sub.domain:1234", "http://*.domain:5678")]
[InlineData("http://sub.domain", "http://domain.*")]
[InlineData("http://sub.domain.hacker", "http://*.domain")]
[InlineData("https://sub.domain", "http://*.domain")]
public void IsSubdomainOf_ReturnsFalse_WhenNotASubdomain(string subdomain, string domain)
{
var actual = UrlHelpers.IsSubdomainOf(subdomain, domain);
actual.ShouldBeFalse();
}
}
11 changes: 8 additions & 3 deletions framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/AppUrlProvider_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ protected override void AfterAddApplication(IServiceCollection services)
"https://wwww.volosoft.com",
"https://wwww.aspnetzero.com",
"https://{{tenantName}}.abp.io",
"https://{{tenantId}}.abp.io"
"https://{{tenantId}}.abp.io",
"https://*.demo.myabp.io"
});

options.Applications["BLAZOR"].RootUrl = "https://{{tenantId}}.abp.io";
Expand Down Expand Up @@ -101,12 +102,16 @@ public async Task GetUrlOrNullAsync()
[Fact]
public async Task IsRedirectAllowedUrlAsync()
{
(await _appUrlProvider.IsRedirectAllowedUrlAsync("https://community.abp.io")).ShouldBeFalse();
(await _appUrlProvider.IsRedirectAllowedUrlAsync("https://wwww.volosoft.com")).ShouldBeTrue();
(await _appUrlProvider.IsRedirectAllowedUrlAsync("https://wwww.demo.myabp.io")).ShouldBeTrue();
(await _appUrlProvider.IsRedirectAllowedUrlAsync("https://demo.myabp.io")).ShouldBeTrue();
(await _appUrlProvider.IsRedirectAllowedUrlAsync("https://api.demo.myabp.io")).ShouldBeTrue();
(await _appUrlProvider.IsRedirectAllowedUrlAsync("https://test.api.demo.myabp.io")).ShouldBeTrue();
(await _appUrlProvider.IsRedirectAllowedUrlAsync("https://volosoft.com/demo.myabp.io")).ShouldBeFalse();
(await _appUrlProvider.IsRedirectAllowedUrlAsync("https://wwww.myabp.io")).ShouldBeFalse();

using (_currentTenant.Change(null))
{
(await _appUrlProvider.IsRedirectAllowedUrlAsync("https://www.abp.io")).ShouldBeFalse();
(await _appUrlProvider.IsRedirectAllowedUrlAsync("https://abp.io")).ShouldBeTrue();
}

Expand Down
Loading