Changeset 4289 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades

Timestamp:

08/23/10 14:40:19 (14 years ago)

Author:

cneumuel

Message:

added role-permission checks, updated service reference (#1168)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades

Files:

• ExecutionEngineFacade.cs (modified) (2 diffs)
• ServerConsoleFacade.cs (modified) (5 diffs)
• SlaveFacade.cs (modified) (12 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ExecutionEngineFacade.cs

@@ -77 +77 @@
     }
 
-
     public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
       using (contextFactory.GetContext(false)) {
@@ -83 +82 @@
       }
     }
+
     #endregion
-
-
   }
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

@@ -32 +32 @@
 using HeuristicLab.Hive.Server.DataAccess;
 using HeuristicLab.Hive.Contracts.ResponseObjects;
-
+using System.Security.Permissions;
+
+      //IIdentity id = ServiceSecurityContext.Current.PrimaryIdentity;
+      //if (!Thread.CurrentPrincipal.IsInRole("Administrator")) {
+
+      //} else {
+      //  // access denied
+      //  throw new SecurityException();
+      //}
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -49 +57 @@
     }
 
-    public Response Login(string username, string password) {
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    public Response Login() {
       Response resp = new Response();
-
-      sessionID = secMan.Login(username, password);
-      if (sessionID == Guid.Empty) {
-        resp.StatusMessage = ResponseStatus.Login_LoginFaild;
-      }
       return resp;
     }
 
-
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseList<SlaveDto> GetAllSlaves() {
       using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessSlaves", sessionID, Guid.Empty);
         return slaveManager.GetAllSlaves();
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseList<SlaveGroupDto> GetAllSlaveGroups() {
       using (contextFactory.GetContext(false)) {
-        //secMan.Authorize("AccessSlaveGroup", sessionID, Guid.Empty);
         return slaveManager.GetAllSlaveGroups();
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseList<UpTimeStatisticsDto> GetAllUpTimeStatistics() {
       using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessStatistics", sessionID, Guid.Empty);
         return slaveManager.GetAllUpTimeStatistics();
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseObject<SlaveGroupDto> AddSlaveGroup(SlaveGroupDto slaveGroup) {
       using (contextFactory.GetContext()) {
-        secMan.Authorize("AddSlaveGroup", sessionID, Guid.Empty);
         return slaveManager.AddSlaveGroup(slaveGroup);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public Response AddResourceToGroup(Guid slaveGroupId, ResourceDto resource) {
       using (contextFactory.GetContext()) {
-        secMan.Authorize("AddResource", sessionID, Guid.Empty);
         return slaveManager.AddResourceToGroup(slaveGroupId, resource);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public Response DeleteResourceFromGroup(Guid slaveGroupId, Guid resourceId) {
       using (contextFactory.GetContext()) {
@@ -101 +105 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseList<JobDto> GetAllJobs() {
       using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessJobs", sessionID, Guid.Empty);
         return jobManager.GetAllJobs();
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseList<JobDto> GetAllJobsWithFilter(JobState jobState, int offset, int count) {
       using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessJobs", sessionID, Guid.Empty);
         return jobManager.GetAllJobsWithFilter(jobState, offset, count);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseObject<JobDto> GetJobById(Guid jobId) {
       using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessJobs", sessionID, jobId);
         return jobManager.GetJobById(jobId);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseObject<JobDto> GetJobByIdWithDetails(Guid jobId) {
       using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessJobs", sessionID, jobId);
         return jobManager.GetJobByIdWithDetails(jobId);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseObject<JobDto> AddNewJob(SerializedJob job) {
       using (contextFactory.GetContext()) {
-        secMan.Authorize("AddJob", sessionID, job.JobInfo.Id);
         return jobManager.AddNewJob(job);
       }
     }
 
-    //public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
-    //  using (contextFactory.GetContext(false)) {
-    //    secMan.Authorize("AccessJobResults", sessionID, jobId);
-    //    return jobManager.GetLastJobResultOf(jobId);
-    //  }
-    //}
-
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
       using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessJobResults", sessionID, jobId);
         return jobManager.GetLastSerializedResult(jobId, requested, snapshot);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
       using (contextFactory.GetContext(false)) {
-        //secMan.Authorize("AccessJobResults", sessionID, jobId); skip authorization
         return jobManager.GetJobResults(jobIds);
       }
     }
 
-    //public Response RemoveJob(Guid jobId) {
-    //  using (contextFactory.GetContext()) {
-    //    secMan.Authorize("RemoveJob", sessionID, jobId);
-    //    return jobManager.RemoveJob(jobId);
-    //  }
-    //}
-
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public Response RequestSnapshot(Guid jobId) {
       using (contextFactory.GetContext()) {
-        secMan.Authorize("AccessJobResults", sessionID, jobId);
         return jobManager.RequestSnapshot(jobId);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public Response AbortJob(Guid jobId) {
       using (contextFactory.GetContext()) {
-        secMan.Authorize("AbortJob", sessionID, Guid.Empty);
         return jobManager.AbortJob(jobId);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseObject<SlaveGroupDtoList> GetAllGroupsOfResource(Guid resourceId) {
       using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessUserGroup", sessionID, Guid.Empty);
         return slaveManager.GetAllGroupsOfResource(resourceId);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public Response DeleteSlaveGroup(Guid slaveGroupId) {
       using (contextFactory.GetContext()) {
-        secMan.Authorize("DeleteSlaveGroup", sessionID, Guid.Empty);
         return slaveManager.DeleteSlaveGroup(slaveGroupId);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseList<ProjectDto> GetAllProjects() {
       using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessProjects", sessionID, Guid.Empty);
         return jobManager.GetAllProjects();
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public Response CreateProject(ProjectDto project) {
       using (contextFactory.GetContext()) {
-        secMan.Authorize("CreateProjects", sessionID, Guid.Empty);
         return jobManager.CreateProject(project);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public Response ChangeProject(ProjectDto project) {
       using (contextFactory.GetContext()) {
-        secMan.Authorize("ChangeProjects", sessionID, Guid.Empty);
         return jobManager.ChangeProject(project);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public Response DeleteProject(Guid projectId) {
       using (contextFactory.GetContext()) {
-        secMan.Authorize("DeleteProjects", sessionID, projectId);
         return jobManager.DeleteProject(projectId);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseList<JobDto> GetJobsByProject(Guid projectId) {
       using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessJobs", sessionID, Guid.Empty);
         return jobManager.GetJobsByProject(projectId);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseList<AppointmentDto> GetUptimeCalendarForResource(Guid guid) {
       using (contextFactory.GetContext(false)) {
@@ -233 +224 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public Response SetUptimeCalendarForResource(Guid guid, IEnumerable<AppointmentDto> appointments, bool isForced) {
       using (contextFactory.GetContext()) {
@@ -239 +231 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public ResponseObject<JobDto> AddJobWithGroupStrings(SerializedJob job, IEnumerable<string> resources) {
       using (contextFactory.GetContext()) {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/SlaveFacade.cs

@@ -36 +36 @@
 using HeuristicLab.Hive.Server.DataAccess;
 using HeuristicLab.Hive.Contracts.ResponseObjects;
+using System.Security.Permissions;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -50 +51 @@
     #region ISlaveCommunicator Members
 
-    public Response Login(SlaveDto clientInfo) {
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
+    public Response Login(Guid slaveId) {
       using (contextFactory.GetContext()) {
-        return slaveCommunicator.Login(clientInfo);
+        return slaveCommunicator.Login(slaveId);
       }
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public ResponseHeartBeat ProcessHeartBeat(HeartBeatData hbData) {
       using (contextFactory.GetContext()) {
@@ -62 +65 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public ResponseObject<JobDto> GetJob(Guid clientId) {
       using (contextFactory.GetContext()) {
@@ -68 +72 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public ResponseResultReceived StoreFinishedJobResult(Guid clientId, Guid jobId, byte[] result, double percentage, string exception) {
       using (contextFactory.GetContext()) {
@@ -74 +79 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public Response Logout(Guid clientId) {
       using (contextFactory.GetContext()) {
@@ -80 +86 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public Response IsJobStillNeeded(Guid jobId) {
       using (contextFactory.GetContext()) {
@@ -86 +93 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public ResponseList<CachedHivePluginInfoDto> GetPlugins(List<HivePluginInfoDto> pluginList) {
       return slaveCommunicator.GetPlugins(pluginList);      
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public ResponseResultReceived ProcessSnapshot(Guid clientId, Guid jobId, byte[] result, double percentage, string exception) {
       using (contextFactory.GetContext()) {
@@ -96 +105 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public ResponseCalendar GetCalendar(Guid clientId) {
       using (contextFactory.GetContext()) {
@@ -102 +112 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public Response SetCalendarStatus(Guid clientId, CalendarState state) { 
       using (contextFactory.GetContext()) {
@@ -114 +125 @@
     /// Do not use automatic transactions here
     /// </summary>
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public Stream GetStreamedJob(Guid clientId) {
       using (contextFactory.GetContext(false)) {
@@ -144 +156 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public Stream GetStreamedPlugins(List<HivePluginInfoDto> pluginList) {
       return new StreamedObject<ResponseList<CachedHivePluginInfoDto>>(this.GetPlugins(pluginList));
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public ResponseResultReceived StoreFinishedJobResultStreamed(Stream stream) {
       using (contextFactory.GetContext()) {
@@ -154 +168 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public ResponseResultReceived ProcessSnapshotStreamed(Stream stream) {
       using (contextFactory.GetContext()) {