DynamoDS
diff --git a/‎src/DynamoCore/Configuration/PathManager.cs
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions b/‎src/DynamoCore/Configuration/PathManager.cs
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
diff --git a/‎src/DynamoCore/Extensions/ExtensionDefinition.cs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎src/DynamoCore/Extensions/ExtensionDefinition.cs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/DynamoCore/Extensions/ExtensionLoader.cs
Copy file name to clipboard
+22-1Lines changed: 22 additions & 1 deletion b/‎src/DynamoCore/Extensions/ExtensionLoader.cs
Copy file name to clipboard
+22-1Lines changed: 22 additions & 1 deletion
diff --git a/‎src/DynamoCore/Extensions/ExtensionManager.cs
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions b/‎src/DynamoCore/Extensions/ExtensionManager.cs
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+6-1Lines changed: 6 additions & 1 deletion b/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Extensions/ViewExtensionDefinition.cs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎src/DynamoCoreWpf/Extensions/ViewExtensionDefinition.cs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Extensions/ViewExtensionLoader.cs
Copy file name to clipboard
+25-1Lines changed: 25 additions & 1 deletion b/‎src/DynamoCoreWpf/Extensions/ViewExtensionLoader.cs
Copy file name to clipboard
+25-1Lines changed: 25 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Extensions/ViewExtensionManager.cs
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions b/‎src/DynamoCoreWpf/Extensions/ViewExtensionManager.cs
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion b/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎src/DynamoPackages/Package.cs
Copy file name to clipboard
+53-10Lines changed: 53 additions & 10 deletions b/‎src/DynamoPackages/Package.cs
Copy file name to clipboard
+53-10Lines changed: 53 additions & 10 deletions
@@ -72,6 +72,7 @@ class PathManager : IPathManager
         private readonly string commonDataDir;
 
         private readonly string commonDefinitions;
+        private readonly string commonPackages;
         private readonly string logDirectory;
         private readonly string samplesDirectory;
         private readonly string backupDirectory;
@@ -95,6 +96,15 @@ private IEnumerable<string> RootDirectories
             get { return Preferences != null ? Preferences.CustomPackageFolders : rootDirectories; }
         }
 
+        //Todo in Dynamo 3.0, Add this to the IPathManager interface
+        /// <summary>
+        /// The local directory that contains package directory created by all users.
+        /// </summary>
+        internal string CommonPackageDirectory
+        {
+            get { return commonPackages; }
+        }
+
         #region IPathManager Interface Implementation
 
         public string DynamoCoreDirectory
@@ -344,6 +354,7 @@ internal PathManager(PathManagerParams pathManagerParams)
             commonDataDir = GetCommonDataFolder(pathResolver);
 
             commonDefinitions = Path.Combine(commonDataDir, DefinitionsDirectoryName);
+            commonPackages = Path.Combine(commonDataDir, PackagesDirectoryName);
             samplesDirectory = GetSamplesFolder(commonDataDir);
             var galleryDirectory = GetGalleryDirectory(commonDataDir);
             galleryFilePath = Path.Combine(galleryDirectory, GalleryContentsFileName);
@@ -390,6 +401,7 @@ internal void EnsureDirectoryExistence(List<Exception> exceptions)
             // Common data folders for all users.
             exceptions.Add(PathHelper.CreateFolderIfNotExist(commonDataDir));
             exceptions.Add(PathHelper.CreateFolderIfNotExist(commonDefinitions));
+            exceptions.Add(PathHelper.CreateFolderIfNotExist(commonPackages));
 
             exceptions.RemoveAll(x => x == null); // Remove all null entries.
         }
 
@@ -10,5 +10,10 @@ public class ExtensionDefinition
 
         [DataMember]
         public string TypeName { get; set; }
+
+        /// <summary>
+        /// Is set to true if the ExtensionDefinition is located in a directory that requires certificate verification of its entry point dll.
+        /// </summary>
+        internal bool RequiresSignedEntryPoint { get; set; } = false;
     }
 }
