* Removed obsoletes from IConfigManipulator. * Removed obsolete models builder extensions. * Removed the obsolete ContentDashboardSettings. * Removed the obsolete InstallMissingDatabase setting on GlobalSettings. * Removed obsolete NuCache settings. * Removed obsolete RuntimeMinificationSettings. * Removed obsolete health check constant. * Removed obsolete icon constant. * Removed obsolete telemetry constant. * Removed obsolete property and constructor on UmbracoBuilder. * Removed obsolete constructor on AuditNotificationsHandler. * Removed obsolete constructor on HTTP header health checks. * Removed obsolete constructor on MediaFileManager. * Removed obsolete GetDefaultFileContent on ViewHelper. * Remove obsoleted methods on embed providers. * Fix tests. * Removed obsolete constructors on BlockEditorDataConverter. * Removed obsolete SeedCacheDuration property on CacheSettings. * Removed obsolete PublishCulture on ContentRepositoryExtensions. * Removed obsolete MonitorLock. * Removed obsolete synchronous HasSavedValues from IDataTypeUsageService and IDataTypeUsageRepository. * Removed obsolete HasSavedPropertyValues from IPropertyTypeUsageService and IPropertyTypeUsageRepository. * Removed obsolete methods in ITrackedReferencesService and ITrackedReferencesRepository. * Removed obsolete DateValueEditor constructors. * Removed obsolete GetAutomaticRelationTypesAliases. * Removed obsolete constructor on TextOnlyValueEditor. * Removed obsolete constructors on RegexValidator and RequiredValidator. * Removed obsolete constructs on SliderValueConverter and TagsValueConverter. * Removed obsolete GetContentType methods from IPublishedCache. * Removed ContentFinderByIdPath. * Removed obsolete constructor on DefaultMediaUrlProvider. * Removed obsolete constructor on Domain. * Removed obsolete constructor on PublishedRequest. * Removed obsolete methods on CheckPermissions. * Removed obsolete GetUserId from IBackOfficeSecurity. * Removed obsolete methods on LegacyPasswordSecurity. * Removed obsolete constructors on AuditService. * Removed obsolete methods on IContentEditingService. * Remove obsolete constructors and methods on ContentService/IContentService. * Removed obsolete constructor in ContentTypeEditingService. * Removed obsolete constructor in MediaTypeEditingService. * Removed obsolete constructor in MemberTypeEditingService. * Removed obsolete constructor in ContentTypeService. * Removed obsolete constructors in ContentTypeServiceBase. * Removed obsolete constructors and methods in ContentVersionService. * Removed obsolete constructor in DataTypeUsageService. * Removed obsolete constructor in DomainService. * Removed obsolete constructor in FileService. * Removes obsolete AttemptMove from IContentService. * Removes obsolete SetPreventCleanup from IContentVersionService. * Removes obsolete GetReferences from IDataTypeService. * Removed obsolete SetConsentLevel from IMetricsConsentService. * Removed obsolete methods from IPackageDataInstallation. * Removed obsolete methods from IPackagingService. * Removed obsolete methods on ITwoFactorLoginService. Removed obsolete ITemporaryMediaService. * Removed obsolete constructor from MediaService, MemberTypeService and MediaTypeService. * More obsolete constructors. * Removed obsoleted overloads on IPropertyValidationService. * Fixed build for tests. * Removed obsolete constructor for PublicAccessService, UserService and RelationService. * Removed GetDefaultMemberType. * Removed obsolete user group functionality from IUserService. * Removed obsolete extension methods on IUserService. * Removed obsolete method from ITelemetryService. * Removed obsolete UdiParserServiceConnectors. * Removed obsolete method on ICookieManager. * Removed obsolete DynamicContext. * Removed obsolete XmlHelper. * Fixed failing integration tests. * Removed obsoletes in Umbraco.Cms.Api.Common * Removed obsoletes in Umbraco.Cms.Api.Delivery * Removed obsoletes in Umbraco.Cms.Api.Management * Removed obsoletes in Umbraco.Examine.Lucene * Removed obsoletes in Umbraco.Infrastructure * Fix failing delivery API contract integration test. * Made integration tests internal. * Removed obsoletes from web projects. * Fix build. * Removed Twitter OEmbed provider * Removed obsolete constructor on PublishedDataType. * Removed obsolete constructors on PublishedCacheBase. * Removed the obsolete PropertyEditorTagsExtensions. * Removed obsoletion properties on configuration response models (#18697) * Removed obsolete methods from server-side models. * Update client-side types and sdk. * Update client-side files. * Removed obsoletion of Utf8ToAsciiConverter.ToAsciiString overload. (#18694) * Removed obsolete method in UserService. (#18710) * Removed obsoleted group alias keys from being publicly available. (#18682) * Removed unneceessary ApiVersion attribute. * Clean-up obsoletions on MemberService (#18703) * Removed obsoleted method on MemberService, added future obsoletion to interface and updated all callers. * Removed obsoletion on member service method that's not obsolete on the interface.
131 lines
4.9 KiB
C#
131 lines
4.9 KiB
C#
using System.Net;
|
|
using Microsoft.AspNetCore.Authentication.Cookies;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Options;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Cache;
|
|
using Umbraco.Cms.Core.Logging;
|
|
using Umbraco.Cms.Core.Routing;
|
|
using Umbraco.Cms.Core.Security;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Web;
|
|
using Umbraco.Cms.Infrastructure.Persistence;
|
|
using Umbraco.Cms.Tests.Common.Attributes;
|
|
using Umbraco.Cms.Tests.Integration.TestServerTest;
|
|
using Umbraco.Cms.Web.Common.Controllers;
|
|
using Umbraco.Cms.Web.Common.Filters;
|
|
using Umbraco.Cms.Web.Common.Security;
|
|
using Umbraco.Cms.Web.Website.Controllers;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.Website.Security
|
|
{
|
|
internal sealed class MemberAuthorizeTests : UmbracoTestServerTestBase
|
|
{
|
|
private Mock<IMemberManager> _memberManagerMock = new();
|
|
|
|
protected override void ConfigureTestServices(IServiceCollection services)
|
|
{
|
|
_memberManagerMock = new Mock<IMemberManager>();
|
|
services.Remove(new ServiceDescriptor(typeof(IMemberManager), typeof(MemberManager), ServiceLifetime.Scoped));
|
|
services.Remove(new ServiceDescriptor(typeof(MemberManager), ServiceLifetime.Scoped));
|
|
services.AddScoped(_ => _memberManagerMock.Object);
|
|
}
|
|
|
|
[Test]
|
|
[LongRunning]
|
|
public async Task Secure_SurfaceController_Should_Return_Redirect_WhenNotLoggedIn()
|
|
{
|
|
_memberManagerMock.Setup(x => x.IsLoggedIn()).Returns(false);
|
|
|
|
var url = PrepareSurfaceControllerUrl<TestSurfaceController>(x => x.Secure());
|
|
|
|
var response = await Client.GetAsync(url);
|
|
|
|
var cookieAuthenticationOptions = Services.GetService<IOptions<CookieAuthenticationOptions>>();
|
|
Assert.AreEqual(HttpStatusCode.Redirect, response.StatusCode);
|
|
Assert.AreEqual(cookieAuthenticationOptions.Value.AccessDeniedPath.ToString(), response.Headers.Location?.AbsolutePath);
|
|
}
|
|
|
|
[Test]
|
|
[LongRunning]
|
|
public async Task Secure_SurfaceController_Should_Return_Redirect_WhenNotAuthorized()
|
|
{
|
|
_memberManagerMock.Setup(x => x.IsLoggedIn()).Returns(true);
|
|
_memberManagerMock.Setup(x => x.IsMemberAuthorizedAsync(
|
|
It.IsAny<IEnumerable<string>>(),
|
|
It.IsAny<IEnumerable<string>>(),
|
|
It.IsAny<IEnumerable<int>>()))
|
|
.ReturnsAsync(false);
|
|
|
|
var url = PrepareSurfaceControllerUrl<TestSurfaceController>(x => x.Secure());
|
|
|
|
var response = await Client.GetAsync(url);
|
|
|
|
var cookieAuthenticationOptions = Services.GetService<IOptions<CookieAuthenticationOptions>>();
|
|
Assert.AreEqual(HttpStatusCode.Redirect, response.StatusCode);
|
|
Assert.AreEqual(cookieAuthenticationOptions.Value.AccessDeniedPath.ToString(), response.Headers.Location?.AbsolutePath);
|
|
}
|
|
|
|
[Test]
|
|
[LongRunning]
|
|
public async Task Secure_ApiController_Should_Return_Unauthorized_WhenNotLoggedIn()
|
|
{
|
|
_memberManagerMock.Setup(x => x.IsLoggedIn()).Returns(false);
|
|
var url = PrepareApiControllerUrl<TestApiController>(x => x.Secure());
|
|
|
|
var response = await Client.GetAsync(url);
|
|
|
|
Assert.AreEqual(HttpStatusCode.Unauthorized, response.StatusCode);
|
|
}
|
|
|
|
[Test]
|
|
[LongRunning]
|
|
public async Task Secure_ApiController_Should_Return_Forbidden_WhenNotAuthorized()
|
|
{
|
|
_memberManagerMock.Setup(x => x.IsLoggedIn()).Returns(true);
|
|
_memberManagerMock.Setup(x => x.IsMemberAuthorizedAsync(
|
|
It.IsAny<IEnumerable<string>>(),
|
|
It.IsAny<IEnumerable<string>>(),
|
|
It.IsAny<IEnumerable<int>>()))
|
|
.ReturnsAsync(false);
|
|
|
|
var url = PrepareApiControllerUrl<TestApiController>(x => x.Secure());
|
|
|
|
var response = await Client.GetAsync(url);
|
|
|
|
Assert.AreEqual(HttpStatusCode.Forbidden, response.StatusCode);
|
|
}
|
|
}
|
|
|
|
public class TestSurfaceController : SurfaceController
|
|
{
|
|
public TestSurfaceController(
|
|
IUmbracoContextAccessor umbracoContextAccessor,
|
|
IUmbracoDatabaseFactory databaseFactory,
|
|
ServiceContext services,
|
|
AppCaches appCaches,
|
|
IProfilingLogger profilingLogger,
|
|
IPublishedUrlProvider publishedUrlProvider)
|
|
: base(
|
|
umbracoContextAccessor,
|
|
databaseFactory,
|
|
services,
|
|
appCaches,
|
|
profilingLogger,
|
|
publishedUrlProvider)
|
|
{
|
|
}
|
|
|
|
[UmbracoMemberAuthorize]
|
|
public IActionResult Secure() => NoContent();
|
|
}
|
|
|
|
public class TestApiController : UmbracoApiController
|
|
{
|
|
[UmbracoMemberAuthorize]
|
|
public IActionResult Secure() => NoContent();
|
|
}
|
|
}
|