- Timestamp:
- 05/08/09 14:15:30 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs
r1757 r1769 28 28 using HeuristicLab.Hive.Contracts; 29 29 using HeuristicLab.Security.Contracts.Interfaces; 30 using HeuristicLab.Hive.Server.Core.InternalInterfaces; 30 31 31 32 namespace HeuristicLab.Hive.Server.Core { … … 37 38 ServiceLocator.GetJobManager(); 38 39 39 //private IPermissionManager permManager = ServiceLocator.GetPermissionManager(); 40 41 #region IServerConsoleFacade Members 40 private IHivePermissionManager secMan = ServiceLocator.GetHivePermissionManager(); 42 41 43 42 public Guid sessionID = Guid.Empty; … … 45 44 public Response Login(string username, string password) { 46 45 Response resp = new Response(); 47 /* 48 sessionID = permManager.Authenticate(username, password); 46 sessionID = secMan.Login(username, password); 49 47 if (sessionID == Guid.Empty) 50 48 resp.Success = false; 51 49 else { 52 53 50 resp.Success = true; 54 51 resp.StatusMessage = 55 52 ApplicationConstants.RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS; 56 53 } 57 */58 resp.Success = true;59 resp.StatusMessage =60 ApplicationConstants.RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS;61 54 return resp; 62 55 } 63 56 64 #endregion65 66 #region IClientManager Members67 57 68 58 public ResponseList<ClientInfo> GetAllClients() { 69 if ( hasPermission(PermissiveSecurityAction.List_AllClients))59 if (HasPermission(PermissiveSecurityAction.List_AllClients)) 70 60 return clientManager.GetAllClients(); 71 61 else … … 74 64 75 65 public ResponseList<ClientGroup> GetAllClientGroups() { 76 if ( hasPermission(PermissiveSecurityAction.List_AllClientGroups))66 if (HasPermission(PermissiveSecurityAction.List_AllClientGroups)) 77 67 return clientManager.GetAllClientGroups(); 78 68 else … … 81 71 82 72 public ResponseList<UpTimeStatistics> GetAllUpTimeStatistics() { 83 if ( hasPermission(PermissiveSecurityAction.Show_Statistics))73 if (HasPermission(PermissiveSecurityAction.Show_Statistics)) 84 74 return clientManager.GetAllUpTimeStatistics(); 85 75 else … … 88 78 89 79 public Response AddClientGroup(ClientGroup clientGroup) { 90 if ( hasPermission(PermissiveSecurityAction.Add_ClientGroup))80 if (HasPermission(PermissiveSecurityAction.Add_ClientGroup)) 91 81 return clientManager.AddClientGroup(clientGroup); 92 82 else … … 95 85 96 86 public Response AddResourceToGroup(Guid clientGroupId, Resource resource) { 97 if ( hasPermission(PermissiveSecurityAction.Add_Resource))87 if (HasPermission(PermissiveSecurityAction.Add_Resource)) 98 88 return clientManager.AddResourceToGroup(clientGroupId, resource); 99 89 else … … 102 92 103 93 public Response DeleteResourceFromGroup(Guid clientGroupId, Guid resourceId) { 104 if ( hasPermission(PermissiveSecurityAction.Delete_Resource))94 if (HasPermission(PermissiveSecurityAction.Delete_Resource)) 105 95 return clientManager.DeleteResourceFromGroup(clientGroupId, resourceId); 106 96 else … … 108 98 } 109 99 110 #endregion111 112 #region IJobManager Members113 100 114 101 public ResponseList<HeuristicLab.Hive.Contracts.BusinessObjects.Job> GetAllJobs() { 115 if ( hasPermission(PermissiveSecurityAction.Get_AllJobs))102 if (HasPermission(PermissiveSecurityAction.Get_AllJobs)) 116 103 return jobManager.GetAllJobs(); 117 104 else … … 120 107 121 108 public ResponseObject<Job> AddNewJob(Job job) { 122 if (hasPermission(PermissiveSecurityAction.Add_Job ))109 if (hasPermission(PermissiveSecurityAction.Add_Job, job.Client.Id)) 123 110 return jobManager.AddNewJob(job); 124 111 else … … 127 114 128 115 public ResponseObject<JobResult> GetLastJobResultOf(Guid jobId, bool requested) { 129 if ( hasPermission(PermissiveSecurityAction.Get_LastJobResult))116 if (HasPermission(PermissiveSecurityAction.Get_LastJobResult)) 130 117 return jobManager.GetLastJobResultOf(jobId, requested); 131 118 else … … 134 121 135 122 public ResponseObject<List<JobResult>> GetAllJobResults(Guid jobId) { 136 if ( hasPermission(PermissiveSecurityAction.Get_AllJobResults))123 if (HasPermission(PermissiveSecurityAction.Get_AllJobResults)) 137 124 return jobManager.GetAllJobResults(jobId); 138 125 else … … 141 128 142 129 public Response RemoveJob(Guid jobId) { 143 if ( hasPermission(PermissiveSecurityAction.Remove_Job))130 if (HasPermission(PermissiveSecurityAction.Remove_Job)) 144 131 return jobManager.RemoveJob(jobId); 145 132 else … … 148 135 149 136 public Response RequestSnapshot(Guid jobId) { 150 if ( hasPermission(PermissiveSecurityAction.Request_Snapshot))137 if (HasPermission(PermissiveSecurityAction.Request_Snapshot)) 151 138 return jobManager.RequestSnapshot(jobId); 152 139 else … … 155 142 156 143 public Response AbortJob(Guid jobId) { 157 if ( hasPermission(PermissiveSecurityAction.Abort_Job))144 if (HasPermission(PermissiveSecurityAction.Abort_Job)) 158 145 return jobManager.AbortJob(jobId); 159 146 else … … 161 148 } 162 149 163 private bool hasPermission(Guid action) { 164 return true; 165 /* 166 if (sessionID == Guid.Empty) 167 throw new Exception("sessionID is not set! Please check if user is successfully logged on!"); 168 return permManager.CheckPermission(sessionID, action, Guid.Empty); 169 */ 150 public ResponseObject<List<ClientGroup>> GetAllGroupsOfResource(Guid resourceId) { 151 if (HasPermission(PermissiveSecurityAction.Get_AllGroupsOfResource)) 152 return clientManager.GetAllGroupsOfResource(resourceId); 153 else 154 throw new PermissionException(); 170 155 } 156 157 /* 158 private bool HasPermission(Guid action) { 159 return (sessionID == Guid.Empty) ? false : secMan.CheckPermission(sessionID, action, Guid.Empty); 160 } 161 162 private bool HasPermission(Guid action, Guid entityId) { 163 return (sessionID == Guid.Empty) ? false : secMan.CheckPermission(sessionID, action, entityId); 164 } 165 */ 166 167 [Obsolete("Only for testing!")] 168 private bool HasPermission(Guid g) { return true; } 169 [Obsolete("Only for testing!")] 170 private bool hasPermission(Guid g, Guid f) { return true; } 171 171 172 172 public class PermissionException : Exception { … … 182 182 } 183 183 184 public ResponseObject<List<ClientGroup>> GetAllGroupsOfResource(Guid resourceId) {185 return clientManager.GetAllGroupsOfResource(resourceId);186 }187 184 188 #endregion189 185 } 190 186 }
Note: See TracChangeset
for help on using the changeset viewer.