Changeset 15497 for branches/HiveProjectManagement/HeuristicLab.Services.Hive

Timestamp:

12/06/17 16:16:01 (6 years ago)

Author:

jzenisek

Message:

#2839 worked on permission check at AddTask

File:

• branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (3 diffs)

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -72 +72 @@
         var taskDao = pm.TaskDao;
         var stateLogDao = pm.StateLogDao;
+
+        var resourceDao = pm.ResourceDao;
+        var resourcePermissionDao = pm.ResourcePermissionDao;
+
+        var currentUserId = UserManager.CurrentUserId;
+
+        // V1 (without child check; with resourcePermission-oriented check for user grants)
+        // granted (parent) resources
+        var userGrantedResources = resourcePermissionDao.GetAll().ToList()
+          .Where(x => x.GrantedUserId == currentUserId
+          || UserManager.VerifyUser(currentUserId, new List<Guid> { x.GrantedUserId })
+          )
+          .Select(x => x.Resource)
+          .ToList();
+
+        //// children
+        //var userGrantedResourceChildren = userGrantedResources
+        //  .SelectMany(x => resourceDao.GetResourcesByParentId(x.ResourceId));
+        //// join parent and child resources
+        //userGrantedResources.AddRange(userGrantedResourceChildren);
+
+        var userGrantedResourceIds = resourceIds
+          .Where(x => userGrantedResources
+            .Select(y => y.ResourceId)
+            .Contains(x))
+          .Distinct().ToList();
+
         var newTask = task.ToEntity();
         newTask.JobData = taskData.ToEntity();
@@ -830 +857 @@
               || x.OwnerUserId == currentUserId
               || UserManager.VerifyUser(currentUserId, resourcePermissions
-                  .Where(y => y.ResourceId == x.ResourceId)
+                  //.Where(y => y.ResourceId == x.ResourceId)
                   .Select(z => z.GrantedUserId)
                   .ToList())
@@ -855 +882 @@
               || x.OwnerUserId == currentUserId
               || UserManager.VerifyUser(currentUserId, resourcePermissions
-                  .Where(y => y.ResourceId == x.ResourceId)
+                  //.Where(y => y.ResourceId == x.ResourceId)
                   .Select(z => z.GrantedUserId)
                   .ToList())