IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: refactor

Browse Source
This commit is contained in:
Maksim Chegulov 2022-02-28 12:06:06 +03:00
parent e6f111f651
commit fe15811c8f
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/ASC.Common/Security/ISecurityObjectId.cs
View File

@ -30,9 +30,5 @@ public interface ISecurityObjectId
{ {
object SecurityId { get; } object SecurityId { get; }
Type ObjectType { get; } Type ObjectType { get; }
string FullId { get; }
string ToString()
{
return AzObjectIdHelper.GetFullObjectId(this);
}
} }

1
common/ASC.Common/Security/SecurityObjectId.cs
View File

@ -30,6 +30,7 @@ public class SecurityObjectId : ISecurityObjectId
{ {
public object SecurityId { get; private set; } public object SecurityId { get; private set; }
public Type ObjectType { get; private set; } public Type ObjectType { get; private set; }
public string FullId => AzObjectIdHelper.GetFullObjectId(this);
public SecurityObjectId(object id, Type objType) public SecurityObjectId(object id, Type objType)
{ {

4
common/ASC.Core.Common/Core/AzRecord.cs
View File

@ -41,12 +41,12 @@ public class AzRecord : IMapFrom<Acl>
{ {
} }
public AzRecord(Guid subjectId, Guid actionId, AceType reaction, string objectId) public AzRecord(Guid subjectId, Guid actionId, AceType reaction, string fullId)
{ {
Subject = subjectId; Subject = subjectId;
Action = actionId; Action = actionId;
AceType = reaction; AceType = reaction;
Object = objectId; Object = fullId;
} }
public static implicit operator AzRecord(AzRecordCache cache) public static implicit operator AzRecord(AzRecordCache cache)

1
common/ASC.Core.Common/Security/UserSecurityProvider.cs
View File

@ -29,6 +29,7 @@ public class UserSecurityProvider : ISecurityObject
{ {
public Type ObjectType { get; private set; } public Type ObjectType { get; private set; }
public object SecurityId { get; private set; } public object SecurityId { get; private set; }
public string FullId => AzObjectIdHelper.GetFullObjectId(this);
public UserSecurityProvider(Guid userId) public UserSecurityProvider(Guid userId)
{ {

7
web/ASC.Web.Core/WebItemSecurity.cs
View File

@ -210,7 +210,7 @@ namespace ASC.Web.Core
// remove old aces // remove old aces
AuthorizationManager.RemoveAllAces(securityObj); AuthorizationManager.RemoveAllAces(securityObj);
var allowToAll = new AzRecord(ASC.Core.Users.Constants.GroupEveryone.ID, Read.ID, AceType.Allow, securityObj.ToString()); var allowToAll = new AzRecord(ASC.Core.Users.Constants.GroupEveryone.ID, Read.ID, AceType.Allow, securityObj.FullId);
AuthorizationManager.RemoveAce(allowToAll); AuthorizationManager.RemoveAce(allowToAll);
// set new aces // set new aces
@ -225,7 +225,7 @@ namespace ASC.Web.Core
} }
foreach (var s in subjects) foreach (var s in subjects)
{ {
var a = new AzRecord(s, Read.ID, enabled ? AceType.Allow : AceType.Deny, securityObj.ToString()); var a = new AzRecord(s, Read.ID, enabled ? AceType.Allow : AceType.Deny, securityObj.FullId);
AuthorizationManager.AddAce(a); AuthorizationManager.AddAce(a);
} }
@ -370,6 +370,8 @@ namespace ASC.Web.Core
get { return WebItemId.ToString("N"); } get { return WebItemId.ToString("N"); }
} }
public string FullId => AzObjectIdHelper.GetFullObjectId(this);
public bool InheritSupported public bool InheritSupported
{ {
get { return true; } get { return true; }
@ -380,7 +382,6 @@ namespace ASC.Web.Core
get { return false; } get { return false; }
} }
public static WebItemSecurityObject Create(string id, WebItemManager webItemManager) public static WebItemSecurityObject Create(string id, WebItemManager webItemManager)
{ {
if (string.IsNullOrEmpty(id)) if (string.IsNullOrEmpty(id))