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

Jump to bottom

Fix refresh token data fixup upgrade when using DefaultPersistedGrantService #1028

Merged
merged 1 commit into from
Oct 3, 2022
Merged

Fix refresh token data fixup upgrade when using DefaultPersistedGrantService #1028

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
28 changes: 2 additions & 26 deletions src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,35 +61,11 @@ public Task UpdateRefreshTokenAsync(string handle, RefreshToken refreshToken)
/// </summary>
/// <param name="refreshTokenHandle">The refresh token handle.</param>
/// <returns></returns>
public async Task<RefreshToken> GetRefreshTokenAsync(string refreshTokenHandle)
public Task<RefreshToken> GetRefreshTokenAsync(string refreshTokenHandle)
{
using var activity = Tracing.StoreActivitySource.StartActivity("DefaultRefreshTokenStore.GetRefreshToken");

var refreshToken = await GetItemAsync(refreshTokenHandle);

if (refreshToken != null && refreshToken.Version < 5)
{
#pragma warning disable CS0618 // Type or member is obsolete
var user = new IdentityServerUser(refreshToken.AccessToken.SubjectId);
if (refreshToken.AccessToken.Claims != null)
{
foreach (var claim in refreshToken.AccessToken.Claims)
{
user.AdditionalClaims.Add(claim);
}
}

refreshToken.Subject = user.CreatePrincipal();
refreshToken.ClientId = refreshToken.AccessToken.ClientId;
refreshToken.Description = refreshToken.AccessToken.Description;
refreshToken.AuthorizedScopes = refreshToken.AccessToken.Scopes;
refreshToken.SetAccessToken(refreshToken.AccessToken);
refreshToken.AccessToken = null;
refreshToken.Version = 5;
#pragma warning restore CS0618 // Type or member is obsolete
}

return refreshToken;
return GetItemAsync(refreshTokenHandle);
}

/// <summary>
Expand Down
34 changes: 32 additions & 2 deletions src/Storage/Stores/Serialization/PersistentGrantSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// See LICENSE in the project root for license information.


using Duende.IdentityServer.Models;
using Microsoft.AspNetCore.DataProtection;
using System;
using System.Text.Json;
Expand Down Expand Up @@ -94,7 +95,9 @@ public T Deserialize<T>(string json)

if (container.PersistentGrantDataContainerVersion == 0)
{
return JsonSerializer.Deserialize<T>(json, Settings);
var item = JsonSerializer.Deserialize<T>(json, Settings);
PostProcess(item as RefreshToken);
return item;
}

if (container.PersistentGrantDataContainerVersion == 1)
Expand All @@ -111,11 +114,38 @@ public T Deserialize<T>(string json)
payload = _provider.Unprotect(container.Payload);
}

return JsonSerializer.Deserialize<T>(payload, Settings);
var item = JsonSerializer.Deserialize<T>(payload, Settings);
PostProcess(item as RefreshToken);
return item;
}

throw new Exception($"Invalid version in persisted grant data: '{container.PersistentGrantDataContainerVersion}'.");
}

private void PostProcess(RefreshToken refreshToken)
{
if (refreshToken != null && refreshToken.Version < 5)
{
#pragma warning disable CS0618 // Type or member is obsolete
var user = new IdentityServerUser(refreshToken.AccessToken.SubjectId);
if (refreshToken.AccessToken.Claims != null)
{
foreach (var claim in refreshToken.AccessToken.Claims)
{
user.AdditionalClaims.Add(claim);
}
}

refreshToken.Subject = user.CreatePrincipal();
refreshToken.ClientId = refreshToken.AccessToken.ClientId;
refreshToken.Description = refreshToken.AccessToken.Description;
refreshToken.AuthorizedScopes = refreshToken.AccessToken.Scopes;
refreshToken.SetAccessToken(refreshToken.AccessToken);
refreshToken.AccessToken = null;
refreshToken.Version = 5;
#pragma warning restore CS0618 // Type or member is obsolete
}
}
}

class PersistentGrantDataContainer
Expand Down