Changeset 1815 for trunk/eraser6

Timestamp:

2/12/2010 1:04:52 AM (3 years ago)

Author:

lowjoel

Message:

Handle partially trusted plugin loading (eg. from network paths) by displaying an error message to catch the SecurityException? thrown

Location:

trunk/eraser6/Eraser.Manager

Files:

• Plugins.cs (modified) (1 diff)
• Strings.en.resx (modified) (1 diff)
• Strings.it.resx (modified) (1 diff)
• Strings.nl.resx (modified) (1 diff)
• Strings.resx (modified) (1 diff)

trunk/eraser6/Eraser.Manager/Plugins.cs

@@ -258 +258 @@
             }
 
-            //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));
+            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);
+            }
         }
 

trunk/eraser6/Eraser.Manager/Strings.en.resx

@@ -202 +202 @@
     <value>(default)</value>
   </data>
+  <data name="Could not load the plugin {0}.\n\nThe error returned was: {1}" xml:space="preserve">
+    <value>Could not load the plugin {0}.\n\nThe error returned was: {1}</value>
+  </data>
+  <data name="Eraser" xml:space="preserve">
+    <value>Eraser</value>
+  </data>
   <data name="Running on restart" xml:space="preserve">
     <value>Running on restart</value>

trunk/eraser6/Eraser.Manager/Strings.it.resx

@@ -202 +202 @@
     <value>(Untranslated)</value>
   </data>
+  <data name="Could not load the plugin {0}.\n\nThe error returned was: {1}" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Eraser" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Running on restart" xml:space="preserve">
     <value>Esecuzione al riavvio</value>

trunk/eraser6/Eraser.Manager/Strings.nl.resx

@@ -202 +202 @@
     <value>(Untranslated)</value>
   </data>
+  <data name="Could not load the plugin {0}.\n\nThe error returned was: {1}" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Eraser" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Running on restart" xml:space="preserve">
     <value>(Untranslated)</value>

trunk/eraser6/Eraser.Manager/Strings.resx

@@ -202 +202 @@
     <value>(default)</value>
   </data>
+  <data name="Could not load the plugin {0}.\n\nThe error returned was: {1}" xml:space="preserve">
+    <value>Could not load the plugin {0}.\n\nThe error returned was: {1}</value>
+  </data>
+  <data name="Eraser" xml:space="preserve">
+    <value>Eraser</value>
+  </data>
   <data name="Running on restart" xml:space="preserve">
     <value>Running on restart</value>