Merge pull request #186 from AlexandreRatte/GetTypesFailOnDefinedType…

…sNull CertificateDsc.Common.psm1: Exclude assemblies having DefinedTypes as null instead of an empty array.
dsccommunity · Mar 15, 2019 · 967ca58 · 967ca58
2 parents 2cd3f75 + c242bdd
commit 967ca58
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+- CertificateDsc.Common.psm1
+  - Exclude assemblies that set DefinedTypes to null instead of an empty array
+    to prevent failures on GetTypes(). This issue occurred with the
+    Microsoft.WindowsAzure.Storage.dll assembly.
+
 ## 4.4.0.0
 
 - Minor style corrections from PR for

diff --git a/Modules/CertificateDsc.Common/CertificateDsc.Common.psm1 b/Modules/CertificateDsc.Common/CertificateDsc.Common.psm1
@@ -117,8 +117,11 @@ function Test-Thumbprint
         # Get FIPS registry key
         $fips = [System.Int32] (Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy' -ErrorAction SilentlyContinue).Enabled
 
-        # Get a list of Hash Providers
-        $allHashProviders = [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes()
+        <#
+        Get a list of Hash Providers, but exclude assemblies that set DefinedTypes to null instead of an empty array.
+        Otherwise, the call to GetTypes() fails.
+        #>
+        $allHashProviders = ([System.AppDomain]::CurrentDomain.GetAssemblies() | Where-Object { $null -ne $_.DefinedTypes}).GetTypes()
 
         if ($fips -eq $true)
         {
@@ -740,7 +743,7 @@ function Get-CertificateTemplateName
 
     if ($null -ne $templateExtensionText)
     {
-        return Get-CertificateTemplateInformation -FormattedTemplate $templateExtensionText | 
+        return Get-CertificateTemplateInformation -FormattedTemplate $templateExtensionText |
             Select-Object -ExpandProperty Name
     }
 }

diff --git a/Tests/Unit/CertificateDsc.Common.Tests.ps1 b/Tests/Unit/CertificateDsc.Common.Tests.ps1
@@ -24,26 +24,27 @@ try
     InModuleScope $script:ModuleName {
         $DSCResourceName = 'CertificateDsc.Common'
         $invalidThumbprint = 'Zebra'
+        $definedRuntimeTypes = ([System.AppDomain]::CurrentDomain.GetAssemblies() | Where-Object -FilterScript { $null -ne $_.DefinedTypes}).GetTypes()
 
         # This thumbprint is valid (but not FIPS valid)
         $validThumbprint = (
-            [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes() | Where-Object {
+            $definedRuntimeTypes | Where-Object -FilterScript {
                 $_.BaseType.BaseType -eq [System.Security.Cryptography.HashAlgorithm] -and
                 ($_.Name -cmatch 'Managed$' -or $_.Name -cmatch 'Provider$')
-            } | Select-Object -First 1 | ForEach-Object {
-                (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object {
+            } | Select-Object -First 1 | ForEach-Object -Process {
+                (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object -Process {
                     '{0:x2}' -f $_
                 }
             }
         ) -join ''
 
         # This thumbprint is valid for FIPS
         $validFipsThumbprint = (
-            [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes() | Where-Object {
+            $definedRuntimeTypes | Where-Object -FilterScript {
                 $_.BaseType.BaseType -eq [System.Security.Cryptography.HashAlgorithm] -and
                 ($_.Name -cmatch 'Provider$' -and $_.Name -cnotmatch 'MD5')
-            } | Select-Object -First 1 | ForEach-Object {
-                (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object {
+            } | Select-Object -First 1 | ForEach-Object -Process {
+                (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object -Process {
                     '{0:x2}' -f $_
                 }
             }
@@ -1287,7 +1288,7 @@ Major Version Number=100
 Minor Version Number=5
 
 '@
-                    
+
                     $params = @{
                         TemplateExtensions = $testCertificateWithAltTemplateInformation.Extensions
                     }

diff --git a/Tests/Unit/MSFT_CertReq.Tests.ps1 b/Tests/Unit/MSFT_CertReq.Tests.ps1
@@ -26,12 +26,13 @@ $TestEnvironment = Initialize-TestEnvironment `
 try
 {
     InModuleScope $script:DSCResourceName {
+        $definedRuntimeTypes = ([System.AppDomain]::CurrentDomain.GetAssemblies() | Where-Object -FilterScript { $null -ne $_.DefinedTypes}).GetTypes()
         $validThumbprint = (
-            [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes() | Where-Object {
+            $definedRuntimeTypes | Where-Object -FilterScript {
                 $_.BaseType.BaseType -eq [System.Security.Cryptography.HashAlgorithm] -and
                 ($_.Name -cmatch 'Managed$' -or $_.Name -cmatch 'Provider$')
-            } | Select-Object -First 1 | ForEach-Object {
-                (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object {
+            } | Select-Object -First 1 | ForEach-Object -Process {
+                (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object -Process {
                     '{0:x2}' -f $_
                 }
             }

diff --git a/Tests/Unit/MSFT_CertificateImport.Tests.ps1 b/Tests/Unit/MSFT_CertificateImport.Tests.ps1
@@ -22,12 +22,13 @@ try
 {
     InModuleScope $script:DSCResourceName {
         $DSCResourceName = 'MSFT_CertificateImport'
+        $definedRuntimeTypes = ([System.AppDomain]::CurrentDomain.GetAssemblies() | Where-Object -FilterScript { $null -ne $_.DefinedTypes}).GetTypes()
         $validThumbprint = (
-            [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes() | Where-Object {
+            $definedRuntimeTypes | Where-Object -FilterScript {
                 $_.BaseType.BaseType -eq [System.Security.Cryptography.HashAlgorithm] -and
                 ($_.Name -cmatch 'Managed$' -or $_.Name -cmatch 'Provider$')
-            } | Select-Object -First 1 | ForEach-Object {
-                (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object {
+            } | Select-Object -First 1 | ForEach-Object -Process {
+                (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object -Process {
                     '{0:x2}' -f $_
                 }
             }

diff --git a/Tests/Unit/MSFT_PfxImport.Tests.ps1 b/Tests/Unit/MSFT_PfxImport.Tests.ps1
@@ -28,12 +28,13 @@ try
 {
     InModuleScope $script:DSCResourceName {
         $DSCResourceName = 'MSFT_PfxImport'
+        $definedRuntimeTypes = ([System.AppDomain]::CurrentDomain.GetAssemblies() | Where-Object -FilterScript { $null -ne $_.DefinedTypes}).GetTypes()
         $validThumbprint = (
-            [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes() | Where-Object {
+            $definedRuntimeTypes | Where-Object -FilterScript {
                 $_.BaseType.BaseType -eq [System.Security.Cryptography.HashAlgorithm] -and
                 ($_.Name -cmatch 'Managed$' -or $_.Name -cmatch 'Provider$')
-            } | Select-Object -First 1 | ForEach-Object {
-                (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object {
+            } | Select-Object -First 1 | ForEach-Object -Process {
+                (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object -Process {
                     '{0:x2}' -f $_
                 }
             }