Changeset 7916 for trunk/sources/HeuristicLab.Services.Hive

Timestamp:

05/29/12 14:04:59 (12 years ago)

Author:

jkarder

Message:

#1860:

• integrated owner attribute (OwnerUserId) into the Hive components
• adjusted database scheme
• adjusted service methods

Location:

trunk/sources/HeuristicLab.Services.Hive/3.3

Files:

• Convert.cs (modified) (4 diffs)
• DataTransfer/Resource.cs (modified) (1 diff)
• HeuristicLab.Services.Hive-3.3.csproj (modified) (1 diff)
• HiveDao.cs (modified) (1 diff)
• HiveService.cs (modified) (4 diffs)
• Interfaces/IHiveDao.cs (modified) (1 diff)
• ServiceContracts/IHiveService.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Services.Hive/3.3/Convert.cs

@@ -200 +200 @@
     #endregion
 
+    #region Resource
+    public static DT.Resource ToDto(DB.Resource source) {
+      if (source == null) return null;
+      return new DT.Resource { Id = source.ResourceId, Name = source.Name, ParentResourceId = source.ParentResourceId, HbInterval = source.HbInterval, OwnerUserId = source.OwnerUserId };
+    }
+    public static DB.Resource ToEntity(DT.Resource source) {
+      if (source == null) return null;
+      var entity = new DB.Resource(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.Resource source, DB.Resource target) {
+      if ((source != null) && (target != null)) {
+        target.ResourceId = source.Id; target.Name = source.Name; target.ParentResourceId = source.ParentResourceId; target.HbInterval = source.HbInterval; target.OwnerUserId = source.OwnerUserId;
+      }
+    }
+    #endregion
+
+    #region SlaveGroup
+    public static DT.SlaveGroup ToDto(DB.SlaveGroup source) {
+      if (source == null) return null;
+      return new DT.SlaveGroup { Id = source.ResourceId, Name = source.Name, ParentResourceId = source.ParentResourceId, HbInterval = source.HbInterval, OwnerUserId = source.OwnerUserId };
+    }
+    public static DB.SlaveGroup ToEntity(DT.SlaveGroup source) {
+      if (source == null) return null;
+      var entity = new DB.SlaveGroup(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.SlaveGroup source, DB.SlaveGroup target) {
+      if ((source != null) && (target != null)) {
+        target.ResourceId = source.Id; target.Name = source.Name; target.ParentResourceId = source.ParentResourceId; target.HbInterval = source.HbInterval; target.OwnerUserId = source.OwnerUserId;
+      }
+    }
+    #endregion
+
     #region Slave
     public static DT.Slave ToDto(DB.Slave source) {
@@ -219 +253 @@
         CpuUtilization = source.CpuUtilization,
         HbInterval = source.HbInterval,
-        IsDisposable = source.IsDisposable
+        IsDisposable = source.IsDisposable,
+        OwnerUserId = source.OwnerUserId
       };
     }
@@ -245 +280 @@
         target.HbInterval = source.HbInterval;
         target.IsDisposable = source.IsDisposable;
-      }
-    }
-    #endregion
-
-    #region SlaveGroup
-    public static DT.SlaveGroup ToDto(DB.SlaveGroup source) {
-      if (source == null) return null;
-      return new DT.SlaveGroup { Id = source.ResourceId, Name = source.Name, ParentResourceId = source.ParentResourceId, HbInterval = source.HbInterval };
-    }
-    public static DB.SlaveGroup ToEntity(DT.SlaveGroup source) {
-      if (source == null) return null;
-      var entity = new DB.SlaveGroup(); ToEntity(source, entity);
-      return entity;
-    }
-    public static void ToEntity(DT.SlaveGroup source, DB.SlaveGroup target) {
-      if ((source != null) && (target != null)) {
-        target.ResourceId = source.Id; target.Name = source.Name; target.ParentResourceId = source.ParentResourceId; target.HbInterval = source.HbInterval;
-      }
-    }
-    #endregion
-
-    #region Resource
-    public static DT.Resource ToDto(DB.Resource source) {
-      if (source == null) return null;
-      return new DT.Resource { Id = source.ResourceId, Name = source.Name, ParentResourceId = source.ParentResourceId, HbInterval = source.HbInterval };
-    }
-    public static DB.Resource ToEntity(DT.Resource source) {
-      if (source == null) return null;
-      var entity = new DB.Resource(); ToEntity(source, entity);
-      return entity;
-    }
-    public static void ToEntity(DT.Resource source, DB.Resource target) {
-      if ((source != null) && (target != null)) {
-        target.ResourceId = source.Id; target.Name = source.Name; target.ParentResourceId = source.ParentResourceId; target.HbInterval = source.HbInterval;
-      }
-    }
-    #endregion
-
-    #region Statistics
-    public static DT.Statistics ToDto(DB.Statistics source) {
-      if (source == null) return null;
-      return new DT.Statistics {
-        Id = source.StatisticsId,
-        TimeStamp = source.Timestamp,
-        SlaveStatistics = source.SlaveStatistics.Select(x => Convert.ToDto(x)).ToArray(),
-        UserStatistics = source.UserStatistics.Select(x => Convert.ToDto(x)).ToArray()
-      };
-    }
-    public static DB.Statistics ToEntity(DT.Statistics source) {
-      if (source == null) return null;
-      var entity = new DB.Statistics(); ToEntity(source, entity);
-      return entity;
-    }
-    public static void ToEntity(DT.Statistics source, DB.Statistics target) {
-      if ((source != null) && (target != null)) {
-        target.StatisticsId = source.Id;
-        target.Timestamp = source.TimeStamp;
-
+        target.OwnerUserId = source.OwnerUserId;
+      }
+    }
+    #endregion
+
+    #region ResourcePermission
+    public static DT.ResourcePermission ToDto(DB.ResourcePermission source) {
+      if (source == null) return null;
+      return new DT.ResourcePermission { ResourceId = source.ResourceId, GrantedUserId = source.GrantedUserId, GrantedByUserId = source.GrantedByUserId };
+    }
+    public static DB.ResourcePermission ToEntity(DT.ResourcePermission source) {
+      if (source == null) return null;
+      var entity = new DB.ResourcePermission(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.ResourcePermission source, DB.ResourcePermission target) {
+      if ((source != null) && (target != null)) {
+        target.ResourceId = source.ResourceId; target.GrantedUserId = source.GrantedUserId; target.GrantedByUserId = source.GrantedByUserId;
       }
     }
@@ -334 +329 @@
         target.FreeMemory = source.FreeMemory;
         target.Memory = source.Memory;
+      }
+    }
+    #endregion
+
+    #region Statistics
+    public static DT.Statistics ToDto(DB.Statistics source) {
+      if (source == null) return null;
+      return new DT.Statistics {
+        Id = source.StatisticsId,
+        TimeStamp = source.Timestamp,
+        SlaveStatistics = source.SlaveStatistics.Select(x => Convert.ToDto(x)).ToArray(),
+        UserStatistics = source.UserStatistics.Select(x => Convert.ToDto(x)).ToArray()
+      };
+    }
+    public static DB.Statistics ToEntity(DT.Statistics source) {
+      if (source == null) return null;
+      var entity = new DB.Statistics(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.Statistics source, DB.Statistics target) {
+      if ((source != null) && (target != null)) {
+        target.StatisticsId = source.Id;
+        target.Timestamp = source.TimeStamp;
+
       }
     }

trunk/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Resource.cs

@@ -29 +29 @@
     [DataMember]
     public Guid? ParentResourceId { get; set; }
-
     [DataMember]
     public int HbInterval { get; set; }
+    [DataMember]
+    public Guid? OwnerUserId { get; set; }
 
     public Resource() { }

trunk/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj

@@ -114 +114 @@
     <Compile Include="Convert.cs" />
     <Compile Include="DataTransfer\Command.cs" />
+    <Compile Include="DataTransfer\ResourcePermission.cs" />
     <Compile Include="DataTransfer\Downtime.cs" />
     <Compile Include="DataTransfer\Heartbeat.cs" />

trunk/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -613 +613 @@
     #endregion
 
+    #region ResourcePermission Methods
+    public DT.ResourcePermission GetResourcePermission(Guid resourceId, Guid grantedUserId) {
+      using (var db = CreateContext()) {
+        return DT.Convert.ToDto(db.ResourcePermissions.SingleOrDefault(x => x.ResourceId == resourceId && x.GrantedUserId == grantedUserId));
+      }
+    }
+
+    public IEnumerable<DT.ResourcePermission> GetResourcePermissions(Expression<Func<ResourcePermission, bool>> predicate) {
+      using (var db = CreateContext()) {
+        return db.ResourcePermissions.Where(predicate).Select(x => DT.Convert.ToDto(x)).ToArray();
+      }
+    }
+
+    public void AddResourcePermission(DT.ResourcePermission dto) {
+      using (var db = CreateContext()) {
+        var entity = db.ResourcePermissions.SingleOrDefault(x => x.ResourceId == dto.ResourceId && x.GrantedUserId == dto.GrantedUserId);
+        if (entity == null) { db.ResourcePermissions.InsertOnSubmit(DT.Convert.ToEntity(dto)); db.SubmitChanges(); }
+      }
+    }
+
+    public void UpdateResourcePermission(DT.ResourcePermission dto) {
+      using (var db = CreateContext()) {
+        var entity = db.ResourcePermissions.FirstOrDefault(x => x.ResourceId == dto.ResourceId && x.GrantedUserId == dto.GrantedUserId);
+        if (entity == null) db.ResourcePermissions.InsertOnSubmit(DT.Convert.ToEntity(dto));
+        else DT.Convert.ToEntity(dto, entity);
+        db.SubmitChanges();
+      }
+    }
+
+    public void DeleteResourcePermission(Guid resourceId, Guid grantedUserId) {
+      using (var db = CreateContext()) {
+        var entity = db.ResourcePermissions.FirstOrDefault(x => x.ResourceId == resourceId && x.GrantedUserId == grantedUserId);
+        if (entity != null) db.ResourcePermissions.DeleteOnSubmit(entity);
+        db.SubmitChanges();
+      }
+    }
+    #endregion
+
     #region Authorization Methods
     public Permission GetPermissionForTask(Guid taskId, Guid userId) {

trunk/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -353 +353 @@
     public void Hello(Slave slaveInfo) {
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
+      if (userManager.CurrentUser.UserName != "hiveslave")
+        slaveInfo.OwnerUserId = userManager.CurrentUserId;
+
       trans.UseTransaction(() => {
         var slave = dao.GetSlave(slaveInfo.Id);
@@ -359 +362 @@
           dao.AddSlave(slaveInfo);
         } else {
-          var dbSlave = dao.GetSlave(slaveInfo.Id);
-
-          dbSlave.Name = slaveInfo.Name;
-          dbSlave.Description = slaveInfo.Description;
-
-          dbSlave.Cores = slaveInfo.Cores;
-          dbSlave.CpuArchitecture = slaveInfo.CpuArchitecture;
-          dbSlave.CpuSpeed = slaveInfo.CpuSpeed;
-          dbSlave.FreeCores = slaveInfo.FreeCores;
-          dbSlave.FreeMemory = slaveInfo.FreeMemory;
-          dbSlave.Memory = slaveInfo.Memory;
-          dbSlave.OperatingSystem = slaveInfo.OperatingSystem;
-
-          dbSlave.LastHeartbeat = DateTime.Now;
-          dbSlave.SlaveState = SlaveState.Idle;
+          slave.Name = slaveInfo.Name;
+          slave.Description = slaveInfo.Description;
+          slave.OwnerUserId = slaveInfo.OwnerUserId;
+
+          slave.Cores = slaveInfo.Cores;
+          slave.CpuArchitecture = slaveInfo.CpuArchitecture;
+          slave.CpuSpeed = slaveInfo.CpuSpeed;
+          slave.FreeCores = slaveInfo.FreeCores;
+          slave.FreeMemory = slaveInfo.FreeMemory;
+          slave.Memory = slaveInfo.Memory;
+          slave.OperatingSystem = slaveInfo.OperatingSystem;
+
+          slave.LastHeartbeat = DateTime.Now;
+          slave.SlaveState = SlaveState.Idle;
 
           // don't update those properties: dbSlave.IsAllowedToCalculate, dbSlave.ParentResourceId 
 
-          dao.UpdateSlave(dbSlave);
+          dao.UpdateSlave(slave);
         }
       });
@@ -461 +463 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       dao.DeletePlugin(pluginId);
+    }
+    #endregion
+
+    #region ResourcePermission Methods
+    public void GrantResourcePermission(Guid resourceId, Guid grantedUserId) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      trans.UseTransaction(() => {
+        Resource resource = dao.GetResource(resourceId);
+        if (resource == null) throw new FaultException<FaultReason>(new FaultReason("Could not find resource with id " + resourceId));
+        if (resource.OwnerUserId != userManager.CurrentUserId) throw new FaultException<FaultReason>(new FaultReason("Not allowed to grant permission for this resource"));
+        dao.AddResourcePermission(new ResourcePermission { ResourceId = resourceId, GrantedByUserId = userManager.CurrentUserId, GrantedUserId = grantedUserId });
+      });
+    }
+
+    public void RevokeResourcePermission(Guid resourceId, Guid grantedUserId) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      trans.UseTransaction(() => {
+        Resource resource = dao.GetResource(resourceId);
+        if (resource == null) throw new FaultException<FaultReason>(new FaultReason("Could not find resource with id " + resourceId));
+        if (resource.OwnerUserId != userManager.CurrentUserId) throw new FaultException<FaultReason>(new FaultReason("Not allowed to revoke permission for this resource"));
+        dao.DeleteResourcePermission(resourceId, grantedUserId);
+      });
+    }
+
+    public IEnumerable<ResourcePermission> GetResourcePermissions(Guid resourceId) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      return trans.UseTransaction(() => {
+        Resource resource = dao.GetResource(resourceId);
+        if (resource == null) throw new FaultException<FaultReason>(new FaultReason("Could not find resource with id " + resourceId));
+        if (resource.OwnerUserId != userManager.CurrentUserId) throw new FaultException<FaultReason>(new FaultReason("Not allowed to list permissions for this resource"));
+        return dao.GetResourcePermissions(x => x.ResourceId == resourceId);
+      });
     }
     #endregion
