From d04a074bfa106a701c5bb7798eeb85409eaca65e Mon Sep 17 00:00:00 2001 From: hollanjs Date: Mon, 23 Jan 2023 18:19:50 -0500 Subject: [PATCH 1/3] added -Recurse to Get-ChildItem to avoid nested pathing issues when requesting cert by Thumprint --- CHANGELOG.md | 8 ++++++-- .../MSFT_SPTrustedRootAuthority.psm1 | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f86056c9..16584c4cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- SPTrustedRootAuthority + - `Set-TargetResource`: Added `-Recurse` flag to `Get-ChildItem` when + attempting to obtain reference to certificate by Thumbprint. + ## [5.3.0] - 2022-11-15 ### Added @@ -262,8 +266,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added support for LogonTokenCacheExpirationWindow, WindowsTokenLifetime and FormsTokenLifetime settings - SPService - New resource - - SPSecurityTokenServiceConfig - - Added support for LogonTokenCacheExpirationWindow, WindowsTokenLifetime and FormsTokenLifetime settings +- SPSecurityTokenServiceConfig +- Added support for LogonTokenCacheExpirationWindow, WindowsTokenLifetime and FormsTokenLifetime settings - SPUsageDefinition - New resource - SPUserProfileProperty diff --git a/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 b/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 index ce59ab767..701534cb2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 @@ -182,7 +182,7 @@ function Set-TargetResource else { Write-Verbose -Message "Importing certificate from CertificateThumbprint" - $cert = Get-ChildItem -Path "Cert:\LocalMachine\*$($params.CertificateThumbprint)" ` + $cert = Get-ChildItem -Path "Cert:\LocalMachine\*$($params.CertificateThumbprint)" -Recurse ` -ErrorAction SilentlyContinue | ` Sort-Object -Property PSParentPath -Descending | ` Select-Object -First 1 @@ -264,7 +264,7 @@ function Set-TargetResource else { Write-Verbose -Message "Importing certificate from CertificateThumbprint" - $cert = Get-ChildItem -Path "Cert:\LocalMachine\*$($params.CertificateThumbprint)" ` + $cert = Get-ChildItem -Path "Cert:\LocalMachine\*$($params.CertificateThumbprint)" -Recurse ` -ErrorAction SilentlyContinue | ` Sort-Object -Property PSParentPath -Descending | ` Select-Object -First 1 From 9d6d49b9e6637e1675553210a3fcbeb763b306e5 Mon Sep 17 00:00:00 2001 From: hollanjs Date: Tue, 24 Jan 2023 08:29:24 -0500 Subject: [PATCH 2/3] updating CHANGELOG --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16584c4cc..86a7be79f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - SPTrustedRootAuthority - - `Set-TargetResource`: Added `-Recurse` flag to `Get-ChildItem` when - attempting to obtain reference to certificate by Thumbprint. + - Added `-Recurse` flag to `Get-ChildItem` when setting + certificate by Thumbprint. ## [5.3.0] - 2022-11-15 From c4cf42f3f9505cfe7b16259fae36fd2b8618fe1d Mon Sep 17 00:00:00 2001 From: hollanjs Date: Tue, 24 Jan 2023 08:34:30 -0500 Subject: [PATCH 3/3] updating CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86a7be79f..88f376f8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - SPTrustedRootAuthority - - Added `-Recurse` flag to `Get-ChildItem` when setting + - Added `-Recurse` flag to `Get-ChildItem` when setting certificate by Thumbprint. ## [5.3.0] - 2022-11-15