Changeset 6717 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs

Timestamp:

09/08/11 10:38:36 (13 years ago)

Author:

ascheibe

Message:

#1233

• moved DTO's to Services.Hive project
• removed Services.Hive.Common project
• some cleanups
• added DTO's for enums

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs

@@ -22 +22 @@
 using System;
 using System.Security;
-using HeuristicLab.Services.Hive.Common.DataTransfer;
+using HeuristicLab.Services.Hive.DataAccess;
+using DT = HeuristicLab.Services.Hive.DataTransfer;
+
 
 namespace HeuristicLab.Services.Hive {
@@ -31 +33 @@
     }
 
-    public void AuthorizeForJob(Guid jobId, Permission requiredPermission) {
+    public void AuthorizeForJob(Guid jobId, DT.Permission requiredPermission) {
       if (ServiceLocator.Instance.AuthenticationManager.IsInRole(HiveRoles.Slave)) return; // slave-users can access all jobs
 
       Permission permission = ServiceLocator.Instance.HiveDao.GetPermissionForJob(jobId, ServiceLocator.Instance.UserManager.CurrentUserId);
-      if (permission == Permission.NotAllowed || (permission != requiredPermission && requiredPermission == Permission.Full))
+      if (permission == Permission.NotAllowed || (permission != DT.Convert.ToEntity(requiredPermission) && DT.Convert.ToEntity(requiredPermission) == Permission.Full))
         throw new SecurityException("Current user is not authorized to access job");
     }
 
-    public void AuthorizeForExperiment(Guid experimentId, Permission requiredPermission) {
+    public void AuthorizeForExperiment(Guid experimentId, DT.Permission requiredPermission) {
       Permission permission = ServiceLocator.Instance.HiveDao.GetPermissionForExperiment(experimentId, ServiceLocator.Instance.UserManager.CurrentUserId);
-      if (permission == Permission.NotAllowed || (permission != requiredPermission && requiredPermission == Permission.Full)) 
+      if (permission == Permission.NotAllowed || (permission != DT.Convert.ToEntity(requiredPermission) && DT.Convert.ToEntity(requiredPermission) == Permission.Full))
         throw new SecurityException("Current user is not authorized to access experiment");
     }