Changeset 997

Timestamp:

12/16/08 22:20:13 (16 years ago)

Author:

kgrading

Message:

improved sandbox (#410)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Core/Core.cs (modified) (3 diffs)
• HeuristicLab.Hive.Contracts/Properties/AssemblyInfo.frame (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/Runner.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -45 +45 @@
 
 namespace HeuristicLab.Hive.Client.Core {
-  public class Core {
-
+  public class Core: MarshalByRefObject {
     public delegate string GetASnapshotDelegate();
 
     Dictionary<long, Executor> engines = new Dictionary<long, Executor>();
     Dictionary<long, AppDomain> appDomains = new Dictionary<long, AppDomain>();
-
-    private ClientCommunicatorClient ccc;
+    
     private WcfService wcfService;
 
@@ -146 +144 @@
     void wcfService_PullJobCompleted(object sender, PullJobCompletedEventArgs e) {
       if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
-        bool sandboxed = false;
+        bool sandboxed = true;
 
         PluginManager.Manager.Initialize();
-        AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.JobId.ToString(), sandboxed, typeof(TestJob));      
+        AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.JobId.ToString(), sandboxed, typeof(TestJob));
+        appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
+
         appDomains.Add(e.Result.JobId, appDomain);
 
@@ -190 +190 @@
       return engines;
     }
+
+    void appDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) {
+      Logging.GetInstance().Error(this.ToString(), " Exception: " + e.ExceptionObject.ToString());
+    }
   }
 }

trunk/sources/HeuristicLab.Hive.Contracts/Properties/AssemblyInfo.frame

@@ -24 +24 @@
 using System.Runtime.InteropServices;
 using HeuristicLab.PluginInfrastructure;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
@@ -36 +37 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: AllowPartiallyTrustedCallers]
 
 // Setting ComVisible to false makes the types in this assembly not visible 

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -161 +161 @@
 
     public AppDomain CreateAndInitAppDomainWithSandbox(string friendlyName, bool sandboxed, Type jobType) {
-
       PermissionSet pset;
+
+      DiscoveryService dService = new DiscoveryService();
+      //get the declaring plugin of the job
+      PluginInfo jobPlugin = dService.GetDeclaringPlugin(jobType);
+
+      //get all the plugins that have dependencies with the jobplugin
+      List<PluginInfo> depPlugins = GetDependentPlugins(jobPlugin);
+      //insert all jobs into one list
+      depPlugins.Add(jobPlugin);
+      
       if (sandboxed) {
         pset = new PermissionSet(PermissionState.None);
-        pset.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));        
+        pset.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));
+        pset.AddPermission(new ReflectionPermission(PermissionState.Unrestricted));
+        /*foreach (PluginInfo plugin in depPlugins) {
+            foreach(String assemblies in plugin.Assemblies)
+              pset.AddPermission(new FileIOPermission(FileIOPermissionAccess.Read, assemblies));
+        }*/
+        pset.AddPermission(new FileIOPermission(PermissionState.Unrestricted));
       } else {
         pset = new PermissionSet(PermissionState.Unrestricted);
@@ -176 +191 @@
       Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap(typeof(Runner).Assembly.GetName().Name, typeof(Runner).FullName);
       NotifyListeners(PluginManagerAction.Initializing, "All plugins");
-
-      DiscoveryService dService = new DiscoveryService();
-      PluginInfo jobPlugin = dService.GetDeclaringPlugin(jobType);
-
-      List<PluginInfo> depPlugins = GetDependentPlugins(jobPlugin);
-      depPlugins.Add(jobPlugin);
 
       if (depPlugins != null && depPlugins.Count > 0) {

trunk/sources/HeuristicLab.PluginInfrastructure/Runner.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.PluginInfrastructure {
-  internal class Runner : MarshalByRefObject {
+  public class Runner : MarshalByRefObject {
 
     public void LoadPlugins(ICollection<PluginInfo> plugins) {