Index: /trunk/eraser/Eraser.Manager/Strings.resx
===================================================================
--- /trunk/eraser/Eraser.Manager/Strings.resx (revision 2049)
+++ /trunk/eraser/Eraser.Manager/Strings.resx (revision 2050)
@@ -148,4 +148,13 @@
The file system on the drive {0} is not supported.
+
+ The Core plugin assembly is not one whichEraser expects.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.
+
+
+ The provided Core plugin assembly is not a plugin.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.
+
+
+ The provided Core plugin does not have an identical public key as the Eraser assembly.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.
+
Could not load the plugin {0}.\n\nThe error returned was: {1}
Index: /trunk/eraser/Eraser.Manager/Strings.en.resx
===================================================================
--- /trunk/eraser/Eraser.Manager/Strings.en.resx (revision 2049)
+++ /trunk/eraser/Eraser.Manager/Strings.en.resx (revision 2050)
@@ -148,4 +148,13 @@
The file system on the drive {0} is not supported.
+
+ The Core plugin assembly is not one whichEraser expects.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.
+
+
+ The provided Core plugin assembly is not a plugin.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.
+
+
+ The provided Core plugin does not have an identical public key as the Eraser assembly.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.
+
Could not load the plugin {0}.\n\nThe error returned was: {1}
Index: /trunk/eraser/Eraser.Manager/Strings.nl.resx
===================================================================
--- /trunk/eraser/Eraser.Manager/Strings.nl.resx (revision 2049)
+++ /trunk/eraser/Eraser.Manager/Strings.nl.resx (revision 2050)
@@ -148,4 +148,13 @@
(Untranslated)
+
+ (Untranslated)
+
+
+ (Untranslated)
+
+
+ (Untranslated)
+
(Untranslated)
Index: /trunk/eraser/Eraser.Manager/Strings.pl.resx
===================================================================
--- /trunk/eraser/Eraser.Manager/Strings.pl.resx (revision 2049)
+++ /trunk/eraser/Eraser.Manager/Strings.pl.resx (revision 2050)
@@ -148,4 +148,13 @@
System plików napędu {0} nie jest wspierany.
+
+ (Untranslated)
+
+
+ (Untranslated)
+
+
+ (Untranslated)
+
Nie można było załadować wtyczki {0}.\n\nWystąpił błąd: {1}
Index: /trunk/eraser/Eraser.Manager/Strings.it.resx
===================================================================
--- /trunk/eraser/Eraser.Manager/Strings.it.resx (revision 2049)
+++ /trunk/eraser/Eraser.Manager/Strings.it.resx (revision 2050)
@@ -148,4 +148,13 @@
Il tipo di file system sul disco {0} non è supportato.
+
+ (Untranslated)
+
+
+ (Untranslated)
+
+
+ (Untranslated)
+
Impossibile caricare il plugin {0}.\n\nL'errore ricevuto è stato: {1}
Index: /trunk/eraser/Eraser.Manager/Plugins.cs
===================================================================
--- /trunk/eraser/Eraser.Manager/Plugins.cs (revision 2049)
+++ /trunk/eraser/Eraser.Manager/Plugins.cs (revision 2050)
@@ -99,5 +99,8 @@
/// The absolute or relative file path to the
/// DLL.
- public abstract void LoadPlugin(string filePath);
+ /// True if the plugin is loaded, false otherwise.
+ /// If a plugin is loaded twice, this function should do nothing
+ /// and return True.
+ public abstract bool LoadPlugin(string filePath);
}
@@ -136,12 +139,244 @@
public override void Load()
{
+ //Specify additional places to load assemblies from
AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolve;
AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += ResolveReflectionDependency;
- string pluginsFolder = Path.Combine(
- Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), //Assembly location
- PLUGINSFOLDER //Plugins folder
- );
-
- foreach (string fileName in Directory.GetFiles(pluginsFolder))
+
+ try
+ {
+ //Load all core plugins first
+ foreach (KeyValuePair plugin in CorePlugins)
+ {
+ LoadCorePlugin(Path.Combine(PluginsFolder, plugin.Key), plugin.Value);
+ }
+
+ //Then load the rest
+ foreach (string fileName in Directory.GetFiles(PluginsFolder))
+ {
+ FileInfo file = new FileInfo(fileName);
+ if (file.Extension.Equals(".dll"))
+ try
+ {
+ LoadPlugin(file.FullName);
+ }
+ catch (BadImageFormatException)
+ {
+ }
+ catch (FileLoadException)
+ {
+ }
+ }
+ }
+ finally
+ {
+ AppDomain.CurrentDomain.AssemblyResolve -= AssemblyResolve;
+ AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve -= ResolveReflectionDependency;
+ }
+ }
+
+ protected override void Dispose(bool disposing)
+ {
+ if (plugins == null)
+ return;
+
+ if (disposing)
+ {
+ //Unload all the plugins. This will cause all the plugins to execute
+ //the cleanup code.
+ foreach (PluginInstance plugin in plugins)
+ if (plugin.Plugin != null)
+ plugin.Plugin.Dispose();
+ }
+
+ plugins = null;
+ }
+
+ ///
+ /// The path to the folder containing the plugins.
+ ///
+ public readonly string PluginsFolder = Path.Combine(
+ Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), //Assembly location
+ "Plugins" //Plugins folder
+ );
+
+ ///
+ /// The list of plugins which are core, the key is the file name, the value
+ /// is the assembly name.
+ ///
+ private readonly KeyValuePair[] CorePlugins =
+ new KeyValuePair[]
+ {
+ new KeyValuePair(
+ "Eraser.DefaultPlugins.dll",
+ "Eraser.DefaultPlugins"
+ )
+ };
+
+ public override IList Plugins
+ {
+ get { return plugins.AsReadOnly(); }
+ }
+
+ ///
+ /// Verifies whether the provided assembly is a plugin.
+ ///
+ /// The assembly to verify.
+ /// True if the assembly provided is a plugin, false otherwise.
+ private bool IsPlugin(Assembly assembly)
+ {
+ //Iterate over every exported type, checking if it implements IPlugin
+ Type typePlugin = assembly.GetExportedTypes().FirstOrDefault(
+ type => type.GetInterface("Eraser.Manager.Plugin.IPlugin", true) != null);
+
+ //If the typePlugin type is empty the assembly doesn't implement IPlugin it's not
+ //a plugin.
+ return typePlugin != null;
+ }
+
+ ///
+ /// Loads the assembly at the specified path, and verifying its assembly name,
+ /// ensuring that the assembly contains a core plugin.
+ ///
+ /// The path to the assembly.
+ /// The name of the assembly.
+ private void LoadCorePlugin(string filePath, string assemblyName)
+ {
+ Assembly assembly = Assembly.ReflectionOnlyLoadFrom(filePath);
+ if (assembly.GetName().FullName.Substring(0, assemblyName.Length + 1) !=
+ assemblyName + ",")
+ {
+ throw new FileLoadException(S._("The Core plugin assembly is not one which" +
+ "Eraser expects.\n\nCheck that the Eraser installation is not corrupt, or " +
+ "reinstall the program."));
+ }
+
+ //Create the PluginInstance structure
+ PluginInstance instance = new PluginInstance(assembly, null);
+
+ //Ignore non-plugins
+ if (!IsPlugin(instance.Assembly))
+ throw new FileLoadException(S._("The provided Core plugin assembly is not a " +
+ "plugin.\n\nCheck that the Eraser installation is not corrupt, or reinstall " +
+ "the program."));
+
+ //OK this assembly is a plugin
+ lock (plugins)
+ plugins.Add(instance);
+
+ //Check for the presence of a valid signature: Core plugins must have the same
+ //public key as the current assembly
+ if (!assembly.GetName().GetPublicKey().SequenceEqual(
+ Assembly.GetExecutingAssembly().GetName().GetPublicKey()))
+ {
+ throw new FileLoadException(S._("The provided Core plugin does not have an " +
+ "identical public key as the Eraser assembly.\n\nCheck that the Eraser " +
+ "installation is not corrupt, or reinstall the program."));
+ }
+
+ //Okay, everything's fine, initialise the plugin
+ instance.Assembly = Assembly.Load(instance.Assembly.GetName());
+ instance.LoadingPolicy = LoadingPolicy.Core;
+ InitialisePlugin(instance);
+ }
+
+ public override bool LoadPlugin(string filePath)
+ {
+ //Create the PluginInstance structure
+ Assembly reflectAssembly = Assembly.ReflectionOnlyLoadFrom(filePath);
+ PluginInstance instance = new PluginInstance(reflectAssembly, null);
+
+ //Check that the plugin hasn't yet been loaded.
+ if (Plugins.Count(
+ plugin => plugin.Assembly.GetName().FullName ==
+ reflectAssembly.GetName().FullName) > 0)
+ {
+ return true;
+ }
+
+ //Ignore non-plugins
+ if (!IsPlugin(instance.Assembly))
+ return false;
+
+ //OK this assembly is a plugin
+ lock (plugins)
+ plugins.Add(instance);
+
+ //If the plugin does not have an approval or denial, check for the presence of
+ //a valid signature.
+ IDictionary approvals = ManagerLibrary.Settings.PluginApprovals;
+ if (!approvals.ContainsKey(instance.AssemblyInfo.Guid) &&
+ (reflectAssembly.GetName().GetPublicKey().Length == 0 ||
+ !Security.VerifyStrongName(filePath) ||
+ instance.AssemblyAuthenticode == null))
+ {
+ return false;
+ }
+
+ //Preliminary checks to verify whether the plugin can be loaded (safely) passes,
+ //Load the assembly fully, and then initialise it.
+ instance.Assembly = Assembly.Load(reflectAssembly.GetName());
+
+ //The plugin either is explicitly allowed or disallowed to load, or
+ //it has an Authenticode Signature as well as a Strong Name. Get the
+ //loading policy of the plugin.
+ {
+
+ }
+
+ bool initialisePlugin = false;
+
+ //Is there an approval or denial?
+ if (approvals.ContainsKey(instance.AssemblyInfo.Guid))
+ initialisePlugin = approvals[instance.AssemblyInfo.Guid];
+
+ //There's no approval or denial, what is the specified loading policy?
+ else
+ initialisePlugin = instance.LoadingPolicy != LoadingPolicy.DefaultOff;
+
+ if (initialisePlugin)
+ {
+ InitialisePlugin(instance);
+ return true;
+ }
+
+ return false;
+ }
+
+ ///
+ /// Initialises the given plugin from the plugin's description.
+ ///
+ /// The structure to fill.
+ private void InitialisePlugin(PluginInstance instance)
+ {
+ try
+ {
+ //Iterate over every exported type, checking for the IPlugin implementation
+ Type typePlugin = instance.Assembly.GetExportedTypes().First(
+ type => type.GetInterface("Eraser.Manager.Plugin.IPlugin", true) != null);
+ if (typePlugin == null)
+ return;
+
+ //Initialize the plugin
+ instance.Plugin = (IPlugin)Activator.CreateInstance(
+ instance.Assembly.GetType(typePlugin.ToString()));
+ instance.Plugin.Initialize(this);
+
+ //And broadcast the plugin load event
+ OnPluginLoaded(this, new PluginLoadedEventArgs(instance));
+ }
+ catch (System.Security.SecurityException e)
+ {
+ MessageBox.Show(S._("Could not load the plugin {0}.\n\nThe error returned was: {1}",
+ instance.Assembly.Location, e.Message), S._("Eraser"), MessageBoxButtons.OK,
+ MessageBoxIcon.Error, MessageBoxDefaultButton.Button1,
+ Localisation.IsRightToLeft(null) ?
+ MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign : 0);
+ }
+ }
+
+ private Assembly AssemblyResolve(object sender, ResolveEventArgs args)
+ {
+ //Check the plugins folder
+ foreach (string fileName in Directory.GetFiles(PluginsFolder))
{
FileInfo file = new FileInfo(fileName);
@@ -149,5 +384,7 @@
try
{
- LoadPlugin(file.FullName);
+ Assembly assembly = Assembly.ReflectionOnlyLoadFrom(file.FullName);
+ if (assembly.GetName().FullName == args.Name)
+ return Assembly.LoadFile(file.FullName);
}
catch (BadImageFormatException)
@@ -158,137 +395,5 @@
}
}
- }
-
- protected override void Dispose(bool disposing)
- {
- if (plugins == null)
- return;
-
- if (disposing)
- {
- //Unload all the plugins. This will cause all the plugins to execute
- //the cleanup code.
- foreach (PluginInstance plugin in plugins)
- if (plugin.Plugin != null)
- plugin.Plugin.Dispose();
- }
-
- plugins = null;
- }
-
- ///
- /// The path to the folder containing the plugins.
- ///
- public const string PLUGINSFOLDER = "Plugins";
-
- public override IList Plugins
- {
- get { return plugins.AsReadOnly(); }
- }
-
- public override void LoadPlugin(string filePath)
- {
- //Create the PluginInstance structure
- Assembly reflectAssembly = Assembly.ReflectionOnlyLoadFrom(filePath);
- PluginInstance instance = new PluginInstance(reflectAssembly, null);
- Type typePlugin = null;
-
- //Iterate over every exported type, checking if it implements IPlugin
- foreach (Type type in instance.Assembly.GetExportedTypes())
- {
- //Check for an implementation of IPlugin
- Type typeInterface = type.GetInterface("Eraser.Manager.Plugin.IPlugin", true);
- if (typeInterface != null)
- {
- typePlugin = type;
- break;
- }
- }
-
- //If the typePlugin type is empty the assembly doesn't implement IPlugin; we
- //aren't interested.
- if (typePlugin == null)
- return;
-
- //OK this assembly is a plugin
- lock (plugins)
- plugins.Add(instance);
-
- //If the plugin does not have an approval or denial, check for the presence of
- //a valid signature.
- IDictionary approvals = ManagerLibrary.Settings.PluginApprovals;
- if (!approvals.ContainsKey(instance.AssemblyInfo.Guid) &&
- (reflectAssembly.GetName().GetPublicKey().Length == 0 ||
- !Security.VerifyStrongName(filePath) ||
- instance.AssemblyAuthenticode == null))
- {
- return;
- }
-
- //The plugin either is explicitly allowed or disallowed to load, or
- //it has an Authenticode Signature as well as a Strong Name. Get the
- //loading policy of the plugin.
- instance.Assembly = Assembly.LoadFrom(filePath);
- {
- object[] attr = instance.Assembly.GetCustomAttributes(typeof(LoadingPolicyAttribute), true);
- if (attr.Length != 0)
- {
- instance.LoadingPolicy = ((LoadingPolicyAttribute)attr[0]).Policy;
-
- //If the loading policy is that the plugin is Core, we need to verify
- //the public key of the assembly.
- if (instance.LoadingPolicy == LoadingPolicy.Core &&
- !reflectAssembly.GetName().GetPublicKey().SequenceEqual(
- Assembly.GetExecutingAssembly().GetName().GetPublicKey()))
- {
- instance.LoadingPolicy = LoadingPolicy.None;
- }
- }
- }
-
- bool loadPlugin = false;
-
- //If the loading policy is such that the plugin is a core plugin, ALWAYS load it.
- if (instance.LoadingPolicy == LoadingPolicy.Core)
- loadPlugin = true;
-
- //The plugin is not a core plugin, is there an approval or denial?
- else if (approvals.ContainsKey(instance.AssemblyInfo.Guid))
- loadPlugin = approvals[instance.AssemblyInfo.Guid];
-
- //There's no approval or denial, what is the specified loading policy?
- else
- loadPlugin = instance.LoadingPolicy != LoadingPolicy.DefaultOff;
-
-
- if (loadPlugin)
- {
- try
- {
- //Initialize the plugin
- IPlugin pluginInterface = (IPlugin)Activator.CreateInstance(
- instance.Assembly.GetType(typePlugin.ToString()));
- pluginInterface.Initialize(this);
- instance.Plugin = pluginInterface;
-
- //And broadcast the plugin load event
- OnPluginLoaded(this, new PluginLoadedEventArgs(instance));
- }
- catch (System.Security.SecurityException e)
- {
- MessageBox.Show(S._("Could not load the plugin {0}.\n\nThe error returned was: {1}",
- filePath, e.Message), S._("Eraser"), MessageBoxButtons.OK, MessageBoxIcon.Error,
- MessageBoxDefaultButton.Button1, Localisation.IsRightToLeft(null) ?
- MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign : 0);
- }
- }
- }
-
- private Assembly AssemblyResolve(object sender, ResolveEventArgs args)
- {
- lock (plugins)
- foreach (PluginInstance instance in plugins)
- if (instance.Assembly.FullName == args.Name)
- return instance.Assembly;
+
return null;
}
@@ -348,4 +453,10 @@
else if (attr.Constructor.DeclaringType == typeof(AssemblyCompanyAttribute))
info.Author = (string)attr.ConstructorArguments[0].Value;
+ else if (attr.Constructor.DeclaringType == typeof(LoadingPolicyAttribute))
+ {
+ LoadingPolicy = (LoadingPolicy)attr.ConstructorArguments[0].Value;
+ if (LoadingPolicy == LoadingPolicy.Core)
+ LoadingPolicy = LoadingPolicy.None;
+ }
this.AssemblyInfo = info;
@@ -458,5 +569,5 @@
/// The author of the plug-in, used for display in the UI and for users
/// to contact the author about bugs. Must be in the format:
- /// (.+) \<([a-zA-Z0-9_.]+)@([a-zA-Z0-9_.]+)\.([a-zA-Z0-9]+)\>
+ /// (.+) \<([a-zA-Z0-9_.]+)@([a-zA-Z0-9_.]+)\.([a-zA-Z0-9]+)\>
///
/// Joel Low
@@ -505,7 +616,7 @@
/// The host must always load the plugin.
///
- /// For this policy to have an effect, the plugin assembly must
- /// have the same Strong Name as the loading assembly, otherwise it defaults
- /// to None.
+ /// This policy does not have an effect when declared in the
+ /// attribute and will be equivalent
+ /// to .
Core
}