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

Netcore: Introduce BackofficeSecurityAccessor (#8871)

Browse Source 
* Introduced IWebSecurityAccessor

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Fixed tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Renamed WebSecurity to BackofficeSecurity and all related names

* Fixes typos

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
This commit is contained in:
Bjarke Berg
2020-09-22 10:01:00 +02:00
committed by GitHub
parent 525ca95acf
commit 96facc4d35
84 changed files with 571 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
View File

@@ -56,7 +56,7 @@ namespace Umbraco.Web.Editors
private readonly IContentService _contentService;
private readonly ILocalizedTextService _localizedTextService;
private readonly IUserService _userService;
private readonly IWebSecurity _webSecurity;
private readonly IBackofficeSecurityAccessor _backofficeSecurityAccessor;
private readonly IEntityService _entityService;
private readonly IContentTypeService _contentTypeService;
private readonly UmbracoMapper _umbracoMapper;
@@ -84,7 +84,7 @@ namespace Umbraco.Web.Editors
PropertyEditorCollection propertyEditors,
IContentService contentService,
IUserService userService,
IWebSecurity webSecurity,
IBackofficeSecurityAccessor backofficeSecurityAccessor,
IEntityService entityService,
IContentTypeService contentTypeService,
UmbracoMapper umbracoMapper,
@@ -105,7 +105,7 @@ namespace Umbraco.Web.Editors
_contentService = contentService;
_localizedTextService = localizedTextService;
_userService = userService;
_webSecurity = webSecurity;
_backofficeSecurityAccessor = backofficeSecurityAccessor;
_entityService = entityService;
_contentTypeService = contentTypeService;
_umbracoMapper = umbracoMapper;
@@ -428,7 +428,7 @@ namespace Umbraco.Web.Editors
private ContentItemDisplay GetEmpty(IContentType contentType, int parentId)
{
var emptyContent = _contentService.Create("", parentId, contentType.Alias, _webSecurity.GetUserId().ResultOr(0));
var emptyContent = _contentService.Create("", parentId, contentType.Alias, _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
var mapped = MapToDisplay(emptyContent);
// translate the content type name if applicable
mapped.ContentTypeName = _localizedTextService.UmbracoDictionaryTranslate(CultureDictionary, mapped.ContentTypeName);
@@ -597,9 +597,9 @@ namespace Umbraco.Web.Editors
EnsureUniqueName(name, content, nameof(name));
var blueprint = _contentService.CreateContentFromBlueprint(content, name, _webSecurity.GetUserId().ResultOr(0));
var blueprint = _contentService.CreateContentFromBlueprint(content, name, _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
_contentService.SaveBlueprint(blueprint, _webSecurity.GetUserId().ResultOr(0));
_contentService.SaveBlueprint(blueprint, _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
var notificationModel = new SimpleNotificationModel();
notificationModel.AddSuccessNotification(
@@ -633,7 +633,7 @@ namespace Umbraco.Web.Editors
{
EnsureUniqueName(content.Name, content, "Name");
_contentService.SaveBlueprint(contentItem.PersistedContent, _webSecurity.CurrentUser.Id);
_contentService.SaveBlueprint(contentItem.PersistedContent, _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser.Id);
//we need to reuse the underlying logic so return the result that it wants
return OperationResult.Succeed(new EventMessages());
},
@@ -658,7 +658,7 @@ namespace Umbraco.Web.Editors
{
var contentItemDisplay = PostSaveInternal(
contentItem,
content => _contentService.Save(contentItem.PersistedContent, _webSecurity.CurrentUser.Id),
content => _contentService.Save(contentItem.PersistedContent, _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser.Id),
MapToDisplay);
return contentItemDisplay;
@@ -760,7 +760,7 @@ namespace Umbraco.Web.Editors
case ContentSaveAction.SendPublish:
case ContentSaveAction.SendPublishNew:
var sendResult = _contentService.SendToPublication(contentItem.PersistedContent, _webSecurity.CurrentUser.Id);
var sendResult = _contentService.SendToPublication(contentItem.PersistedContent, _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser.Id);
wasCancelled = sendResult == false;
if (sendResult)
{
@@ -1204,7 +1204,7 @@ namespace Umbraco.Web.Editors
//if this item's path has already been denied or if the user doesn't have access to it, add to the deny list
if (denied.Any(x => c.Path.StartsWith($"{x.Path},"))
|| (ContentPermissionsHelper.CheckPermissions(c,
_webSecurity.CurrentUser, _userService, _entityService,
_backofficeSecurityAccessor.BackofficeSecurity.CurrentUser, _userService, _entityService,
ActionPublish.ActionLetter) == ContentPermissionsHelper.ContentAccess.Denied))
{
denied.Add(c);
@@ -1221,7 +1221,7 @@ namespace Umbraco.Web.Editors
if (!contentItem.PersistedContent.ContentType.VariesByCulture())
{
//its invariant, proceed normally
var publishStatus = _contentService.SaveAndPublishBranch(contentItem.PersistedContent, force, userId: _webSecurity.CurrentUser.Id);
var publishStatus = _contentService.SaveAndPublishBranch(contentItem.PersistedContent, force, userId: _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser.Id);
// TODO: Deal with multiple cancellations
wasCancelled = publishStatus.Any(x => x.Result == PublishResultType.FailedPublishCancelledByEvent);
successfulCultures = null; //must be null! this implies invariant
@@ -1256,7 +1256,7 @@ namespace Umbraco.Web.Editors
if (canPublish)
{
//proceed to publish if all validation still succeeds
var publishStatus = _contentService.SaveAndPublishBranch(contentItem.PersistedContent, force, culturesToPublish, _webSecurity.CurrentUser.Id);
var publishStatus = _contentService.SaveAndPublishBranch(contentItem.PersistedContent, force, culturesToPublish, _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser.Id);
// TODO: Deal with multiple cancellations
wasCancelled = publishStatus.Any(x => x.Result == PublishResultType.FailedPublishCancelledByEvent);
successfulCultures = contentItem.Variants.Where(x => x.Publish).Select(x => x.Culture).ToArray();
@@ -1265,7 +1265,7 @@ namespace Umbraco.Web.Editors
else
{
//can only save
var saveResult = _contentService.Save(contentItem.PersistedContent, _webSecurity.CurrentUser.Id);
var saveResult = _contentService.Save(contentItem.PersistedContent, _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser.Id);
var publishStatus = new[]
{
new PublishResult(PublishResultType.FailedPublishMandatoryCultureMissing, null, contentItem.PersistedContent)
@@ -1293,7 +1293,7 @@ namespace Umbraco.Web.Editors
if (!contentItem.PersistedContent.ContentType.VariesByCulture())
{
//its invariant, proceed normally
var publishStatus = _contentService.SaveAndPublish(contentItem.PersistedContent, userId: _webSecurity.CurrentUser.Id);
var publishStatus = _contentService.SaveAndPublish(contentItem.PersistedContent, userId: _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser.Id);
wasCancelled = publishStatus.Result == PublishResultType.FailedPublishCancelledByEvent;
successfulCultures = null; //must be null! this implies invariant
return publishStatus;
@@ -1338,7 +1338,7 @@ namespace Umbraco.Web.Editors
if (canPublish)
{
//proceed to publish if all validation still succeeds
var publishStatus = _contentService.SaveAndPublish(contentItem.PersistedContent, culturesToPublish, _webSecurity.CurrentUser.Id);
var publishStatus = _contentService.SaveAndPublish(contentItem.PersistedContent, culturesToPublish, _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser.Id);
wasCancelled = publishStatus.Result == PublishResultType.FailedPublishCancelledByEvent;
successfulCultures = culturesToPublish;
return publishStatus;
@@ -1346,7 +1346,7 @@ namespace Umbraco.Web.Editors
else
{
//can only save
var saveResult = _contentService.Save(contentItem.PersistedContent, _webSecurity.CurrentUser.Id);
var saveResult = _contentService.Save(contentItem.PersistedContent, _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser.Id);
var publishStatus = new PublishResult(PublishResultType.FailedPublishMandatoryCultureMissing, null, contentItem.PersistedContent);
wasCancelled = saveResult.Result == OperationResultType.FailedCancelledByEvent;
successfulCultures = Array.Empty<string>();
@@ -1501,7 +1501,7 @@ namespace Umbraco.Web.Editors
return HandleContentNotFound(id, false);
}
var publishResult = _contentService.SaveAndPublish(foundContent, userId: _webSecurity.GetUserId().ResultOr(0));
var publishResult = _contentService.SaveAndPublish(foundContent, userId: _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
if (publishResult.Success == false)
{
var notificationModel = new SimpleNotificationModel();
@@ -1553,7 +1553,7 @@ namespace Umbraco.Web.Editors
//if the current item is in the recycle bin
if (foundContent.Trashed == false)
{
var moveResult = _contentService.MoveToRecycleBin(foundContent, _webSecurity.GetUserId().ResultOr(0));
var moveResult = _contentService.MoveToRecycleBin(foundContent, _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
if (moveResult.Success == false)
{
//returning an object of INotificationModel will ensure that any pending
@@ -1563,7 +1563,7 @@ namespace Umbraco.Web.Editors
}
else
{
var deleteResult = _contentService.Delete(foundContent, _webSecurity.GetUserId().ResultOr(0));
var deleteResult = _contentService.Delete(foundContent, _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
if (deleteResult.Success == false)
{
//returning an object of INotificationModel will ensure that any pending
@@ -1587,7 +1587,7 @@ namespace Umbraco.Web.Editors
[EnsureUserPermissionForContent(Constants.System.RecycleBinContent, ActionDelete.ActionLetter)]
public IActionResult EmptyRecycleBin()
{
_contentService.EmptyRecycleBin(_webSecurity.GetUserId().ResultOr(Constants.Security.SuperUserId));
_contentService.EmptyRecycleBin(_backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(Constants.Security.SuperUserId));
return new UmbracoNotificationSuccessResponse(_localizedTextService.Localize("defaultdialogs/recycleBinIsEmpty"));
}
@@ -1616,7 +1616,7 @@ namespace Umbraco.Web.Editors
var contentService = _contentService;
// Save content with new sort order and update content xml in db accordingly
var sortResult = contentService.Sort(sorted.IdSortOrder, _webSecurity.CurrentUser.Id);
var sortResult = contentService.Sort(sorted.IdSortOrder, _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser.Id);
if (!sortResult.Success)
{
Logger.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
@@ -1643,7 +1643,7 @@ namespace Umbraco.Web.Editors
{
var toMove = ValidateMoveOrCopy(move);
_contentService.Move(toMove, move.ParentId, _webSecurity.GetUserId().ResultOr(0));
_contentService.Move(toMove, move.ParentId, _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
return Content(toMove.Path, MediaTypeNames.Text.Plain, Encoding.UTF8);
}
@@ -1658,7 +1658,7 @@ namespace Umbraco.Web.Editors
{
var toCopy = ValidateMoveOrCopy(copy);
var c = _contentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, _webSecurity.GetUserId().ResultOr(0));
var c = _contentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
return Content(c.Path, MediaTypeNames.Text.Plain, Encoding.UTF8);
}
@@ -1681,7 +1681,7 @@ namespace Umbraco.Web.Editors
if (model.Cultures.Length == 0 || model.Cultures.Length == languageCount)
{
//this means that the entire content item will be unpublished
var unpublishResult = _contentService.Unpublish(foundContent, userId: _webSecurity.GetUserId().ResultOr(0));
var unpublishResult = _contentService.Unpublish(foundContent, userId: _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
var content = MapToDisplay(foundContent);
@@ -1704,7 +1704,7 @@ namespace Umbraco.Web.Editors
var results = new Dictionary<string, PublishResult>();
foreach (var c in model.Cultures)
{
var result = _contentService.Unpublish(foundContent, culture: c, userId: _webSecurity.GetUserId().ResultOr(0));
var result = _contentService.Unpublish(foundContent, culture: c, userId: _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
results[c] = result;
if (result.Result == PublishResultType.SuccessUnpublishMandatoryCulture)
{
@@ -1772,7 +1772,7 @@ namespace Umbraco.Web.Editors
return NotFound("There is no content node with id {model.NodeId}.");
}
var permission = _userService.GetPermissions(_webSecurity.CurrentUser, node.Path);
var permission = _userService.GetPermissions(_backofficeSecurityAccessor.BackofficeSecurity.CurrentUser, node.Path);
if (permission.AssignedPermissions.Contains(ActionAssignDomain.ActionLetter.ToString(), StringComparer.Ordinal) == false)
@@ -2260,7 +2260,7 @@ namespace Umbraco.Web.Editors
{
var display = _umbracoMapper.Map<ContentItemDisplay>(content, context =>
{
context.Items["CurrentUser"] = _webSecurity.CurrentUser;
context.Items["CurrentUser"] = _backofficeSecurityAccessor.BackofficeSecurity.CurrentUser;
});
display.AllowPreview = display.AllowPreview && content.Trashed == false && content.ContentType.IsElement == false;
return display;
@@ -2275,7 +2275,7 @@ namespace Umbraco.Web.Editors
var content = _contentService.GetById(contentId);
if (content == null) return NotFound();
var userNotifications = _notificationService.GetUserNotifications(_webSecurity.CurrentUser, content.Path).ToList();
var userNotifications = _notificationService.GetUserNotifications(_backofficeSecurityAccessor.BackofficeSecurity.CurrentUser, content.Path).ToList();
foreach (var a in _actionCollection.Where(x => x.ShowInNotifier))
{
@@ -2297,7 +2297,7 @@ namespace Umbraco.Web.Editors
var content = _contentService.GetById(contentId);
if (content == null) return NotFound();
_notificationService.SetNotifications(_webSecurity.CurrentUser, content, notifyOptions);
_notificationService.SetNotifications(_backofficeSecurityAccessor.BackofficeSecurity.CurrentUser, content, notifyOptions);
return NoContent();
}
@@ -2362,7 +2362,7 @@ namespace Umbraco.Web.Editors
[HttpPost]
public IActionResult PostRollbackContent(int contentId, int versionId, string culture = "*")
{
var rollbackResult = _contentService.Rollback(contentId, versionId, culture, _webSecurity.GetUserId().ResultOr(0));
var rollbackResult = _contentService.Rollback(contentId, versionId, culture, _backofficeSecurityAccessor.BackofficeSecurity.GetUserId().ResultOr(0));
if (rollbackResult.Success)
return Ok();