@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Xml;
 using Dynamo.Logging;
+using DynamoUtilities;
 
 namespace Dynamo.Extensions
 {
@@ -22,9 +23,13 @@ public class ExtensionLoader: IExtensionLoader, ILogSource
     {
         private IExtension Load(ExtensionDefinition extension)
         {
-            
             try
             {
+                if (extension.RequiresSignedEntryPoint)
+                {
+                    CertificateVerification.CheckAssemblyForValidCertificate(extension.AssemblyPath);
+                }
+
                 var assembly = Assembly.LoadFrom(extension.AssemblyPath);
                 var result = assembly.CreateInstance(extension.TypeName) as IExtension;
                 ExtensionLoading?.Invoke(result);
@@ -73,6 +78,15 @@ public IExtension Load(string extensionPath)
                 }
             }
 
+            //Check if the extension definition file was located in a directory which requires certificate validation.
+            foreach (var pathToVerifyCert in DirectoriesToVerifyCertificates)
+            {
+                if (extensionPath.Contains(pathToVerifyCert))
+                {
+                    definition.RequiresSignedEntryPoint = true;
+                }
+            }
+
             var extension = Load(definition);
             return extension;
         }
@@ -124,5 +138,12 @@ private void Log(string msg)
         /// An event that is raised when an extension starts loading.
         /// </summary>
         public event Action<IExtension> ExtensionLoading;
+
+        /// <summary>
+        /// A list of root directories which require extensions to have a signed entry point
+        /// File path locations from package definition xml's are validated against this collection 
+        /// </summary>
+        internal List<string> DirectoriesToVerifyCertificates = new List<string>();
+
     }
 }
@@ -46,6 +46,14 @@ public ExtensionManager()
             this.ExtensionRemoved += UnsubscribeExtension;
         }
 
+        /// <summary>
+        /// Creates ExtensionManager with directories which require package certificate verification.
+        /// </summary>
+        public ExtensionManager(IEnumerable<string> directoriesToVerify) :this()
+        {
+            this.extensionLoader.DirectoriesToVerifyCertificates.AddRange(directoriesToVerify);
+        }
+
         private void RequestAddExtensionHandler(dynamic extension)
         {
             if(extension is IExtension)
 
@@ -636,6 +636,10 @@ protected DynamoModel(IStartConfiguration config)
             var userDataFolder = pathManager.GetUserDataFolder(); // Get the default user data path
             AddPackagePath(userDataFolder);
 
+            // Make sure that the global package folder is added in the list
+            var userCommonPackageFolder = pathManager.CommonPackageDirectory;
+            AddPackagePath(userCommonPackageFolder);
+
             // Load Python Template
             // The loading pattern is conducted in the following order
             // 1) Set from DynamoSettings.XML
@@ -690,7 +694,8 @@ protected DynamoModel(IStartConfiguration config)
             NodeFactory = new NodeFactory();
             NodeFactory.MessageLogged += LogMessage;
 
-            extensionManager = new ExtensionManager();
+            //Initialize the ExtensionManager with the CommonDataDirectory so that extensions found here are checked first for dll's with signed certificates
+            extensionManager = new ExtensionManager(new[] { PathManager.CommonDataDirectory });
             extensionManager.MessageLogged += LogMessage;
             var extensions = config.Extensions ?? LoadExtensions();
 
 
@@ -10,5 +10,10 @@ internal class ViewExtensionDefinition
 
         [DataMember]
         public string TypeName { get; set; }
+
+        /// <summary>
+        /// Is set to true if the ViewExtensionDefinition is located in a directory that requires certificate verification of its entry point dll.
+        /// </summary>
+        internal bool RequiresSignedEntryPoint { get; set; } = false;
     }
 }
@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Xml;
 using Dynamo.Logging;
