Skip to content

missed code review fix :| #1733

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
StuartFerguson merged 2 commits into from
Sep 18, 2026
Merged

missed code review fix :| #1733

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c32252
missed code review fix :|
StuartFerguson Sep 18, 2026
3f393bd
Merge branch 'main' into bug/#1712_consent_flow_issuess
StuartFerguson Sep 18, 2026
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: 11 additions & 3 deletions SecurityService.BusinessLogic/Oidc/OidcRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,13 +359,21 @@ private async Task<AuthorizeCommandResult> CompleteAuthorization(

private bool MatchesOriginalRequest(HttpContext context, ConsentTransaction transaction)
{
if (!Uri.TryCreate(transaction.AuthorizationUrl, UriKind.Relative, out var originalUri) ||
!string.Equals(originalUri.AbsolutePath, context.Request.PathBase + context.Request.Path, StringComparison.Ordinal))
var queryStart = transaction.AuthorizationUrl.IndexOf('?');
var originalPath = queryStart >= 0
? transaction.AuthorizationUrl[..queryStart]
: transaction.AuthorizationUrl;

if (string.IsNullOrEmpty(originalPath) ||
originalPath[0] != '/' ||
transaction.AuthorizationUrl.Contains('#', StringComparison.Ordinal) ||
!string.Equals(originalPath, context.Request.PathBase + context.Request.Path, StringComparison.Ordinal))
{
return false;
}

var original = QueryHelpers.ParseQuery(originalUri.Query);
var originalQuery = queryStart >= 0 ? transaction.AuthorizationUrl[queryStart..] : string.Empty;
var original = QueryHelpers.ParseQuery(originalQuery);
foreach (var pair in original)
{
if (!context.Request.Query.TryGetValue(pair.Key, out var current) || !current.SequenceEqual(pair.Value))
Expand Down
Loading