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

Add support for wildcard redirectsuris #44

Merged
merged 2 commits into from
Oct 3, 2020
Merged

Add support for wildcard redirectsuris #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6de7722
add support for wildcard in redirect urls
Yshayy Oct 3, 2020
c8dba81
fix
Yshayy Oct 3, 2020
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
2 changes: 1 addition & 1 deletion e2e/config/clients-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Description": "Client for implicit flow",
"AllowedGrantTypes": ["implicit"],
"AllowAccessTokensViaBrowser": true,
"RedirectUris": ["https://www.google.com"],
"RedirectUris": ["https://*.google.com"],
"AllowedScopes": ["openid", "profile", "email", "some-custom-identity"],
"IdentityTokenLifetime": 3600,
"AccessTokenLifetime": 3600
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/authorization-endpoint.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe('Authorization Endpoint', () => {
client_id: implicitFlowClient.ClientId,
scope: 'openid some-custom-identity',
response_type: 'id_token token',
redirect_uri: implicitFlowClient.RedirectUris?.[0],
redirect_uri: implicitFlowClient.RedirectUris?.[0].replace('*', 'www'),
state: 'abc',
nonce: 'xyz',
};
Expand All @@ -55,7 +55,7 @@ describe('Authorization Endpoint', () => {
await page.keyboard.press('Enter');
await page.waitForNavigation();
const redirectedUrl = new URL(page.url());
expect(redirectedUrl.origin).toEqual(implicitFlowClient.RedirectUris?.[0]);
expect(redirectedUrl.origin).toEqual(parameters.redirect_uri);
const hash = redirectedUrl.hash.slice(1);
const query = querystring.parse(hash);

Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/userinfo-endpoint.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe('UserInfo Endpoint', () => {
client_id: implicitFlowClient.ClientId,
scope: 'openid profile some-custom-identity',
response_type: 'id_token token',
redirect_uri: implicitFlowClient.RedirectUris?.[0],
redirect_uri: implicitFlowClient.RedirectUris?.[0].replace('*', 'www'),
state: 'abc',
nonce: 'xyz',
};
Expand All @@ -55,7 +55,7 @@ describe('UserInfo Endpoint', () => {
await page.keyboard.press('Enter');
await page.waitForNavigation();
const redirectedUrl = new URL(page.url());
expect(redirectedUrl.origin).toEqual(implicitFlowClient.RedirectUris?.[0]);
expect(redirectedUrl.origin).toEqual(parameters.redirect_uri);
const hash = redirectedUrl.hash.slice(1);
const query = querystring.parse(hash);

Expand Down
3 changes: 2 additions & 1 deletion src/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ public void ConfigureServices(IServiceCollection services)
.AddInMemoryApiResources(Config.GetApiResources())
.AddInMemoryApiScopes(Config.GetApiScopes())
.AddInMemoryClients(Config.GetClients())
.AddTestUsers(Config.GetUsers());
.AddTestUsers(Config.GetUsers())
.AddRedirectUriValidator<UriValidator>();

services.AddRouting();
services.AddCors();
Expand Down
28 changes: 28 additions & 0 deletions src/UriValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
using System.Threading.Tasks;
using IdentityServer4.Models;
using IdentityServer4.Validation;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System;
using System.Text.RegularExpressions;

namespace OpenIdConnectServer
{
internal class UriValidator : IRedirectUriValidator
{

public Task<bool> IsPostLogoutRedirectUriValidAsync(string requestedUri, Client client)
{
return Task.FromResult<bool>(client.RedirectUris.Any(allowedUri =>
Regex.Match(requestedUri, Regex.Escape(allowedUri).Replace("\\*", "[a-zA-Z0-9.]+?")).Success
));
}

public Task<bool> IsRedirectUriValidAsync(string requestedUri, Client client)
{
return Task.FromResult<bool>(client.RedirectUris.Any(allowedUri =>
Regex.Match(requestedUri, Regex.Escape(allowedUri).Replace("\\*", "[a-zA-Z0-9.]+?")).Success
)); }
}
}