+using DynamoUtilities;
 
 namespace Dynamo.Wpf.Extensions
 {
@@ -13,15 +14,22 @@ private IViewExtension Load(ViewExtensionDefinition viewExtension)
         {
             try
             {
+                if (viewExtension.RequiresSignedEntryPoint)
+                {
+                    CertificateVerification.CheckAssemblyForValidCertificate(viewExtension.AssemblyPath);
+                }
+
                 var assembly = Assembly.LoadFrom(viewExtension.AssemblyPath);
                 var result = assembly.CreateInstance(viewExtension.TypeName) as IViewExtension;
                 ExtensionLoading?.Invoke(result);
                 return result;
             }
-            catch
+            catch(Exception ex)
             {
                 var name = viewExtension.TypeName == null ? "null" : viewExtension.TypeName;
                 Log("Could not create an instance of " + name);
+                Log(ex.Message);
+                Log(ex.StackTrace);
                 return null;
             }
         }
@@ -54,6 +62,15 @@ public IViewExtension Load(string extensionPath)
                 }
             }
 
+            //Check if the view extension definition file was located in a directory which requires certificate validation.
+            foreach (var pathToVerifyCert in DirectoriesToVerifyCertificates)
+            {
+                if (extensionPath.Contains(pathToVerifyCert))
+                {
+                    definition.RequiresSignedEntryPoint = true;
+                }
+            }
+
             var extension = Load(definition);
             return extension;
         }
@@ -97,5 +114,12 @@ private void Log(string msg)
         /// An event that is raised when an extension starts loading.
         /// </summary>
         public event Action<IViewExtension> ExtensionLoading;
+
+        /// <summary>
+        /// A list of root directories which require extensions to have a signed entry point
+        /// File path locations from package definition xml's are validated against this collection 
+        /// </summary>
+        internal List<string> DirectoriesToVerifyCertificates = new List<string>();
+
     }
 }
@@ -38,6 +38,14 @@ public ViewExtensionManager()
             this.ExtensionRemoved += UnsubscribeViewExtension;
         }
 
+        /// <summary>
+        /// Creates ViewExtensionManager with directories which require package certificate verification.
+        /// </summary>
+        public ViewExtensionManager(IEnumerable<string> directoriesToVerify) : this()
+        {
+            this.viewExtensionLoader.DirectoriesToVerifyCertificates.AddRange(directoriesToVerify);
+        }
+
         private void RequestAddViewExtensionHandler(IViewExtension viewExtension)
         {
             if (viewExtension is IViewExtension)
 
@@ -65,7 +65,7 @@ public partial class DynamoView : Window, IDisposable
         private int tabSlidingWindowStart, tabSlidingWindowEnd;
         private GalleryView galleryView;
         private readonly LoginService loginService;
-        internal ViewExtensionManager viewExtensionManager = new ViewExtensionManager();
+        internal ViewExtensionManager viewExtensionManager;
         private ShortcutToolbar shortcutBar;
         private bool loaded = false;
 
@@ -98,6 +98,9 @@ public DynamoView(DynamoViewModel dynamoViewModel)
 
             tabSlidingWindowStart = tabSlidingWindowEnd = 0;
 
+            //Initialize the ViewExtensionManager with the CommonDataDirectory so that view extensions found here are checked first for dll's with signed certificates
+            viewExtensionManager = new ViewExtensionManager(new[] {dynamoViewModel.Model.PathManager.CommonDataDirectory });
+
             _timer = new Stopwatch();
             _timer.Start();
 
 
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Reflection;
 using Dynamo.Core;
+using Dynamo.Exceptions;
 using Dynamo.Graph.Nodes.CustomNodes;
 using Dynamo.Graph.Workspaces;
 using Dynamo.Interfaces;
@@ -139,6 +140,11 @@ internal IEnumerable<Assembly> NodeLibraries
         /// </summary>
         public PackageUploadRequestBody Header { get; internal set; }
 
+        /// <summary>
+        /// Is set to true if the Package is located in a directory that requires certificate verification of its node library dlls.
+        /// </summary>
+        internal bool RequiresSignedEntryPoints { get; set; }
+
         #endregion
 
         public Package(string directory, string name, string versionName, string license)
@@ -269,20 +275,29 @@ internal IEnumerable<PackageAssembly> EnumerateAssembliesInBinDirectory()
             {
                 Assembly assem;
 
-                // dll files may be un-managed, skip those
-                var result = PackageLoader.TryLoadFrom(assemFile.FullName, out assem);
-                if (result)
+                bool shouldLoadFile = true;
+                if (this.RequiresSignedEntryPoints)
                 {
-                    // IsNodeLibrary may fail, we store the warnings here and then show
-                    IList<ILogMessage> warnings = new List<ILogMessage>();
+                    shouldLoadFile = IsFileSpecifiedInPackageJsonManifest(nodeLibraries, assemFile.Name, BinaryDirectory);
+                }
 
-                    assemblies.Add(new PackageAssembly()
+                if (shouldLoadFile)
+                {
+                    // dll files may be un-managed, skip those
+                    var result = PackageLoader.TryLoadFrom(assemFile.FullName, out assem);
+                    if (result)
                     {
-                        Assembly = assem,
-                        IsNodeLibrary = IsNodeLibrary(nodeLibraries, assem.GetName(), ref warnings)
-                    });
+                        // IsNodeLibrary may fail, we store the warnings here and then show
+                        IList<ILogMessage> warnings = new List<ILogMessage>();
+
+                        assemblies.Add(new PackageAssembly()
+                        {
+                            Assembly = assem,
+                            IsNodeLibrary = IsNodeLibrary(nodeLibraries, assem.GetName(), ref warnings)
+                        });
 
-                    warnings.ToList().ForEach(this.Log);
+                        warnings.ToList().ForEach(this.Log);
+                    }
                 }
             }
 