@@ -497 +531 @@
     public IEnumerable<Slave> GetSlaves() {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return dao.GetSlaves(x => true);
+      return dao.GetSlaves(x => x.OwnerUserId == null
+                             || x.OwnerUserId == userManager.CurrentUserId
+                             || x.ResourcePermissions.Count(y => y.GrantedUserId == userManager.CurrentUserId) > 0
+                             || authen.IsInRole(HiveRoles.Administrator));
     }
 
     public IEnumerable<SlaveGroup> GetSlaveGroups() {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return dao.GetSlaveGroups(x => true);
+      return dao.GetSlaveGroups(x => x.OwnerUserId == null
+                                  || x.OwnerUserId == userManager.CurrentUserId
+                                  || x.ResourcePermissions.Count(y => y.GrantedUserId == userManager.CurrentUserId) > 0
+                                  || authen.IsInRole(HiveRoles.Administrator));
     }
 

trunk/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs

@@ -117 +117 @@
     #endregion
 
+    #region ResourcePermission Methods
+    DT.ResourcePermission GetResourcePermission(Guid resourceId, Guid grantedUserId);
+    IEnumerable<DT.ResourcePermission> GetResourcePermissions(Expression<Func<ResourcePermission, bool>> predicate);
+    void AddResourcePermission(DT.ResourcePermission dto);
+    void UpdateResourcePermission(DT.ResourcePermission dto);
+    void DeleteResourcePermission(Guid resourceId, Guid grantedUserId);
+    #endregion
+
     #region Authorization Methods
     Permission GetPermissionForTask(Guid taskId, Guid userId);

trunk/sources/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -158 +158 @@
     #endregion
 
+    #region ResourcePermission Methods
+    [OperationContract]
+    void GrantResourcePermission(Guid resourceId, Guid grantedUserId);
+
+    [OperationContract]
+    void RevokeResourcePermission(Guid resourceId, Guid grantedUserId);
+
+    [OperationContract]
+    IEnumerable<ResourcePermission> GetResourcePermissions(Guid resourceId);
+    #endregion
+
     #region Slave Methods
     [OperationContract]