Merge pull request #255 from PowershellFrameworkCollective/Import-AzDev

fixed license cuncurrent access issue

Author: FriedrichWeinmann

PSFramework/bin/PSFramework.dll

@@ -31,7 +31,6 @@
 	
 		Returns a list of all registered licenses for products that have commercial licenses and are libraries.
 #>
-	
 	[CmdletBinding(PositionalBinding = $false, HelpUri = 'https://psframework.org/documentation/commands/PSFramework/Get-PSFLicense')]
 	[OutputType([PSFramework.License.License])]
 	param (
@@ -50,31 +49,11 @@
 		$Manufacturer = "*"
 	)
 
-	$licenses = [PSFramework.License.LicenseHost]::Get() | Where-Object { ($_.Product -like $Filter) -and ($_.Manufacturer -like $Manufacturer) }
-	if ($PSBoundParameters.ContainsKey("ProductType"))
-	{
-		$temp = $licenses
-		$licenses = @()
-		
-		:main foreach ($l in $temp)
-		{
-			foreach ($type in $ProductType)
-			{
-				if ($l.ProductType -eq $type)
-				{
-					$licenses += $l
-					continue main
-				}
-			}
-		}
-	}
-	
-	if ($PSBoundParameters.ContainsKey("LicenseType"))
-	{
-		$licenses | Where-Object { ($_.LicenseType.ToString() -match $LicenseType.ToString()) -and ($_.Manufacturer -like $Manufacturer) -and ($_.Product -like $Filter) }
-	}
-	else
-	{
-		$licenses | Where-Object { ($_.Manufacturer -like $Manufacturer) -and ($_.Product -like $Filter) }
+	[PSFramework.License.LicenseHost]::Get() | Where-Object {
+		if ($_.Product -notlike $Filter) { return $false }
+		if ($_.Manufacturer -notlike $Manufacturer) { return $false }
+		if ($ProductType -and ($_.ProductType -notin $ProductType)) { return $false }
+		if ($licenseType -and -not ($_.LicenseType -band $LicenseType)) { return $false }
+		return $true
 	}
 }

PSFramework/bin/PSFramework.pdb

@@ -80,7 +80,6 @@
 	
 		This registers the Awesome Test Product as licensed under the common FreeBSD license.
 #>
-	
 	[CmdletBinding(SupportsShouldProcess = $true, ConfirmImpact = 'Low', HelpUri = 'https://psframework.org/documentation/commands/PSFramework/New-PSFLicense')]
 	[OutputType([PSFramework.License.License])]
 	param
@@ -123,21 +122,22 @@
 	)
 
 	# Create and fill object
-	$license = New-Object PSFramework.License.License
-	$license.Product = $Product
-	$license.Manufacturer = $Manufacturer
-	$license.ProductVersion = $ProductVersion
-	$license.ProductType = $ProductType
-	$license.LicenseName = $Name
-	$license.LicenseVersion = $Version
-	$license.LicenseDate = $Date
-	$license.LicenseType = $Type
-	$license.LicenseText = $Text
-	$license.Description = $Description
-	$license.Parent = $Parent
+	$license = New-Object PSFramework.License.License -Property @{
+		Product	       = $Product
+		Manufacturer   = $Manufacturer
+		ProductVersion = $ProductVersion
+		ProductType    = $ProductType
+		LicenseName    = $Name
+		LicenseVersion = $Version
+		LicenseDate    = $Date
+		LicenseType    = $Type
+		LicenseText    = $Text
+		Description    = $Description
+		Parent		   = $Parent
+	}
 	if ($PSCmdlet.ShouldProcess("$($license.Product) $($license.ProductVersion) ($($license.LicenseName))", "Create License"))
 	{
-		if (-not ([PSFramework.License.LicenseHost]::Get() | Where-Object { ($_.Product -eq $license.Product) -and ($_.ProductVersion -eq $license.ProductVersion) }))
+		if (-not ([PSFramework.License.LicenseHost]::Get($license)))
 		{
 			[PSFramework.License.LicenseHost]::Add($license)
 		}

PSFramework/bin/PSFramework.xml

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 
 namespace PSFramework.License
 {
@@ -10,7 +11,7 @@ public static class LicenseHost
         /// <summary>
         /// The list containing all registered licenses.
         /// </summary>
-        public static List<License> Licenses = new List<License>();
+        public static ConcurrentDictionary<string, License> Licenses = new ConcurrentDictionary<string, License>();
 
         #region Default methods
         /// <summary>
@@ -19,26 +20,38 @@ public static class LicenseHost
         /// <param name="License">The license to add</param>
         public static void Add(License License)
         {
-            Licenses.Add(License);
-
-            // TODO: Add code to respect policy settings to log added licenses
+            string key = string.Format("{0}|{1}", License.Product, License.ProductVersion);
+            Licenses[key] = License;
         }
 
         /// <summary>
         /// Removes all registered Licenses
         /// </summary>
         public static void Clear()
         {
-            Licenses = new List<License>();
+            Licenses = new ConcurrentDictionary<string, License>();
         }
 
         /// <summary>
         /// Returns all registered licenses
         /// </summary>
         /// <returns>All registerd licenses</returns>
-        public static List<License> Get()
+        public static ICollection<License> Get()
+        {
+            return Licenses.Values;
+        }
+
+        /// <summary>
+        /// Returns a license that matches the specified license in content
+        /// </summary>
+        /// <param name="ReferenceLicense">The license based on which to search</param>
+        /// <returns>The matching license object</returns>
+        public static License Get(License ReferenceLicense)
         {
-            return Licenses;
+            License tempLicense = null;
+            try { Licenses.TryGetValue(string.Format("{0}|{1}", ReferenceLicense.Product, ReferenceLicense.ProductVersion), out tempLicense); }
+            catch { }
+            return tempLicense;
         }
 
         /// <summary>
@@ -47,10 +60,10 @@ public static List<License> Get()
         /// <param name="License">License to remove</param>
         public static void Remove(License License)
         {
-            Licenses.Remove(License);
+            string key = string.Format("{0}|{1}", License.Product, License.ProductVersion);
+            License tempLicense;
+            Licenses.TryRemove(key, out tempLicense);
         }
         #endregion Default methods
-
-
     }
 }

PSFramework/functions/license/Get-PSFLicense.ps1

@@ -11,21 +11,21 @@ public enum LicenseType
         /// <summary>
         /// No special type is present
         /// </summary>
-        Free = 0,
+        Free = 1,
 
         /// <summary>
         /// The license is for a commercial product. This means you have to acquire use permission, such as software licenses, user CALs et al.
         /// </summary>
-        Commercial = 1,
+        Commercial = 2,
 
         /// <summary>
         /// Reusing this product requires no attribution. Just use it and call it your own.
         /// </summary>
-        NoAttribution = 2,
+        NoAttribution = 4,
 
         /// <summary>
         /// This product may be used, but must not be modified in any way.
         /// </summary>
-        NoModify = 4,
+        NoModify = 8,
     }
 }