@@ -294,6 +309,34 @@ internal IEnumerable<PackageAssembly> EnumerateAssembliesInBinDirectory()
             return assemblies;
         }
 
+        /// <summary>
+        /// Checks if a specific file is specified in the Node Libraries section of the package manifest json.
+        /// </summary>
+        /// <param name="nodeLibraries">node libraries defined in package manifest json.</param>
+        /// <param name="filename">filename of dll file to check</param>
+        /// <param name="path">path of the packages</param>
+        /// <returns></returns>
+        private static bool IsFileSpecifiedInPackageJsonManifest(IEnumerable<string> nodeLibraries, string filename, string path)
+        {
+            foreach (var nodeLibraryAssembly in nodeLibraries)
+            {
+                try
+                {
+                    var name = new AssemblyName(nodeLibraryAssembly).Name + ".dll";
+                    if (name == filename)
+                    {
+                        return true;
+                    }
+                }
+                catch
+                {
+                    throw new LibraryLoadFailedException(path, Resources.IncorrectlyFormattedNodeLibraryWarning);
+                }
+            }
+
+            return false;
+        }
+
         /// <summary>
         ///     Determine if an assembly is in the "node_libraries" list for the package.
         ///
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,10 @@ public class ExtensionDefinition`
`10`	`10`
`11`	`11`	`[DataMember]`
`12`	`12`	`public string TypeName { get; set; }`
	`13`	`+`
	`14`	`+ /// <summary>`
	`15`	`+ /// Is set to true if the ExtensionDefinition is located in a directory that requires certificate verification of its entry point dll.`
	`16`	`+ /// </summary>`
	`17`	`+ internal bool RequiresSignedEntryPoint { get; set; } = false;`
