Changeset 15737 for branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3

Timestamp:

02/08/18 11:13:15 (7 years ago)

Author:

jzenisek

Message:

#2839

• updated sql scripts (necessary foreign key option alterations & introduction of statistic tables)
• updated HiveService according to changed client side (deletion-routine, permission checking,...)

Location:

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3

Files:

• HiveService.cs (modified) (10 diffs)
• Interfaces/IAuthorizationManager.cs (modified) (1 diff)
• Manager/AuthorizationManager.cs (modified) (2 diffs)

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

@@ -680 +680 @@
       if (!RoleVerifier.IsInRole(HiveRoles.Administrator)) {
         if(projectDto.ParentProjectId.HasValue) {
-          AuthorizationManager.AuthorizeForProjectAdministration(projectDto.ParentProjectId.Value);
+          AuthorizationManager.AuthorizeForProjectAdministration(projectDto.ParentProjectId.Value, false);
         } else {
           throw new SecurityException(NOT_AUTHORIZED_USERPROJECT);
@@ -701 +701 @@
       // check if current (non-admin) user is owner of the project or the projectDto's-parents
       if (!RoleVerifier.IsInRole(HiveRoles.Administrator)) {
-        AuthorizationManager.AuthorizeForProjectAdministration(projectDto.Id);
+        AuthorizationManager.AuthorizeForProjectAdministration(projectDto.Id, false);
       }
 
@@ -720 +720 @@
 
     public void DeleteProject(Guid projectId) {
-      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      // check if current (non-admin) user is owner of the project or the projectDto's-parents
+      if (projectId == Guid.Empty) return;
+      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      // check if current (non-admin) user is owner of one of the projectDto's-parents
       if (!RoleVerifier.IsInRole(HiveRoles.Administrator)) {
-        AuthorizationManager.AuthorizeForProjectAdministration(projectId);
+        AuthorizationManager.AuthorizeForProjectAdministration(projectId, true);
       }
 
@@ -731 +732 @@
         var assignedJobResourceDao = pm.AssignedJobResourceDao;
         pm.UseTransaction(() => {
-          assignedJobResourceDao.DeleteByProjectId(projectId);
-          projectDao.Delete(projectId);
+          var projectIds = new HashSet<Guid> { projectId };
+          projectIds.Union(projectDao.GetChildProjectIdsById(projectId));
+
+          assignedJobResourceDao.DeleteByProjectIds(projectIds);
+          projectDao.DeleteByIds(projectIds);
           pm.SubmitChanges();
         });
@@ -797 +801 @@
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       if (projectId == null || grantedUserIds == null) return;
-      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId, false);
       var pm = PersistenceManager;
       using (new PerformanceLogger("SaveProjectPermissions")) {
@@ -883 +887 @@
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       if (projectId == null || grantedUserIds == null || !grantedUserIds.Any()) return;
-      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId, false);
       var pm = PersistenceManager;
       using (new PerformanceLogger("RevokeProjectPermissions")) {
@@ -904 +908 @@
     public IEnumerable<DT.ProjectPermission> GetProjectPermissions(Guid projectId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId, false);
       var pm = PersistenceManager;
       using (new PerformanceLogger("GetProjectPermissions")) {
@@ -1040 +1044 @@
     public IEnumerable<DT.AssignedProjectResource> GetAssignedResourcesForProjectAdministration(Guid projectId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId, false);
       var pm = PersistenceManager;
       using (new PerformanceLogger("GetAssignedResourcesForProject")) {
@@ -1263 +1267 @@
 
     public void DeleteSlave(Guid slaveId) {
+      if (slaveId == Guid.Empty) return;
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       AuthorizationManager.AuthorizeForResourceAdministration(slaveId);
@@ -1276 +1281 @@
 
     public void DeleteSlaveGroup(Guid slaveGroupId) {
+      if (slaveGroupId == Guid.Empty) return;
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       AuthorizationManager.AuthorizeForResourceAdministration(slaveGroupId);
       var pm = PersistenceManager;
       using (new PerformanceLogger("DeleteSlaveGroup")) {
-        var slaveGroupDao = pm.SlaveGroupDao;
-        pm.UseTransaction(() => {
-          slaveGroupDao.Delete(slaveGroupId);
+        var resourceDao = pm.ResourceDao;
+        pm.UseTransaction(() => {
+          var resourceIds = new HashSet<Guid> { slaveGroupId };
+          resourceIds.Union(resourceDao.GetChildResourceIdsById(slaveGroupId));
+          resourceDao.DeleteByIds(resourceIds);
           pm.SubmitChanges();
         });

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

@@ -37 +37 @@
     void AuthorizeForResourceAdministration(Guid resourceId);
 
-    void AuthorizeForProjectAdministration(Guid projectId);
+    void AuthorizeForProjectAdministration(Guid projectId, bool parentalOwnership);
 
     void AuthorizeForProjectResourceAdministration(Guid projectId, IEnumerable<Guid> resourceIds);

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

@@ -92 +92 @@
 
     // authorize if user is admin, project owner or owner of a parent project
-    public void AuthorizeForProjectAdministration(Guid projectId) {
+    public void AuthorizeForProjectAdministration(Guid projectId, bool parentalOwnership) {
       if (projectId == null) return;
       var currentUserId = UserManager.CurrentUserId;
@@ -98 +98 @@
       var projectDao = pm.ProjectDao;
       pm.UseTransaction(() => {
-        var projectBranch = projectDao.GetCurrentAndParentProjectsById(projectId).ToList();
-        if(!projectBranch.Select(x => x.OwnerUserId).Contains(currentUserId)
-            && !RoleVerifier.IsInRole(HiveRoles.Administrator)) {
+        List<Project> projectBranch = null;
+        if(parentalOwnership) projectDao.GetParentProjectsById(projectId).ToList();
+        else projectBranch = projectDao.GetCurrentAndParentProjectsById(projectId).ToList();
+
+        if(!RoleVerifier.IsInRole(HiveRoles.Administrator)
+            && !projectBranch.Select(x => x.OwnerUserId).Contains(currentUserId)) {
           throw new SecurityException(NOT_AUTHORIZED_USERPROJECT);
         }