Changeset 6538

Timestamp:

07/07/11 15:10:33 (13 years ago)

Author:

gkronber

Message:

#831: removed unnecessary method to load assemblies from byte arrays from SandboxApplicationManager. Minor changes in SandboxManager.

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3

Files:

• SandboxApplicationManager.cs (modified) (1 diff)
• Sandboxing/SandboxManager.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs

@@ -132 +132 @@
     }
 
-    /// <summary>
-    /// Loads raw assemblies dynamically from a byte array
-    /// </summary>
-    /// <param name="assemblies">bytearray of all raw assemblies that should be loaded</param>
-    internal void LoadAssemblies(IEnumerable<byte[]> assemblies) {
-      foreach (byte[] asm in assemblies) {
-        Assembly loadedAsm = Assembly.Load(asm);
-        RegisterLoadedAssembly(loadedAsm);
-      }
-    }
-
     // register assembly in the assembly cache for the AssemblyResolveEvent
     private void RegisterLoadedAssembly(Assembly asm) {

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Sandboxing/SandboxManager.cs

@@ -25 +25 @@
 using System.Security.Permissions;
 using HeuristicLab.PluginInfrastructure.Manager;
+using System.IO;
 
 namespace HeuristicLab.PluginInfrastructure.Sandboxing {
@@ -69 +70 @@
       //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);