Changeset 12926 for trunk/sources/HeuristicLab.Services.Hive/3.3

Timestamp:

09/01/15 14:10:37 (9 years ago)

Author:

jkarder

Message:

#2355:

• changed sandboxing to always use an unrestricted permission set
• removed IsAllowedPrivileged role and according IsPrivileged code

Location:

trunk/sources/HeuristicLab.Services.Hive/3.3

Files:

• Converter.cs (modified) (2 diffs)
• DataTransfer/Task.cs (modified) (1 diff)
• HiveRoles.cs (modified) (1 diff)
• HiveService.cs (modified) (1 diff)
• ServiceContracts/IHiveService.cs (modified) (1 diff)

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

@@ -44 +44 @@
         Command = source.Command.ToDto(),
         JobId = source.JobId,
-        IsPrivileged = source.IsPrivileged,
         PluginsNeededIds = source.RequiredPlugins.Select(x => x.PluginId).ToList(),
         StateLog = source.StateLogs.Select(x => x.ToDto()).OrderBy(x => x.DateTime).ToList(),
@@ -72 +71 @@
       target.Command = source.Command.ToEntity();
       target.JobId = source.JobId;
-      target.IsPrivileged = source.IsPrivileged;
       var ids = target.RequiredPlugins.Select(x => x.PluginId);
       target.RequiredPlugins.AddRange(source.PluginsNeededIds

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

@@ -44 +44 @@
     [DataMember]
     public Guid JobId { get; set; }
-    [DataMember]
-    public bool IsPrivileged { get; set; }
 
     public Task() {

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

@@ -25 +25 @@
     public const string Slave = "Hive Slave";
     public const string Client = "Hive User";
-    public const string IsAllowedPrivileged = "Hive IsAllowedPrivileged";
   }
 }

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

@@ -469 +469 @@
     }
 
+    // BackwardsCompatibility3.3
+    #region Backwards compatible code, remove with 3.4
     public bool IsAllowedPrivileged() {
-      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return RoleVerifier.IsInRole(HiveRoles.IsAllowedPrivileged);
-    }
+      return true;
+    }
+    #endregion
     #endregion
 

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

@@ -97 +97 @@
     IEnumerable<JobPermission> GetJobPermissions(Guid jobId);
 
+    // BackwardsCompatibility3.3
+    #region Backwards compatible code, remove with 3.4
     [OperationContract]
     bool IsAllowedPrivileged(); // current user may execute privileged task
+    #endregion
     #endregion