Changeset 997 for trunk/sources/HeuristicLab.PluginInfrastructure

Timestamp:

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

Author:

kgrading

Message:

improved sandbox (#410)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure

Files:

• PluginManager.cs (modified) (2 diffs)
• Runner.cs (modified) (1 diff)

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) {