Changeset 15380

Timestamp:

09/25/17 17:20:15 (7 years ago)

Author:

jkarder

Message:

#2839: worked on Project and ProjectPermission service methods

Location:

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3

Files:

• HiveService.cs (modified) (4 diffs)
• Interfaces/IAuthorizationManager.cs (modified) (1 diff)
• Manager/AuthorizationManager.cs (modified) (1 diff)
• ServiceContracts/IHiveService.cs (modified) (1 diff)

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

@@ -636 +636 @@
     public void DeleteProject(Guid projectId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator);
-      AuthorizationManager.AuthorizeForResourceAdministration(projectId);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
       var pm = PersistenceManager;
       using (new PerformanceLogger("DeleteProject")) {
@@ -665 +665 @@
         var currentUserId = UserManager.CurrentUserId;
         return pm.UseTransaction(() => {
-          var resourcePermissions = projectPermissionDao.GetAll();
+          var projectPermissions = projectPermissionDao.GetAll();
           return projectDao.GetAll().ToList()
             .Where(x => isAdministrator
               || x.OwnerUserId == currentUserId
-              || UserManager.VerifyUser(currentUserId, resourcePermissions
+              || UserManager.VerifyUser(currentUserId, projectPermissions
                   .Where(y => y.ProjectId == x.ProjectId)
                   .Select(z => z.GrantedUserId)
@@ -684 +684 @@
     public void GrantProjectPermissions(Guid projectId, Guid[] grantedUserIds) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
       var pm = PersistenceManager;
       using (new PerformanceLogger("GrantProjectPermissions")) {
@@ -704 +705 @@
     public void RevokeProjectPermissions(Guid projectId, Guid[] grantedUserIds) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
       var pm = PersistenceManager;
       using (new PerformanceLogger("RevokeProjectPermissions")) {
         var projectPermissionDao = pm.ProjectPermissionDao;
         pm.UseTransaction(() => {
-          AuthorizeForProject(pm, projectId);
           projectPermissionDao.DeleteByProjectAndGrantedUserId(projectId, grantedUserIds);
           pm.SubmitChanges();

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Interfaces/IAuthorizationManager.cs

@@ -35 +35 @@
 
     void AuthorizeForResourceAdministration(Guid resourceId);
+
+    void AuthorizeForProjectAdministration(Guid projectId);
   }
 }

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs

@@ -81 +81 @@
     }
 
+    public void AuthorizeForProjectAdministration(Guid projectId) {
+      var pm = PersistenceManager;
+      var projectDao = pm.ProjectDao;
+      pm.UseTransaction(() => {
+        var project = projectDao.GetById(projectId);
+        if (project == null) throw new SecurityException(NOT_AUTHORIZED);
+        if (project.OwnerUserId != UserManager.CurrentUserId
+            && !RoleVerifier.IsInRole(HiveRoles.Administrator)) {
+          throw new SecurityException(NOT_AUTHORIZED);
+        }
+      });
+    }
+
     private DA.Permission GetPermissionForJob(IPersistenceManager pm, Guid jobId, Guid userId) {
       var jobDao = pm.JobDao;

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -149 +149 @@
     #endregion
 
-    #region ResourcePermission Methods
-    [OperationContract]
-    void GrantResourcePermissions(Guid resourceId, Guid[] grantedUserIds);
-
-    [OperationContract]
-    void RevokeResourcePermissions(Guid resourceId, Guid[] grantedUserIds);
-
-    [OperationContract]
-    IEnumerable<ProjectPermission> GetResourcePermissions(Guid resourceId);
+    #region ProjectPermission Methods
+    [OperationContract]
+    void GrantProjectPermissions(Guid projectId, Guid[] grantedUserIds);
+
+    [OperationContract]
+    void RevokeProjectPermissions(Guid projectId, Guid[] grantedUserIds);
+
+    [OperationContract]
+    IEnumerable<ProjectPermission> GetProjectPermissions(Guid projectId);
     #endregion