`13`	`18`	`}`
`14`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Reflection;`
`5`	`5`	`using System.Xml;`
`6`	`6`	`using Dynamo.Logging;`
	`7`	`+using DynamoUtilities;`
`7`	`8`
`8`	`9`	`namespace Dynamo.Extensions`
`9`	`10`	`{`
`@@ -22,9 +23,13 @@ public class ExtensionLoader: IExtensionLoader, ILogSource`
`22`	`23`	`{`
`23`	`24`	`private IExtension Load(ExtensionDefinition extension)`
`24`	`25`	`{`
`25`		`-`
`26`	`26`	`try`
`27`	`27`	`{`
	`28`	`+ if (extension.RequiresSignedEntryPoint)`
	`29`	`+ {`
	`30`	`+ CertificateVerification.CheckAssemblyForValidCertificate(extension.AssemblyPath);`
	`31`	`+ }`
	`32`	`+`
`28`	`33`	`var assembly = Assembly.LoadFrom(extension.AssemblyPath);`
`29`	`34`	`var result = assembly.CreateInstance(extension.TypeName) as IExtension;`
`30`	`35`	`ExtensionLoading?.Invoke(result);`
`@@ -73,6 +78,15 @@ public IExtension Load(string extensionPath)`
`73`	`78`	`}`
`74`	`79`	`}`
`75`	`80`
	`81`	`+ //Check if the extension definition file was located in a directory which requires certificate validation.`
	`82`	`+ foreach (var pathToVerifyCert in DirectoriesToVerifyCertificates)`
	`83`	`+ {`
	`84`	`+ if (extensionPath.Contains(pathToVerifyCert))`
	`85`	`+ {`
	`86`	`+ definition.RequiresSignedEntryPoint = true;`
	`87`	`+ }`
	`88`	`+ }`
	`89`	`+`
`76`	`90`	`var extension = Load(definition);`
`77`	`91`	`return extension;`
`78`	`92`	`}`
`@@ -124,5 +138,12 @@ private void Log(string msg)`
`124`	`138`	`/// An event that is raised when an extension starts loading.`
`125`	`139`	`/// </summary>`
`126`	`140`	`public event Action<IExtension> ExtensionLoading;`
	`141`	`+`
	`142`	`+ /// <summary>`
	`143`	`+ /// A list of root directories which require extensions to have a signed entry point`
	`144`	`+ /// File path locations from package definition xml's are validated against this collection`
	`145`	`+ /// </summary>`
	`146`	`+ internal List<string> DirectoriesToVerifyCertificates = new List<string>();`
	`147`	`+`
`127`	`148`	`}`
`128`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,14 @@ public ExtensionManager()`
`46`	`46`	`this.ExtensionRemoved += UnsubscribeExtension;`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ /// <summary>`
	`50`	`+ /// Creates ExtensionManager with directories which require package certificate verification.`
	`51`	`+ /// </summary>`
	`52`	`+ public ExtensionManager(IEnumerable<string> directoriesToVerify) :this()`
	`53`	`+ {`
	`54`	`+ this.extensionLoader.DirectoriesToVerifyCertificates.AddRange(directoriesToVerify);`
	`55`	`+ }`
	`56`	`+`
`49`	`57`	`private void RequestAddExtensionHandler(dynamic extension)`
`50`	`58`	`{`
`51`	`59`	`if(extension is IExtension)`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,10 @@ internal class ViewExtensionDefinition`
`10`	`10`
`11`	`11`	`[DataMember]`
`12`	`12`	`public string TypeName { get; set; }`
	`13`	`+`
	`14`	`+ /// <summary>`
	`15`	`+ /// Is set to true if the ViewExtensionDefinition is located in a directory that requires certificate verification of its entry point dll.`
	`16`	`+ /// </summary>`
	`17`	`+ internal bool RequiresSignedEntryPoint { get; set; } = false;`
`13`	`18`	`}`
`14`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,14 @@ public ViewExtensionManager()`
`38`	`38`	`this.ExtensionRemoved += UnsubscribeViewExtension;`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ /// <summary>`
	`42`	`+ /// Creates ViewExtensionManager with directories which require package certificate verification.`
	`43`	`+ /// </summary>`
	`44`	`+ public ViewExtensionManager(IEnumerable<string> directoriesToVerify) : this()`
	`45`	`+ {`
	`46`	`+ this.viewExtensionLoader.DirectoriesToVerifyCertificates.AddRange(directoriesToVerify);`
	`47`	`+ }`
	`48`	`+`
`41`	`49`	`private void RequestAddViewExtensionHandler(IViewExtension viewExtension)`
`42`	`50`	`{`
`43`	`51`	`if (viewExtension is IViewExtension)`