swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial working back office

Browse Source
This commit is contained in:
Scott Brady
2020-04-04 12:36:04 +01:00
parent 4e583db68e
commit 851ae1ba0f
5 changed files with 125 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Tests/Security/BackOfficeClaimsPrincipalFactoryTests.cs
+85
View File
@@ -0,0 +1,85 @@
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Options;
using Moq;
using NUnit.Framework;
using Umbraco.Core.Configuration;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Security;
using Umbraco.Web.Models.Identity;
using Umbraco.Web.Security;
namespace Umbraco.Tests.Security
{
[TestFixture]
public class BackOfficeClaimsPrincipalFactoryTests
{
private BackOfficeIdentityUser _testUser;
private Mock<UserManager<BackOfficeIdentityUser>> _mockUserManager;
[Test]
public async Task CreateAsync_Should_Create_Principal_With_Umbraco_Identity()
{
var sut = CreateSut();
var claimsPrincipal = await sut.CreateAsync(_testUser);
var umbracoBackOfficeIdentity = claimsPrincipal.Identity as UmbracoBackOfficeIdentity;
Assert.IsNotNull(umbracoBackOfficeIdentity);
}
[Test]
public async Task CreateAsync_Should_Create_NameId()
{
var sut = CreateSut();
var claimsPrincipal = await sut.CreateAsync(_testUser);
Assert.True(claimsPrincipal.HasClaim(ClaimTypes.NameIdentifier, _testUser.Id.ToString()));
}
[Test]
public async Task CreateAsync_Should_Create_IdentityProvider()
{
var sut = CreateSut();
var claimsPrincipal = await sut.CreateAsync(_testUser);
Assert.True(claimsPrincipal.HasClaim(
"http://schemas.microsoft.com/accesscontrolservice/2010/07/claims/identityprovider",
"ASP.NET Identity"));
}
[SetUp]
public void Setup()
{
var mockGlobalSettings = new Mock<IGlobalSettings>();
mockGlobalSettings.Setup(x => x.DefaultUILanguage).Returns("test");
_testUser = new BackOfficeIdentityUser(mockGlobalSettings.Object, 2, new List<IReadOnlyUserGroup>())
{
UserName = "bob",
Name = "Bob",
Email = "bob@umbraco.test",
SecurityStamp = "B6937738-9C17-4C7D-A25A-628A875F5177"
};
_mockUserManager = new Mock<UserManager<BackOfficeIdentityUser>>(new Mock<IUserStore<BackOfficeIdentityUser>>().Object,
null, null, null, null, null, null, null, null);
_mockUserManager.Setup(x => x.GetUserIdAsync(_testUser)).ReturnsAsync(_testUser.Id.ToString);
_mockUserManager.Setup(x => x.GetUserNameAsync(_testUser)).ReturnsAsync(_testUser.UserName);
_mockUserManager.Setup(x => x.SupportsUserSecurityStamp).Returns(false);
_mockUserManager.Setup(x => x.SupportsUserClaim).Returns(false);
_mockUserManager.Setup(x => x.SupportsUserRole).Returns(false);
}
private BackOfficeClaimsPrincipalFactory<BackOfficeIdentityUser> CreateSut()
{
return new BackOfficeClaimsPrincipalFactory<BackOfficeIdentityUser>(_mockUserManager.Object,
new OptionsWrapper<IdentityOptions>(new IdentityOptions()));
}
}
}
src/Umbraco.Tests/Umbraco.Tests.csproj
+1
View File
@@ -148,6 +148,7 @@
<Compile Include="Persistence\Mappers\MapperTestBase.cs" />
<Compile Include="Persistence\Repositories\DocumentRepositoryTest.cs" />
<Compile Include="Persistence\Repositories\EntityRepositoryTest.cs" />
<Compile Include="Security\BackOfficeClaimsPrincipalFactoryTests.cs" />
<Compile Include="UmbracoExamine\ExamineExtensions.cs" />
<Compile Include="PropertyEditors\DataValueReferenceFactoryCollectionTests.cs" />
<Compile Include="PublishedContent\NuCacheChildrenTests.cs" />
src/Umbraco.Web/Security/BackOfficeClaimsPrincipalFactory.cs
+6 -3
View File
@@ -1,9 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Options;
using Umbraco.Core;
using Umbraco.Core.Security;
using Umbraco.Web.Models.Identity;
@@ -19,10 +21,11 @@ namespace Umbraco.Web.Security
public override async Task<ClaimsPrincipal> CreateAsync(TUser user)
{
var claimsPrincipal = await base.CreateAsync(user);
var baseIdentity = await base.GenerateClaimsAsync(user);
baseIdentity.AddClaim(new Claim("http://schemas.microsoft.com/accesscontrolservice/2010/07/claims/identityprovider", "ASP.NET Identity"));
var umbracoIdentity = new UmbracoBackOfficeIdentity(
claimsPrincipal.Identity as ClaimsIdentity,
baseIdentity,
user.Id,
user.UserName,
user.Name,
src/Umbraco.Web/Security/BackOfficeUserManager2.cs
+5 -1
View File
@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.Owin.Security.DataProtection;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Mapping;
using Umbraco.Core.Security;
@@ -293,7 +294,10 @@ namespace Umbraco.Web.Security
/// </remarks>
public async Task<IdentityResult> ChangePasswordWithResetAsync(int userId, string token, string newPassword)
{
var user = await base.FindByIdAsync(userId.ToString());
var userIdAsString = userId.TryConvertTo<string>();
if (!userIdAsString.Success) throw new InvalidOperationException("Unable to convert userId to int");
var user = await base.FindByIdAsync(userIdAsString.Result);
var result = await base.ResetPasswordAsync(user, token, newPassword);
if (result.Succeeded) RaisePasswordChangedEvent(userId);
return result;
src/Umbraco.Web/Security/BackOfficeUserStore2.cs
+28 -29
View File
@@ -66,12 +66,11 @@ namespace Umbraco.Web.Security
public Task<string> GetUserIdAsync(BackOfficeIdentityUser user, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
ThrowIfDisposed();
if (user == null) throw new ArgumentNullException(nameof(user));
return Task.FromResult(user.Id.ToString());
return Task.FromResult(UserIdToString(user.Id));
}
public Task<string> GetUserNameAsync(BackOfficeIdentityUser user, CancellationToken cancellationToken)
@@ -156,14 +155,8 @@ namespace Umbraco.Web.Security
cancellationToken.ThrowIfCancellationRequested();
ThrowIfDisposed();
if (user == null) throw new ArgumentNullException(nameof(user));
var asInt = user.Id.TryConvertTo<int>();
if (asInt == false)
{
throw new InvalidOperationException("The user id must be an integer to work with the Umbraco");
}
var found = _userService.GetUserById(asInt.Result);
var found = _userService.GetUserById(user.Id);
if (found != null)
{
// we have to remember whether Logins property is dirty, since the UpdateMemberProperties will reset it.
@@ -194,19 +187,13 @@ namespace Umbraco.Web.Security
cancellationToken.ThrowIfCancellationRequested();
ThrowIfDisposed();
if (user == null) throw new ArgumentNullException(nameof(user));
var asInt = user.Id.TryConvertTo<int>();
if (asInt == false)
{
throw new InvalidOperationException("The user id must be an integer to work with the Umbraco");
}
var found = _userService.GetUserById(asInt.Result);
var found = _userService.GetUserById(user.Id);
if (found != null)
{
_userService.Delete(found);
}
_externalLoginService.DeleteUserLogins(asInt.Result);
_externalLoginService.DeleteUserLogins(user.Id);
return Task.FromResult(IdentityResult.Success);
}
@@ -222,10 +209,7 @@ namespace Umbraco.Web.Security
cancellationToken.ThrowIfCancellationRequested();
ThrowIfDisposed();
var asInt = userId.TryConvertTo<int>();
if (asInt == false) throw new InvalidOperationException("The user id must be an integer to work with the Umbraco");
var user = _userService.GetUserById(asInt.Result);
var user = _userService.GetUserById(UserIdToInt(userId));
if (user == null) return null;
return await Task.FromResult(AssignLoginsCallback(_mapper.Map<BackOfficeIdentityUser>(user)));
@@ -312,7 +296,7 @@ namespace Umbraco.Web.Security
cancellationToken.ThrowIfCancellationRequested();
ThrowIfDisposed();
if (user == null) throw new ArgumentNullException(nameof(user));
if (email.IsNullOrWhiteSpace()) throw new ArgumentNullException("email");
// if (email.IsNullOrWhiteSpace()) throw new ArgumentNullException("email");
user.Email = email;
@@ -898,8 +882,7 @@ namespace Umbraco.Web.Security
private void ThrowIfDisposed()
{
if (_disposed)
throw new ObjectDisposedException(GetType().Name);
if (_disposed) throw new ObjectDisposedException(GetType().Name);
}
public Task<bool> ValidateSessionIdAsync(string userId, string sessionId)
@@ -907,10 +890,26 @@ namespace Umbraco.Web.Security
Guid guidSessionId;
if (Guid.TryParse(sessionId, out guidSessionId))
{
// TODO: SB: Normalize string to int conversion
return Task.FromResult(_userService.ValidateLoginSession(int.Parse(sessionId), guidSessionId));
return Task.FromResult(_userService.ValidateLoginSession(UserIdToInt(userId), guidSessionId));
}
return Task.FromResult(false);
}
private string UserIdToString(int userId)
{
var attempt = userId.TryConvertTo<string>();
if (attempt.Success) return attempt.Result;
throw new InvalidOperationException("Unable to convert user ID to string", attempt.Exception);
}
private int UserIdToInt(string userId)
{
var attempt = userId.TryConvertTo<int>();
if (attempt.Success) return attempt.Result;
throw new InvalidOperationException("Unable to convert user ID to int", attempt.Exception);
}
}
}