Changeset 4042 for branches/3.2/sources/HeuristicLab.PluginInfrastructure

Timestamp:

07/18/10 22:16:04 (14 years ago)

Author:

kgrading

Message:

#828 added various improvements to the plugin cache manager, the execution engine, the transaction handling on the serverside and the server console

File:

• branches/3.2/sources/HeuristicLab.PluginInfrastructure/Sandboxing/SandboxManager.cs (modified) (3 diffs)

branches/3.2/sources/HeuristicLab.PluginInfrastructure/Sandboxing/SandboxManager.cs

@@ -65 +65 @@
 
       #region permission set for sandbox
-      // Uncomment code for sandboxed appdomain
-      //pset = new PermissionSet(PermissionState.None);
-      //pset.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));
-      //pset.AddPermission(new ReflectionPermission(ReflectionPermissionFlag.MemberAccess));
-      //FileIOPermission fPerm = new FileIOPermission(PermissionState.None);
+      //Uncomment code for sandboxed appdomain
+      pset = new PermissionSet(PermissionState.None);
+      pset.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));
+      pset.AddPermission(new ReflectionPermission(ReflectionPermissionFlag.AllFlags));
+      FileIOPermission fPerm = new FileIOPermission(PermissionState.None);
 
-      //foreach (IPluginDescription plugin in ApplicationManager.Manager.Plugins) {
-      //  fPerm.AddPathList(FileIOPermissionAccess.Read | FileIOPermissionAccess.PathDiscovery, plugin.Files.ToArray());
-      //}
+      foreach (IPluginDescription plugin in ApplicationManager.Manager.Plugins) {
+        foreach (IPluginFile pluginFile in plugin.Files) {
+          fPerm.AddPathList(FileIOPermissionAccess.Read | FileIOPermissionAccess.PathDiscovery, pluginFile.Name);  
+          //fPerm.AddPathList(FileIOPermissionAccess.AllAccess, pluginFile.Name);  
+        }        
+      }
 
-      //pset.AddPermission(fPerm);
+      pset.AddPermission(fPerm);
       #endregion
 
       #region permission set of unrestricted appdomain
       // unrestricted appdomain 
-      pset = new PermissionSet(PermissionState.Unrestricted);
+      //pset = new PermissionSet(PermissionState.Unrestricted);
       #endregion
 
@@ -86 +89 @@
       //setup.PrivateBinPath = pluginDir;
       setup.ApplicationBase = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
-      AppDomain applicationDomain = AppDomain.CreateDomain(name, AppDomain.CurrentDomain.Evidence, setup, pset, CreateStrongName(Assembly.GetExecutingAssembly()));
+      AppDomain applicationDomain = AppDomain.CreateDomain(name, AppDomain.CurrentDomain.Evidence, setup, pset, new StrongName[] {CreateStrongName(Assembly.GetExecutingAssembly())});
+
       Type applicationManagerType = typeof(DefaultApplicationManager);
       DefaultApplicationManager applicationManager =
@@ -93 +97 @@
       PluginDescription[] plugins = ApplicationManager.Manager.Plugins.Cast<PluginDescription>().ToArray();
       applicationManager.PrepareApplicationDomain(apps, plugins);
-      //if (files != null && files.Count() > 0)
-        //applicationManager.LoadAssemblies(files);
+      if (files != null && files.Count() > 0)
+        applicationManager.LoadAssemblies(files);
       return applicationDomain;
     }