on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

#7759269 Проверка ролей на зацикливание включенных ролей

Browse Source
This commit is contained in:
ai.astrakhantsev 2022-11-29 11:22:09 +05:00
parent ba96645288
commit c9c60bce2b
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
AsbCloudInfrastructure/Repository/UserRoleRepository.cs
View File

@ -5,6 +5,7 @@ using AsbCloudApp.Repositories;
using AsbCloudDb; using AsbCloudDb;
using AsbCloudDb.Model; using AsbCloudDb.Model;
using AsbCloudInfrastructure.EfCache; using AsbCloudInfrastructure.EfCache;
using DocumentFormat.OpenXml.Vml.Office;
using Mapster; using Mapster;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System; using System;
@ -177,14 +178,23 @@ namespace AsbCloudInfrastructure.Repository
return false; return false;
} }
private IEnumerable<UserRoleDto> GetNestedByIds(IEnumerable<int> ids, int recursionLevel = 7)
{
var roles = new List<UserRoleDto>();
foreach (var id in ids)
roles.AddRange(GetNestedById(id, recursionLevel));
return roles;
}
private async Task UpdateIncludedRolesAsync(UserRoleDto dto, CancellationToken token) private async Task UpdateIncludedRolesAsync(UserRoleDto dto, CancellationToken token)
{ {
if (dto?.Roles is null) if (dto?.Roles is null)
return; return;
var idsIncludeRole = dto.Roles.Select(x => x.Id); var idsIncludeRole = GetNestedByIds(dto.Roles.Select(x => x.Id)).Select(x => x.Id);
if (idsIncludeRole.Any(x => x == dto.Id)) if (idsIncludeRole is null || idsIncludeRole.Any(x => x == dto.Id))
throw new ArgumentInvalidException("Invalid include role", nameof(UserRoleDto)); throw new ArgumentInvalidException("Invalid include role", nameof(UserRoleDto));
var relations = await dbContext.RelationUserRoleUserRoles var relations = await dbContext.RelationUserRoleUserRoles
@ -203,6 +213,21 @@ namespace AsbCloudInfrastructure.Repository
DropCacheRelationUserRoleUserRole(); DropCacheRelationUserRoleUserRole();
} }
//private IEnumerable<int> GetNestedRoleIds(UserRoleDto dto)
//{
// var result = new List<int>();
// if (dto.Roles is not null)
// {
// foreach (var role in dto.Roles)
// {
// result.Add(role.Id);
// if (role.Roles is not null)
// GetNestedRoleIds(role);
// }
// }
// return result;
//}
private async Task UpdatePermissionsAsync(UserRoleDto dto, CancellationToken token) private async Task UpdatePermissionsAsync(UserRoleDto dto, CancellationToken token)
{ {
if (dto?.Permissions is null) if (dto?.Permissions is null)