Skip to content

Redirect to homepage if login page is requested when token auth is not enabled #5123

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

Merged
merged 6 commits into from
Aug 5, 2024
Merged

Redirect to homepage if login page is requested when token auth is not enabled #5123

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb95e86
Redirect to homepage if login page is requested when token auth is no…
adamint Jul 30, 2024
a743653
add ValidateTokenMiddleware tests
adamint Jul 31, 2024
18863ca
fix test names
adamint Jul 31, 2024
1baace5
remove nsubstitute
adamint Aug 1, 2024
d199dfe
remove unsecured testing changes
adamint Aug 1, 2024
9375985
Update src/Aspire.Dashboard/Model/ValidateTokenMiddleware.cs
JamesNK Aug 2, 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
14 changes: 8 additions & 6 deletions src/Aspire.Dashboard/Model/ValidateTokenMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,15 @@ public ValidateTokenMiddleware(RequestDelegate next, IOptionsMonitor<DashboardOp

public async Task InvokeAsync(HttpContext context)
{
if (context.Request.Path.Equals("/login", StringComparisons.UrlPath) && context.Request.Query.TryGetValue("t", out var value))
if (context.Request.Path.Equals("/login", StringComparisons.UrlPath))
{
if (_options.CurrentValue.Frontend.AuthMode == FrontendAuthMode.BrowserToken)
if (_options.CurrentValue.Frontend.AuthMode != FrontendAuthMode.BrowserToken)
{
_logger.LogDebug($"Request to validate token URL but auth mode isn't set to {FrontendAuthMode.BrowserToken}.");

context.Response.Redirect(DashboardUrls.ResourcesUrl());
}
else if (context.Request.Query.TryGetValue("t", out var value) && _options.CurrentValue.Frontend.AuthMode == FrontendAuthMode.BrowserToken)
{
var dashboardOptions = context.RequestServices.GetRequiredService<IOptionsMonitor<DashboardOptions>>();
if (await TryAuthenticateAsync(value.ToString(), context, dashboardOptions).ConfigureAwait(false))
Expand Down Expand Up @@ -62,10 +68,6 @@ public async Task InvokeAsync(HttpContext context)

return;
}
else
{
_logger.LogDebug($"Request to validate token URL but auth mode isn't set to {FrontendAuthMode.BrowserToken}.");
}
}

await _next(context).ConfigureAwait(false);
Expand Down