Changeset 1648 for trunk/sources

Timestamp:

04/24/09 12:07:58 (16 years ago)

Author:

mbecirov

Message:

#586: Add permission constants and adopt server console

Location:

trunk/sources/HeuristicLab.Hive.Server.Core/3.2

Files:

• HeuristicLab.Hive.Server.Core-3.2.csproj (modified) (2 diffs)
• PermissiveSecurityConstants.cs (added)
• ServerConsoleFacade.cs (modified) (4 diffs)
• ServiceLocator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/HeuristicLab.Hive.Server.Core-3.2.csproj

@@ -93 +93 @@
     <Compile Include="JobManager.cs" />
     <Compile Include="LifecycleManager.cs" />
+    <Compile Include="PermissiveSecurityConstants.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServerConsoleFacade.cs" />
@@ -137 +138 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Security.Contracts\3.2\HeuristicLab.Security.Contracts-3.2.csproj">
+      <Project>{D59E852C-F205-4647-8C05-EB9ED1CF44E9}</Project>
+      <Name>HeuristicLab.Security.Contracts-3.2</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs

@@ -27 +27 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts;
+using HeuristicLab.Security.Contracts.Interfaces;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -36 +37 @@
       ServiceLocator.GetJobManager();
 
-    private String loginName = null;
+    private IPermissionManager permManager = ServiceLocator.GetPermissionManager();
 
     #region IServerConsoleFacade Members
 
+    public Guid sessionID = Guid.Empty;
+
     public Response Login(string username, string password) {
       Response resp = new Response();
-
-      loginName = username;
-
-      resp.Success = true;
-      resp.StatusMessage =
-        ApplicationConstants.RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS;
-
+      sessionID = permManager.Authenticate(username, password);
+      if (sessionID == Guid.Empty)
+        resp.Success = false;
+      else {
+        resp.Success = true;
+        resp.StatusMessage =
+          ApplicationConstants.RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS;
+      }
       return resp;
     }
@@ -57 +61 @@
 
     public ResponseList<ClientInfo> GetAllClients() {
-      return clientManager.GetAllClients();
+      if (hasPermission(PermissiveSecurityAction.List_AllClients))
+        return clientManager.GetAllClients();
+      else
+        throw new PermissionException();
     }
 
     public ResponseList<ClientGroup> GetAllClientGroups() {
-      return clientManager.GetAllClientGroups();
+      if (hasPermission(PermissiveSecurityAction.List_AllClientGroups))
+        return clientManager.GetAllClientGroups();
+      else
+        throw new PermissionException();
     }
 
     public ResponseList<UpTimeStatistics> GetAllUpTimeStatistics() {
-      return clientManager.GetAllUpTimeStatistics();
+      if (hasPermission(PermissiveSecurityAction.Show_Statistics))
+        return clientManager.GetAllUpTimeStatistics();
+      else
+        throw new PermissionException();
     }
 
     public Response AddClientGroup(ClientGroup clientGroup) {
-      return clientManager.AddClientGroup(clientGroup);
+      if (hasPermission(PermissiveSecurityAction.Add_ClientGroup))
+        return clientManager.AddClientGroup(clientGroup);
+      else
+        throw new PermissionException();
     }
 
     public Response AddResourceToGroup(Guid clientGroupId, Resource resource) {
-      return clientManager.AddResourceToGroup(clientGroupId, resource);
+      if (hasPermission(PermissiveSecurityAction.Add_Resource))
+        return clientManager.AddResourceToGroup(clientGroupId, resource);
+      else
+        throw new PermissionException();
     }
 
     public Response DeleteResourceFromGroup(Guid clientGroupId, Guid resourceId) {
-      return clientManager.DeleteResourceFromGroup(clientGroupId, resourceId);
+      if (hasPermission(PermissiveSecurityAction.Delete_Resource))
+        return clientManager.DeleteResourceFromGroup(clientGroupId, resourceId);
+      else
+        throw new PermissionException();
     }
 
@@ -85 +107 @@
 
     public ResponseList<HeuristicLab.Hive.Contracts.BusinessObjects.Job> GetAllJobs() {
-      return jobManager.GetAllJobs();
+      if (hasPermission(PermissiveSecurityAction.Get_AllJobs))
+        return jobManager.GetAllJobs();
+      else
+        throw new PermissionException();
     }
+
     public ResponseObject<Job> AddNewJob(Job job) {
-      return jobManager.AddNewJob(job);
+      if (hasPermission(PermissiveSecurityAction.Add_Job))
+        return jobManager.AddNewJob(job);
+      else
+        throw new PermissionException();
     }
 
     public ResponseObject<JobResult> GetLastJobResultOf(Guid jobId, bool requested) {
-      return jobManager.GetLastJobResultOf(jobId, requested);
+      if (hasPermission(PermissiveSecurityAction.Get_LastJobResult))
+        return jobManager.GetLastJobResultOf(jobId, requested);
+      else
+        throw new PermissionException();
+    }
+
+    public ResponseObject<List<JobResult>> GetAllJobResults(Guid jobId) {
+      if (hasPermission(PermissiveSecurityAction.Get_AllJobResults))
+        return jobManager.GetAllJobResults(jobId);
+      else
+        throw new PermissionException();
     }
 
     public Response RemoveJob(Guid jobId) {
-      return jobManager.RemoveJob(jobId);
+      if (hasPermission(PermissiveSecurityAction.Remove_Job))
+        return jobManager.RemoveJob(jobId);
+      else
+        throw new PermissionException();
     }
 
     public Response RequestSnapshot(Guid jobId) {
-      return jobManager.RequestSnapshot(jobId);
+      if (hasPermission(PermissiveSecurityAction.Request_Snapshot))
+        return jobManager.RequestSnapshot(jobId);
+      else
+        throw new PermissionException();
     }
 
     public Response AbortJob(Guid jobId) {
-      return jobManager.AbortJob(jobId);
+      if (hasPermission(PermissiveSecurityAction.Abort_Job))
+        return jobManager.AbortJob(jobId);
+      else
+        throw new PermissionException();
     }
 
-    public ResponseObject<List<JobResult>> GetAllJobResults(Guid jobId) {
-      throw new NotImplementedException();
+    private bool hasPermission(Guid action) {
+      return true;
+      /*
+      if (sessionID == Guid.Empty)
+        throw new Exception("sessionID is not set! Please check if user is successfully logged on!");
+      return permManager.CheckPermission(sessionID, action, Guid.Empty);
+       */
+    }
+
+    public class PermissionException : Exception {
+      public PermissionException()
+        : base("Current user has insufficent rights for this action!") {
+      }
+
+      public PermissionException(string msg)
+        : base(msg) {
+      }
+
+
     }
 
     #endregion
+
   }
 }

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ServiceLocator.cs

@@ -28 +28 @@
 using HeuristicLab.DataAccess.Interfaces;
 using System.Data.SqlClient;
+using HeuristicLab.Security.Contracts.Interfaces;
 
 /// <summary>
@@ -47 +48 @@
 
   private static IScheduler scheduler = null;
+
+  private static IPermissionManager permManager = null;
 
   /// <summary>
@@ -129 +132 @@
     return scheduler;
   }
+
+  /// <summary>
+  /// Gets the permission manager
+  /// </summary>
+  /// <returns></returns>
+  [MethodImpl(MethodImplOptions.Synchronized)]  
+  public static IPermissionManager GetPermissionManager() {
+    if (permManager == null)
+      permManager = discoveryService.GetInstances<IPermissionManager>()[0];
+    return permManager;
+    
+  }
 }