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

Ensures the user's combined start nodes are used when checking path access

Browse Source
This commit is contained in:
Shannon
2017-06-20 17:04:00 +10:00
parent 957c8e917f
commit 94e958bd7a
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Models/UserExtensions.cs
View File

@@ -25,7 +25,7 @@ namespace Umbraco.Core.Models
/// Returns all of the user's assigned start node ids based on ids assigned directly to the IUser object and it's groups
/// </summary>
/// <returns></returns>
public static IEnumerable<int> GetCombinedMediaContentIds(this IUser user)
public static IEnumerable<int> GetCombinedStartMediaIds(this IUser user)
{
return user.StartMediaIds.Concat(user.Groups.Select(x => x.StartMediaId)).Distinct();
}
@@ -136,10 +136,10 @@ namespace Umbraco.Core.Models
if (content == null) throw new ArgumentNullException("content");
return HasPathAccess(content.Path, user.GetCombinedStartContentIds().ToArray(), Constants.System.RecycleBinContent);
}
internal static bool HasPathAccess(string path, int[] startNodeIds, int recycleBinId)
{
Mandate.ParameterNotNullOrEmpty(path, "path");
if (string.IsNullOrWhiteSpace(path)) throw new ArgumentException("Value cannot be null or whitespace.", "path");
var formattedPath = "," + path + ",";
var formattedRecycleBinId = "," + recycleBinId.ToInvariantString() + ",";
@@ -178,7 +178,7 @@ namespace Umbraco.Core.Models
{
if (user == null) throw new ArgumentNullException("user");
if (media == null) throw new ArgumentNullException("media");
return HasPathAccess(media.Path, user.GetCombinedMediaContentIds().ToArray(), Constants.System.RecycleBinMedia);
return HasPathAccess(media.Path, user.GetCombinedStartMediaIds().ToArray(), Constants.System.RecycleBinMedia);
}
/// <summary>

4
src/Umbraco.Web/Editors/ContentController.cs
View File

@@ -802,12 +802,12 @@ namespace Umbraco.Web.Editors
var hasPathAccess = (nodeId == Constants.System.Root)
? UserExtensions.HasPathAccess(
Constants.System.Root.ToInvariantString(),
user.StartContentIds,
user.GetCombinedStartContentIds().ToArray(),
Constants.System.RecycleBinContent)
: (nodeId == Constants.System.RecycleBinContent)
? UserExtensions.HasPathAccess(
Constants.System.RecycleBinContent.ToInvariantString(),
user.StartContentIds,
user.GetCombinedStartContentIds().ToArray(),
Constants.System.RecycleBinContent)
: user.HasPathAccess(contentItem);

4
src/Umbraco.Web/Editors/MediaController.cs
View File

@@ -887,12 +887,12 @@ namespace Umbraco.Web.Editors
var hasPathAccess = (nodeId == Constants.System.Root)
? UserExtensions.HasPathAccess(
Constants.System.Root.ToInvariantString(),
user.StartMediaIds,
user.GetCombinedStartMediaIds().ToArray(),
Constants.System.RecycleBinMedia)
: (nodeId == Constants.System.RecycleBinMedia)
? UserExtensions.HasPathAccess(
Constants.System.RecycleBinMedia.ToInvariantString(),
user.StartMediaIds,
user.GetCombinedStartMediaIds().ToArray(),
Constants.System.RecycleBinMedia)
: user.HasPathAccess(media);

2
src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
View File

@@ -41,7 +41,7 @@ namespace Umbraco.Web.WebApi.Filters
protected virtual int[] GetUserStartNodes(IUser user)
{
return user.StartMediaIds;
return user.GetCombinedStartMediaIds().ToArray();
}
protected virtual int RecycleBinId