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

V10: fix build warnings in test projects (#12509)

Browse Source 
* Run code cleanup

* Dotnet format benchmarks project

* Fix up Test.Common

* Run dotnet format + manual cleanup

* Run code cleanup for unit tests

* Run dotnet format

* Fix up errors

* Manual cleanup of Unit test project

* Update tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Update tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Update tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Update tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Update tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Fix according to review

* Fix after merge

* Fix errors

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
Co-authored-by: Zeegaan <nge@umbraco.dk>
This commit is contained in:
Nikolaj Geisle
2022-06-21 08:09:38 +02:00
committed by GitHub
parent 29961d40a3
commit 7aeb400fce
599 changed files with 87303 additions and 86123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

307
tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs
View File

@@ -10,8 +10,8 @@ using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Primitives;
using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Editors;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Security;
@@ -19,187 +19,200 @@ using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Tests.Common.Builders;
using Umbraco.Cms.Tests.Common.Builders.Extensions;
using Umbraco.Cms.Web.BackOffice.Authorization;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
public class AdminUsersHandlerTests
{
public class AdminUsersHandlerTests
private const string SingleUserEditQueryStringName = "id";
private const string MultipleUserEditQueryStringName = "ids";
private const int Admin1UserId = 0;
private const int Admin2UserId = 1;
private const int NonAdmin1UserId = 2;
private const int NonAdmin2UserId = 3;
private const int NonAdmin3UserId = 4;
[Test]
public async Task Missing_QueryString_Value_Is_Authorized()
{
private const string SingleUserEditQueryStringName = "id";
private const string MultipleUserEditQueryStringName = "ids";
var authHandlerContext = CreateAuthorizationHandlerContext();
var sut = CreateHandler("xxx");
private const int Admin1UserId = 0;
private const int Admin2UserId = 1;
private const int NonAdmin1UserId = 2;
private const int NonAdmin2UserId = 3;
private const int NonAdmin3UserId = 4;
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Missing_QueryString_Value_Is_Authorized()
{
AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
AdminUsersHandler sut = CreateHandler(queryStringName: "xxx");
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Non_Integer_QueryString_Value_Is_Authorized()
{
var authHandlerContext = CreateAuthorizationHandlerContext();
var sut = CreateHandler(queryStringValue: "xxx");
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Non_Integer_QueryString_Value_Is_Authorized()
{
AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
AdminUsersHandler sut = CreateHandler(queryStringValue: "xxx");
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Single_Admin_User_By_Admin_User_Is_Authorized()
{
var authHandlerContext = CreateAuthorizationHandlerContext();
var sut = CreateHandler(
queryStringValue: Admin2UserId.ToString(CultureInfo.InvariantCulture),
editingWithAdmin: true);
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Single_Admin_User_By_Admin_User_Is_Authorized()
{
AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
AdminUsersHandler sut = CreateHandler(queryStringValue: Admin2UserId.ToString(CultureInfo.InvariantCulture), editingWithAdmin: true);
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Single_Admin_User_By_Non_Admin_User_Is_Not_Authorized()
{
var authHandlerContext = CreateAuthorizationHandlerContext();
var sut = CreateHandler(queryStringValue: Admin2UserId.ToString(CultureInfo.InvariantCulture));
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Single_Admin_User_By_Non_Admin_User_Is_Not_Authorized()
{
AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
AdminUsersHandler sut = CreateHandler(queryStringValue: Admin2UserId.ToString(CultureInfo.InvariantCulture));
Assert.IsFalse(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Single_Non_Admin_User_By_Non_Admin_User_Is_Authorized()
{
var authHandlerContext = CreateAuthorizationHandlerContext();
var sut = CreateHandler(queryStringValue: NonAdmin2UserId.ToString(CultureInfo.InvariantCulture));
Assert.IsFalse(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Single_Non_Admin_User_By_Non_Admin_User_Is_Authorized()
{
AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
AdminUsersHandler sut = CreateHandler(queryStringValue: NonAdmin2UserId.ToString(CultureInfo.InvariantCulture));
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Multiple_Users_Including_Admins_By_Admin_User_Is_Authorized()
{
var authHandlerContext = CreateAuthorizationHandlerContext(MultipleUserEditQueryStringName);
var sut = CreateHandler(MultipleUserEditQueryStringName, $"{Admin2UserId},{NonAdmin2UserId}", true);
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Multiple_Users_Including_Admins_By_Admin_User_Is_Authorized()
{
AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(queryStringName: MultipleUserEditQueryStringName);
AdminUsersHandler sut = CreateHandler(queryStringName: MultipleUserEditQueryStringName, queryStringValue: $"{Admin2UserId},{NonAdmin2UserId}", editingWithAdmin: true);
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Multiple_Users_Including_Admins_By_Non_Admin_User_Is_Not_Authorized()
{
var authHandlerContext = CreateAuthorizationHandlerContext(MultipleUserEditQueryStringName);
var sut = CreateHandler(MultipleUserEditQueryStringName, $"{Admin2UserId},{NonAdmin2UserId}");
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Multiple_Users_Including_Admins_By_Non_Admin_User_Is_Not_Authorized()
{
AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(queryStringName: MultipleUserEditQueryStringName);
AdminUsersHandler sut = CreateHandler(queryStringName: MultipleUserEditQueryStringName, queryStringValue: $"{Admin2UserId},{NonAdmin2UserId}");
Assert.IsFalse(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Multiple_Users_Not_Including_Admins_By_Non_Admin_User_Is_Authorized()
{
var authHandlerContext = CreateAuthorizationHandlerContext(MultipleUserEditQueryStringName);
var sut = CreateHandler(MultipleUserEditQueryStringName, $"{NonAdmin2UserId},{NonAdmin3UserId}");
Assert.IsFalse(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
[Test]
public async Task Editing_Multiple_Users_Not_Including_Admins_By_Non_Admin_User_Is_Authorized()
{
AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(queryStringName: MultipleUserEditQueryStringName);
AdminUsersHandler sut = CreateHandler(queryStringName: MultipleUserEditQueryStringName, queryStringValue: $"{NonAdmin2UserId},{NonAdmin3UserId}");
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
await sut.HandleAsync(authHandlerContext);
private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(
string queryStringName = SingleUserEditQueryStringName)
{
var requirement = new AdminUsersRequirement(queryStringName);
var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
var resource = new object();
return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
}
Assert.IsTrue(authHandlerContext.HasSucceeded);
}
private AdminUsersHandler CreateHandler(
string queryStringName = SingleUserEditQueryStringName,
string queryStringValue = "",
bool editingWithAdmin = false)
{
var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringName, queryStringValue);
CreateMockUserServiceAndSecurityAccessor(editingWithAdmin, out var mockUserService, out var mockBackOfficeSecurityAccessor);
var userEditorAuthorizationHelper = CreateUserEditorAuthorizationHelper();
return new AdminUsersHandler(
mockHttpContextAccessor.Object,
mockUserService.Object,
mockBackOfficeSecurityAccessor.Object,
userEditorAuthorizationHelper);
}
private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(string queryStringName = SingleUserEditQueryStringName)
{
var requirement = new AdminUsersRequirement(queryStringName);
var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
object resource = new object();
return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
}
private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(string queryStringName, string queryStringValue)
{
var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
var mockHttpContext = new Mock<HttpContext>();
var mockHttpRequest = new Mock<HttpRequest>();
var queryParams = new Dictionary<string, StringValues> { { queryStringName, queryStringValue } };
mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
return mockHttpContextAccessor;
}
private AdminUsersHandler CreateHandler(string queryStringName = SingleUserEditQueryStringName, string queryStringValue = "", bool editingWithAdmin = false)
{
Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringName, queryStringValue);
CreateMockUserServiceAndSecurityAccessor(editingWithAdmin, out Mock<IUserService> mockUserService, out Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor);
UserEditorAuthorizationHelper userEditorAuthorizationHelper = CreateUserEditorAuthorizationHelper();
return new AdminUsersHandler(mockHttpContextAccessor.Object, mockUserService.Object, mockBackOfficeSecurityAccessor.Object, userEditorAuthorizationHelper);
}
private static void CreateMockUserServiceAndSecurityAccessor(
bool editingWithAdmin,
out Mock<IUserService> mockUserService,
out Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor)
{
mockUserService = new Mock<IUserService>();
var adminUser1 = CreateUser(Admin1UserId, mockUserService, true);
var adminUser2 = CreateUser(Admin2UserId, mockUserService, true);
var nonAdminUser1 = CreateUser(NonAdmin1UserId, mockUserService);
var nonAdminUser2 = CreateUser(NonAdmin2UserId, mockUserService);
var nonAdminUser3 = CreateUser(NonAdmin3UserId, mockUserService);
private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(string queryStringName, string queryStringValue)
{
var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
var mockHttpContext = new Mock<HttpContext>();
var mockHttpRequest = new Mock<HttpRequest>();
var queryParams = new Dictionary<string, StringValues>
{
{ queryStringName, queryStringValue },
};
mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
return mockHttpContextAccessor;
}
// Single user requests have been setup in the create user operations, but
// we also need to mock the responses when multiple users are being editing.
mockUserService
.Setup(x => x.GetUsersById(It.Is<int[]>(y =>
y.Length == 2 && y[0] == Admin2UserId && y[1] == NonAdmin2UserId)))
.Returns(new List<IUser> { adminUser2, nonAdminUser2 });
mockUserService
.Setup(x => x.GetUsersById(It.Is<int[]>(y =>
y.Length == 2 && y[0] == NonAdmin2UserId && y[1] == NonAdmin3UserId)))
.Returns(new List<IUser> { nonAdminUser2, nonAdminUser3 });
private static void CreateMockUserServiceAndSecurityAccessor(bool editingWithAdmin, out Mock<IUserService> mockUserService, out Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor)
{
mockUserService = new Mock<IUserService>();
var globalSettings = new GlobalSettings();
User adminUser1 = CreateUser(Admin1UserId, mockUserService, true);
User adminUser2 = CreateUser(Admin2UserId, mockUserService, true);
User nonAdminUser1 = CreateUser(NonAdmin1UserId, mockUserService);
User nonAdminUser2 = CreateUser(NonAdmin2UserId, mockUserService);
User nonAdminUser3 = CreateUser(NonAdmin3UserId, mockUserService);
var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(editingWithAdmin ? adminUser1 : nonAdminUser1);
mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
}
// Single user requests have been setup in the create user operations, but
// we also need to mock the responses when multiple users are being editing.
mockUserService
.Setup(x => x.GetUsersById(It.Is<int[]>(y => y.Length == 2 && y[0] == Admin2UserId && y[1] == NonAdmin2UserId)))
.Returns(new List<IUser> { adminUser2, nonAdminUser2 });
mockUserService
.Setup(x => x.GetUsersById(It.Is<int[]>(y => y.Length == 2 && y[0] == NonAdmin2UserId && y[1] == NonAdmin3UserId)))
.Returns(new List<IUser> { nonAdminUser2, nonAdminUser3 });
private static User CreateUser(int id, Mock<IUserService> mockUserService, bool isAdmin = false)
{
var user = new UserBuilder()
.WithId(id)
.AddUserGroup()
.WithAlias(isAdmin ? Constants.Security.AdminGroupAlias : Constants.Security.EditorGroupAlias)
.Done()
.Build();
var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(editingWithAdmin ? adminUser1 : nonAdminUser1);
mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
}
mockUserService
.Setup(x => x.GetUsersById(It.Is<int[]>(y => y.Length == 1 && y[0] == id)))
.Returns(new List<IUser> { user });
private static User CreateUser(int id, Mock<IUserService> mockUserService, bool isAdmin = false)
{
User user = new UserBuilder()
.WithId(id)
.AddUserGroup()
.WithAlias(isAdmin ? Constants.Security.AdminGroupAlias : Constants.Security.EditorGroupAlias)
.Done()
.Build();
return user;
}
mockUserService
.Setup(x => x.GetUsersById(It.Is<int[]>(y => y.Length == 1 && y[0] == id)))
.Returns(new List<IUser> { user });
return user;
}
private static UserEditorAuthorizationHelper CreateUserEditorAuthorizationHelper()
{
var mockContentService = new Mock<IContentService>();
var mockMediaService = new Mock<IMediaService>();
var mockEntityService = new Mock<IEntityService>();
return new UserEditorAuthorizationHelper(mockContentService.Object, mockMediaService.Object, mockEntityService.Object, AppCaches.Disabled);
}
private static UserEditorAuthorizationHelper CreateUserEditorAuthorizationHelper()
{
var mockContentService = new Mock<IContentService>();
var mockMediaService = new Mock<IMediaService>();
var mockEntityService = new Mock<IEntityService>();
return new UserEditorAuthorizationHelper(
mockContentService.Object,
mockMediaService.Object,
mockEntityService.Object,
AppCaches.Disabled);
}
}