Skip to content

Reuse the CookieOptions instance instead of creating one for each operation #2492

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
kevinchalet merged 1 commit into from
Jul 5, 2026
+6 −18
Merged

Reuse the CookieOptions instance instead of creating one for each operation #2492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/OpenIddict.Client.AspNetCore/OpenIddictClientAspNetCoreHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,15 +446,15 @@ static bool TryGetRequestForgeryProtection(ReadOnlySpan<char> input, [NotNullWhe
{
// Extract the payload and validate the version marker.
var payload = Base64Url.DecodeFromChars(input);
if (payload.Length < (1 + sizeof(uint)) || payload[0] is not 0x01)
if (payload.Length is < (1 + sizeof(uint)) || payload[0] is not 0x01)
{
output = null;
return false;
}

// Extract the length of the request forgery protection.
var length = (int) BinaryPrimitives.ReadUInt32BigEndian(payload.AsSpan(1, sizeof(uint)));
if (length is 0 || length != (payload.Length - (1 + sizeof(uint))))
if (length != (payload.Length - (1 + sizeof(uint))))
{
output = null;
return false;
Expand Down
20 changes: 4 additions & 16 deletions src/OpenIddict.Client.Owin/OpenIddictClientOwinHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,6 @@ public ValueTask HandleAsync(ProcessAuthenticationContext context)
throw new InvalidOperationException(SR.GetResourceString(SR.ID0354));
}

// Resolve the cookie manager and the cookie options from the OWIN integration options.
var (manager, options) = (
_options.CurrentValue.CookieManager,
_options.CurrentValue.CookieOptions);

// Compute the name of the cookie name based on the prefix and the random nonce.
var name = new StringBuilder(_options.CurrentValue.CookieName)
.Append(Separators.Dot)
Expand All @@ -419,7 +414,7 @@ public ValueTask HandleAsync(ProcessAuthenticationContext context)
//
// In any case, the authentication demand MUST be rejected as it's impossible to ensure
// it's not an injection or session fixation attack without the correlation cookie.
var value = manager.GetRequestCookie(request.Context, name);
var value = _options.CurrentValue.CookieManager.GetRequestCookie(request.Context, name);
if (string.IsNullOrEmpty(value))
{
context.Reject(
Expand Down Expand Up @@ -447,14 +442,7 @@ public ValueTask HandleAsync(ProcessAuthenticationContext context)
// Return a response header asking the browser to delete the state cookie.
//
// Note: when deleting a cookie, the same options used when creating it MUST be specified.
manager.DeleteCookie(request.Context, name, new CookieOptions
{
Domain = options.Domain,
HttpOnly = options.HttpOnly,
Path = options.Path,
SameSite = options.SameSite,
Secure = options.Secure
});
_options.CurrentValue.CookieManager.DeleteCookie(request.Context, name, _options.CurrentValue.CookieOptions);

return ValueTask.CompletedTask;

Expand All @@ -464,15 +452,15 @@ static bool TryGetRequestForgeryProtection(ReadOnlySpan<char> input, [NotNullWhe
{
// Extract the payload and validate the version marker.
var payload = Base64Url.DecodeFromChars(input);
if (payload.Length < (1 + sizeof(uint)) || payload[0] is not 0x01)
if (payload.Length is < (1 + sizeof(uint)) || payload[0] is not 0x01)
{
output = null;
return false;
}

// Extract the length of the request forgery protection.
var length = (int) BinaryPrimitives.ReadUInt32BigEndian(payload.AsSpan(1, sizeof(uint)));
if (length is 0 || length != (payload.Length - (1 + sizeof(uint))))
if (length != (payload.Length - (1 + sizeof(uint))))
{
output = null;
return false;
Expand Down