Skip to content

Undo adding properties to the new ticket #374

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
wcabus merged 1 commit into from
Aug 7, 2026
Merged

Undo adding properties to the new ticket #374

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
26 changes: 6 additions & 20 deletions IdentityServer/v7/SessionMigration/MigratingTicketDataFormat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,34 +78,21 @@ public AuthenticationTicket Unprotect(string protectedText, string purpose)
}
else
{
// Carry over relevant properties from the original ticket so the reference ticket
// (and the cookie) accurately reflects the original session state. Without this,
// persistent sessions would be downgraded to session cookies, and any downstream
// code inspecting properties on this request would see empty defaults.
var properties = new AuthenticationProperties
{
IsPersistent = ticket.Properties.IsPersistent,
IssuedUtc = ticket.Properties.IssuedUtc,
ExpiresUtc = ticket.Properties.ExpiresUtc,
AllowRefresh = ticket.Properties.AllowRefresh,
// NOTE: If your application stores custom data in Properties.Items or
// Properties.Parameters, you may want to copy those over as well.
};

// Generate a new AuthenticationTicket to return the new session cookie in the HTTP response
var principal = new ClaimsPrincipal(
new ClaimsIdentity(
new[] { new Claim(SessionIdClaim, sessionId, ClaimValueTypes.String, _options.ClaimsIssuer) },
_options.ClaimsIssuer));

ticket = new AuthenticationTicket(principal, properties, _scheme);
var newTicket = new AuthenticationTicket(principal, null, _scheme);
var cookieValue = _inner.Protect(newTicket, purpose);

var cookieValue = _inner.Protect(ticket, purpose);
// Reuse the properties from the original ticket to get the right cookie options (IsPersistent).
var cookieOptions = CreateCookieOptions(ticket, context);

// NOTE: AppendResponseCookie will throw if the response has already started
// (e.g. if headers have been sent). In a real implementation, guard against this
// or ensure migration runs early enough in the pipeline.
var cookieOptions = CreateCookieOptions(ticket, context);

_options.CookieManager.AppendResponseCookie(
context,
_options.Cookie.Name!,
Expand Down Expand Up @@ -141,8 +128,7 @@ private bool HasDuplicate(IServerSideTicketStore sessionStore, AuthenticationTic
SessionId = sid
};

var sessions = sessionStore.QuerySessionsAsync(filter,
_httpContextAccessor.HttpContext?.RequestAborted ?? CancellationToken.None)
var sessions = sessionStore.QuerySessionsAsync(filter, CancellationToken.None)
.GetAwaiter().GetResult();

// There should be only one entry, the one we just created.
Expand Down
26 changes: 6 additions & 20 deletions IdentityServer/v8/SessionMigration/MigratingTicketDataFormat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,34 +78,21 @@ public AuthenticationTicket Unprotect(string protectedText, string purpose)
}
else
{
// Carry over relevant properties from the original ticket so the reference ticket
// (and the cookie) accurately reflects the original session state. Without this,
// persistent sessions would be downgraded to session cookies, and any downstream
// code inspecting properties on this request would see empty defaults.
var properties = new AuthenticationProperties
{
IsPersistent = ticket.Properties.IsPersistent,
IssuedUtc = ticket.Properties.IssuedUtc,
ExpiresUtc = ticket.Properties.ExpiresUtc,
AllowRefresh = ticket.Properties.AllowRefresh,
// NOTE: If your application stores custom data in Properties.Items or
// Properties.Parameters, you may want to copy those over as well.
};

// Generate a new AuthenticationTicket to return the new session cookie in the HTTP response
var principal = new ClaimsPrincipal(
new ClaimsIdentity(
new[] { new Claim(SessionIdClaim, sessionId, ClaimValueTypes.String, _options.ClaimsIssuer) },
_options.ClaimsIssuer));

ticket = new AuthenticationTicket(principal, properties, _scheme);
var newTicket = new AuthenticationTicket(principal, null, _scheme);
var cookieValue = _inner.Protect(newTicket, purpose);

var cookieValue = _inner.Protect(ticket, purpose);
// Reuse the properties from the original ticket to get the right cookie options (IsPersistent).
var cookieOptions = CreateCookieOptions(ticket, context);

// NOTE: AppendResponseCookie will throw if the response has already started
// (e.g. if headers have been sent). In a real implementation, guard against this
// or ensure migration runs early enough in the pipeline.
var cookieOptions = CreateCookieOptions(ticket, context);

_options.CookieManager.AppendResponseCookie(
context,
_options.Cookie.Name!,
Expand Down Expand Up @@ -141,8 +128,7 @@ private bool HasDuplicate(IServerSideTicketStore sessionStore, AuthenticationTic
SessionId = sid
};

var sessions = sessionStore.QuerySessionsAsync(filter,
_httpContextAccessor.HttpContext?.RequestAborted ?? CancellationToken.None)
var sessions = sessionStore.QuerySessionsAsync(filter, CancellationToken.None)
.GetAwaiter().GetResult();

// There should be only one entry, the one we just created.
Expand Down
Loading