Skip to content

[release/6.0] RoleManager.RoleExistsAsync role name normalization issue #36050

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 1 commit into from
Sep 1, 2021
Merged

[release/6.0] RoleManager.RoleExistsAsync role name normalization issue #36050

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
2 changes: 1 addition & 1 deletion src/Identity/Extensions.Core/src/RoleManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public virtual async Task<bool> RoleExistsAsync(string roleName)
throw new ArgumentNullException(nameof(roleName));
}

return await FindByNameAsync(NormalizeKey(roleName)) != null;
return await FindByNameAsync(roleName) != null;
}

/// <summary>
Expand Down
12 changes: 8 additions & 4 deletions src/Identity/test/Identity.Test/RoleManagerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ public class RoleManagerTest
public async Task CreateCallsStore()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IRoleStore<PocoRole>>();
var role = new PocoRole { Name = "Foo" };
store.Setup(s => s.CreateAsync(role, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
store.Setup(s => s.GetRoleNameAsync(role, CancellationToken.None)).Returns(Task.FromResult(role.Name)).Verifiable();
store.Setup(s => s.SetNormalizedRoleNameAsync(role, role.Name.ToUpperInvariant(), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedRoleNameAsync(role, normalizer.NormalizeName(role.Name), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
var roleManager = MockHelpers.TestRoleManager(store.Object);

// Act
Expand All @@ -36,11 +37,12 @@ public async Task CreateCallsStore()
public async Task UpdateCallsStore()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IRoleStore<PocoRole>>();
var role = new PocoRole { Name = "Foo" };
store.Setup(s => s.UpdateAsync(role, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
store.Setup(s => s.GetRoleNameAsync(role, CancellationToken.None)).Returns(Task.FromResult(role.Name)).Verifiable();
store.Setup(s => s.SetNormalizedRoleNameAsync(role, role.Name.ToUpperInvariant(), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedRoleNameAsync(role, normalizer.NormalizeName(role.Name), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
var roleManager = MockHelpers.TestRoleManager(store.Object);

// Act
Expand All @@ -63,9 +65,10 @@ public void RolesQueryableFailWhenStoreNotImplemented()
public async Task FindByNameCallsStoreWithNormalizedName()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IRoleStore<PocoRole>>();
var role = new PocoRole { Name = "Foo" };
store.Setup(s => s.FindByNameAsync("FOO", CancellationToken.None)).Returns(Task.FromResult(role)).Verifiable();
store.Setup(s => s.FindByNameAsync(normalizer.NormalizeName("Foo"), CancellationToken.None)).Returns(Task.FromResult(role)).Verifiable();
var manager = MockHelpers.TestRoleManager(store.Object);

// Act
Expand Down Expand Up @@ -98,9 +101,10 @@ public async Task CanFindByNameCallsStoreWithoutNormalizedName()
public async Task RoleExistsCallsStoreWithNormalizedName()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IRoleStore<PocoRole>>();
var role = new PocoRole { Name = "Foo" };
store.Setup(s => s.FindByNameAsync("FOO", CancellationToken.None)).Returns(Task.FromResult(role)).Verifiable();
store.Setup(s => s.FindByNameAsync(normalizer.NormalizeName("Foo"), CancellationToken.None)).Returns(Task.FromResult(role)).Verifiable();
var manager = MockHelpers.TestRoleManager(store.Object);

// Act
Expand Down
65 changes: 38 additions & 27 deletions src/Identity/test/Identity.Test/UserManagerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,12 @@ public CustomRoleManager() : base(new Mock<IRoleStore<PocoRole>>().Object, null,
public async Task CreateCallsStore()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserStore<PocoUser>>();
var user = new PocoUser { UserName = "Foo" };
store.Setup(s => s.CreateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
store.Setup(s => s.GetUserNameAsync(user, CancellationToken.None)).Returns(Task.FromResult(user.UserName)).Verifiable();
store.Setup(s => s.SetNormalizedUserNameAsync(user, user.UserName.ToUpperInvariant(), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedUserNameAsync(user, normalizer.NormalizeName(user.UserName), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);

// Act
Expand Down Expand Up @@ -108,13 +109,14 @@ public async Task CreateUpdatesSecurityStampStore()
public async Task CreateCallsUpdateEmailStore()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserEmailStore<PocoUser>>();
var user = new PocoUser { UserName = "Foo", Email = "[email protected]" };
store.Setup(s => s.CreateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
store.Setup(s => s.GetUserNameAsync(user, CancellationToken.None)).Returns(Task.FromResult(user.UserName)).Verifiable();
store.Setup(s => s.GetEmailAsync(user, CancellationToken.None)).Returns(Task.FromResult(user.Email)).Verifiable();
store.Setup(s => s.SetNormalizedEmailAsync(user, user.Email.ToUpperInvariant(), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedUserNameAsync(user, user.UserName.ToUpperInvariant(), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedEmailAsync(user, normalizer.NormalizeEmail(user.Email), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedUserNameAsync(user, normalizer.NormalizeName(user.UserName), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);

// Act
Expand Down Expand Up @@ -146,10 +148,11 @@ public async Task DeleteCallsStore()
public async Task UpdateCallsStore()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserStore<PocoUser>>();
var user = new PocoUser { UserName = "Foo" };
store.Setup(s => s.GetUserNameAsync(user, CancellationToken.None)).Returns(Task.FromResult(user.UserName)).Verifiable();
store.Setup(s => s.SetNormalizedUserNameAsync(user, user.UserName.ToUpperInvariant(), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedUserNameAsync(user, normalizer.NormalizeName(user.UserName), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
var userManager = MockHelpers.TestUserManager(store.Object);

Expand All @@ -165,12 +168,13 @@ public async Task UpdateCallsStore()
public async Task UpdateWillUpdateNormalizedEmail()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserEmailStore<PocoUser>>();
var user = new PocoUser { UserName = "Foo", Email = "email" };
store.Setup(s => s.GetUserNameAsync(user, CancellationToken.None)).Returns(Task.FromResult(user.UserName)).Verifiable();
store.Setup(s => s.GetEmailAsync(user, CancellationToken.None)).Returns(Task.FromResult(user.Email)).Verifiable();
store.Setup(s => s.SetNormalizedUserNameAsync(user, user.UserName.ToUpperInvariant(), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedEmailAsync(user, user.Email.ToUpperInvariant(), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedUserNameAsync(user, normalizer.NormalizeName(user.UserName), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedEmailAsync(user, normalizer.NormalizeEmail(user.Email), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
var userManager = MockHelpers.TestUserManager(store.Object);

Expand All @@ -186,11 +190,12 @@ public async Task UpdateWillUpdateNormalizedEmail()
public async Task SetUserNameCallsStore()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserStore<PocoUser>>();
var user = new PocoUser();
store.Setup(s => s.SetUserNameAsync(user, "foo", CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.GetUserNameAsync(user, CancellationToken.None)).Returns(Task.FromResult("foo")).Verifiable();
store.Setup(s => s.SetNormalizedUserNameAsync(user, "FOO", CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetNormalizedUserNameAsync(user, normalizer.NormalizeName("foo"), CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).Returns(Task.FromResult(IdentityResult.Success)).Verifiable();
var userManager = MockHelpers.TestUserManager(store.Object);

Expand Down Expand Up @@ -223,9 +228,10 @@ public async Task FindByIdCallsStore()
public async Task FindByNameCallsStoreWithNormalizedName()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserStore<PocoUser>>();
var user = new PocoUser { UserName = "Foo" };
store.Setup(s => s.FindByNameAsync(user.UserName.ToUpperInvariant(), CancellationToken.None)).Returns(Task.FromResult(user)).Verifiable();
store.Setup(s => s.FindByNameAsync(normalizer.NormalizeName(user.UserName), CancellationToken.None)).Returns(Task.FromResult(user)).Verifiable();
var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);

// Act
Expand Down Expand Up @@ -258,9 +264,10 @@ public async Task CanFindByNameCallsStoreWithoutNormalizedName()
public async Task FindByEmailCallsStoreWithNormalizedEmail()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserEmailStore<PocoUser>>();
var user = new PocoUser { Email = "Foo" };
store.Setup(s => s.FindByEmailAsync(user.Email.ToUpperInvariant(), CancellationToken.None)).Returns(Task.FromResult(user)).Verifiable();
store.Setup(s => s.FindByEmailAsync(normalizer.NormalizeEmail(user.Email), CancellationToken.None)).Returns(Task.FromResult(user)).Verifiable();
var userManager = MockHelpers.TestUserManager(store.Object);

// Act
Expand Down Expand Up @@ -335,27 +342,28 @@ public async Task FindByNameCallsStoreWithCustomNormalizedName()
public async Task AddToRolesCallsStore()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserRoleStore<PocoUser>>();
var user = new PocoUser { UserName = "Foo" };
var roles = new string[] { "A", "B", "C", "C" };
store.Setup(s => s.AddToRoleAsync(user, "A", CancellationToken.None))
store.Setup(s => s.AddToRoleAsync(user, normalizer.NormalizeName("A"), CancellationToken.None))
.Returns(Task.FromResult(0))
.Verifiable();
store.Setup(s => s.AddToRoleAsync(user, "B", CancellationToken.None))
store.Setup(s => s.AddToRoleAsync(user, normalizer.NormalizeName("B"), CancellationToken.None))
.Returns(Task.FromResult(0))
.Verifiable();
store.Setup(s => s.AddToRoleAsync(user, "C", CancellationToken.None))
store.Setup(s => s.AddToRoleAsync(user, normalizer.NormalizeName("C"), CancellationToken.None))
.Returns(Task.FromResult(0))
.Verifiable();

store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
store.Setup(s => s.IsInRoleAsync(user, "A", CancellationToken.None))
store.Setup(s => s.IsInRoleAsync(user, normalizer.NormalizeName("A"), CancellationToken.None))
.Returns(Task.FromResult(false))
.Verifiable();
store.Setup(s => s.IsInRoleAsync(user, "B", CancellationToken.None))
store.Setup(s => s.IsInRoleAsync(user, normalizer.NormalizeName("B"), CancellationToken.None))
.Returns(Task.FromResult(false))
.Verifiable();
store.Setup(s => s.IsInRoleAsync(user, "C", CancellationToken.None))
store.Setup(s => s.IsInRoleAsync(user, normalizer.NormalizeName("C"), CancellationToken.None))
.Returns(Task.FromResult(false))
.Verifiable();
var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);
Expand All @@ -366,7 +374,7 @@ public async Task AddToRolesCallsStore()
// Assert
Assert.True(result.Succeeded);
store.VerifyAll();
store.Verify(s => s.AddToRoleAsync(user, "C", CancellationToken.None), Times.Once());
store.Verify(s => s.AddToRoleAsync(user, normalizer.NormalizeName("C"), CancellationToken.None), Times.Once());
}

[Fact]
Expand Down Expand Up @@ -412,13 +420,14 @@ public async Task AddToRolesCallsStoreWithCustomNameNormalizer()
public async Task AddToRolesFailsIfUserInRole()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserRoleStore<PocoUser>>();
var user = new PocoUser { UserName = "Foo" };
var roles = new[] { "A", "B", "C" };
store.Setup(s => s.AddToRoleAsync(user, "A", CancellationToken.None))
store.Setup(s => s.AddToRoleAsync(user, normalizer.NormalizeName("A"), CancellationToken.None))
.Returns(Task.FromResult(0))
.Verifiable();
store.Setup(s => s.IsInRoleAsync(user, "B", CancellationToken.None))
store.Setup(s => s.IsInRoleAsync(user, normalizer.NormalizeName("B"), CancellationToken.None))
.Returns(Task.FromResult(true))
.Verifiable();
var userManager = MockHelpers.TestUserManager(store.Object);
Expand All @@ -435,26 +444,27 @@ public async Task AddToRolesFailsIfUserInRole()
public async Task RemoveFromRolesCallsStore()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserRoleStore<PocoUser>>();
var user = new PocoUser { UserName = "Foo" };
var roles = new[] { "A", "B", "C" };
store.Setup(s => s.RemoveFromRoleAsync(user, "A", CancellationToken.None))
store.Setup(s => s.RemoveFromRoleAsync(user, normalizer.NormalizeName("A"), CancellationToken.None))
.Returns(Task.FromResult(0))
.Verifiable();
store.Setup(s => s.RemoveFromRoleAsync(user, "B", CancellationToken.None))
store.Setup(s => s.RemoveFromRoleAsync(user, normalizer.NormalizeName("B"), CancellationToken.None))
.Returns(Task.FromResult(0))
.Verifiable();
store.Setup(s => s.RemoveFromRoleAsync(user, "C", CancellationToken.None))
store.Setup(s => s.RemoveFromRoleAsync(user, normalizer.NormalizeName("C"), CancellationToken.None))
.Returns(Task.FromResult(0))
.Verifiable();
store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
store.Setup(s => s.IsInRoleAsync(user, "A", CancellationToken.None))
store.Setup(s => s.IsInRoleAsync(user, normalizer.NormalizeName("A"), CancellationToken.None))
.Returns(Task.FromResult(true))
.Verifiable();
store.Setup(s => s.IsInRoleAsync(user, "B", CancellationToken.None))
store.Setup(s => s.IsInRoleAsync(user, normalizer.NormalizeName("B"), CancellationToken.None))
.Returns(Task.FromResult(true))
.Verifiable();
store.Setup(s => s.IsInRoleAsync(user, "C", CancellationToken.None))
store.Setup(s => s.IsInRoleAsync(user, normalizer.NormalizeName("C"), CancellationToken.None))
.Returns(Task.FromResult(true))
.Verifiable();
var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);
Expand All @@ -471,16 +481,17 @@ public async Task RemoveFromRolesCallsStore()
public async Task RemoveFromRolesFailsIfNotInRole()
{
// Setup
var normalizer = MockHelpers.MockLookupNormalizer();
var store = new Mock<IUserRoleStore<PocoUser>>();
var user = new PocoUser { UserName = "Foo" };
var roles = new string[] { "A", "B", "C" };
store.Setup(s => s.RemoveFromRoleAsync(user, "A", CancellationToken.None))
store.Setup(s => s.RemoveFromRoleAsync(user, normalizer.NormalizeName("A"), CancellationToken.None))
.Returns(Task.FromResult(0))
.Verifiable();
store.Setup(s => s.IsInRoleAsync(user, "A", CancellationToken.None))
store.Setup(s => s.IsInRoleAsync(user, normalizer.NormalizeName("A"), CancellationToken.None))
.Returns(Task.FromResult(true))
.Verifiable();
store.Setup(s => s.IsInRoleAsync(user, "B", CancellationToken.None))
store.Setup(s => s.IsInRoleAsync(user, normalizer.NormalizeName("B"), CancellationToken.None))
.Returns(Task.FromResult(false))
.Verifiable();
var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);
Expand Down
Loading