Changeset 16209 for trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs

Timestamp:

10/03/18 15:06:21 (6 years ago)

Author:

jzenisek

Message:

#2839:

• adapted job execution implementation at ProjectJobsView
• prohibited resource checking for non-admins

File:

• trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (4 diffs)

trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -483 +483 @@
           }
 
-
           jobDto.CopyToEntity(job);
 
@@ -523 +522 @@
 
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      bool isAdministrator = RoleVerifier.IsInRole(HiveRoles.Administrator);
-      var currentUserId = UserManager.CurrentUserId;
+      // check if user is an admin, or granted to administer a job-parenting project, or job owner
+      AuthorizationManager.AuthorizeForJob(jobId, DT.Permission.Full);
 
       var pm = PersistenceManager;
       using (new PerformanceLogger("UpdateJobState")) {
-        var jobDao = pm.JobDao;
-        var projectDao = pm.ProjectDao;
+        var jobDao = pm.JobDao;        
         pm.UseTransaction(() => {
           var job = jobDao.GetById(jobId);
-          if (job != null) {
-
-            var administrationGrantedProjects = projectDao
-              .GetAdministrationGrantedProjectsForUser(currentUserId)
-              .ToList();
-
-            // check if user is an admin, or granted to administer a job-parenting project,...
-            if (!isAdministrator && !administrationGrantedProjects.Contains(job.Project))
-              AuthorizationManager.AuthorizeForJob(jobId, DT.Permission.Full); // ... or job owner
+          if (job != null) {            
 
             // note: allow solely state changes from "Online" to "StatisticsPending" = deletion request by user for HiveStatisticGenerator            
@@ -563 +553 @@
 
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      bool isAdministrator = RoleVerifier.IsInRole(HiveRoles.Administrator);
-      var currentUserId = UserManager.CurrentUserId;
+      // check if user is an admin, or granted to administer a job-parenting project, or job owner
+      foreach (var jobId in jobIds)
+          AuthorizationManager.AuthorizeForJob(jobId, DT.Permission.Full);
 
       var pm = PersistenceManager;
@@ -571 +562 @@
         var projectDao = pm.ProjectDao;
         pm.UseTransaction(() => {
-          var administrationGrantedProjects = projectDao
-            .GetAdministrationGrantedProjectsForUser(currentUserId)
-            .ToList();
-
           foreach (var jobId in jobIds) {
             var job = jobDao.GetById(jobId);
             if (job != null) {
-
-              // check if user is an admin, or granted to administer a job-parenting project,...
-              if (!isAdministrator && !administrationGrantedProjects.Contains(job.Project))
-                AuthorizationManager.AuthorizeForJob(jobId, DT.Permission.Full); // ... or job owner
 
               // note: allow solely state changes from "Online" to "StatisticsPending" = deletion request by user for HiveStatisticGenerator