Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.PluginInfrastructure/3.3/Sandboxing

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.PluginInfrastructure/3.3/Sandboxing/SandboxManager.cs (modified) (2 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.PluginInfrastructure/3.3/Sandboxing/SandboxManager.cs

@@ -25 +25 @@
 using System.Security.Permissions;
 using HeuristicLab.PluginInfrastructure.Manager;
+using System.IO;
 
 namespace HeuristicLab.PluginInfrastructure.Sandboxing {
@@ -67 +68 @@
       pSet.AddPermission(new SecurityPermission(SecurityPermissionFlag.UnmanagedCode));
       pSet.AddPermission(new SecurityPermission(SecurityPermissionFlag.SerializationFormatter));
-      pSet.AddPermission(new SecurityPermission(SecurityPermissionFlag.ControlAppDomain));
       //needed for HeuristicLab.Persistence, see DynamicMethod Constructor (String, Type, array<Type []()>[], Type, Boolean)
       pSet.AddPermission(new SecurityPermission(SecurityPermissionFlag.ControlEvidence));
-
-      ReflectionPermission refPerm = new ReflectionPermission(PermissionState.Unrestricted);
-      pSet.AddPermission(refPerm);
+      pSet.AddPermission(new ReflectionPermission(PermissionState.Unrestricted));
 
       FileIOPermission ioPerm = new FileIOPermission(PermissionState.None);
       //allow path discovery for system drive, needed by HeuristicLab.Persistence: Serializer.BuildTypeCache() -> Assembly.CodeBase
-      ioPerm.AddPathList(FileIOPermissionAccess.PathDiscovery, Environment.SystemDirectory.Substring(0, 3));
+      ioPerm.AddPathList(FileIOPermissionAccess.PathDiscovery, Path.GetPathRoot(Path.GetFullPath(Environment.SystemDirectory)));
       //allow full access to the appdomain's base directory
       ioPerm.AddPathList(FileIOPermissionAccess.AllAccess, applicationBase);

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates