Changeset 8085 for branches/GP-MoveOperators/HeuristicLab.Services.Hive/3.3/Manager

Timestamp:

06/21/12 18:02:33 (13 years ago)

Author:

gkronber

Message:

#1847: merged trunk changes r7800:HEAD into gp move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (2 props)
• HeuristicLab.Services.Hive/3.3/Manager/AuthenticationManager.cs (deleted)
• HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Manager/UserManager.cs (deleted)

branches/GP-MoveOperators

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/GP-MoveOperators/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs

@@ -34 +34 @@
 
     public void AuthorizeForTask(Guid taskId, DT.Permission requiredPermission) {
-      if (ServiceLocator.Instance.AuthenticationManager.IsInRole(HiveRoles.Slave)) return; // slave-users can access all tasks
+      if (ServiceLocator.Instance.RoleVerifier.IsInRole(HiveRoles.Slave)) return; // slave-users can access all tasks
 
       Permission permission = ServiceLocator.Instance.HiveDao.GetPermissionForTask(taskId, ServiceLocator.Instance.UserManager.CurrentUserId);
@@ -46 +46 @@
         throw new SecurityException("Current user is not authorized to access task");
     }
+
+    public void AuthorizeForResourceAdministration(Guid resourceId) {
+      Resource resource = DT.Convert.ToEntity(ServiceLocator.Instance.HiveDao.GetResource(resourceId));
+      if (resource.OwnerUserId != ServiceLocator.Instance.UserManager.CurrentUserId && !ServiceLocator.Instance.RoleVerifier.IsInRole(HiveRoles.Administrator))
+        throw new SecurityException("Current user is not authorized to access resource");
+    }
   }
 }

branches/GP-MoveOperators/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -49 +49 @@
         SetTimeoutSlavesOffline();
         SetTimeoutTasksWaiting();
+        DeleteObsoleteSlaves();
       }, true);
 
@@ -116 +117 @@
       }
     }
+
+    /// <summary>
+    /// Searches for slaves that are disposable and deletes them if they were offline for too long
+    /// </summary>
+    private void DeleteObsoleteSlaves() {
+      var slaves = dao.GetSlaves(x => x.IsDisposable.GetValueOrDefault() && x.SlaveState == SlaveState.Offline && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.SweepInterval);
+      foreach (DT.Slave slave in slaves) dao.DeleteSlave(slave.Id);
+    }
   }
 }

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests