From ee829777e9bdccaad7ac1cd6486996442f018d6e Mon Sep 17 00:00:00 2001 From: Lord Hepipud Date: Fri, 12 Apr 2024 19:22:55 +0200 Subject: [PATCH] Fixes usage of wrong certutil if present in PATH instead of system32 binary --- doc/100-General/10-Changelog.md | 3 ++- lib/webserver/ConvertTo-IcingaX509Certificate.psm1 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/100-General/10-Changelog.md b/doc/100-General/10-Changelog.md index cf644fd..ce1c59f 100644 --- a/doc/100-General/10-Changelog.md +++ b/doc/100-General/10-Changelog.md @@ -11,13 +11,14 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic [Issues and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/32) -## 1.12.3 (tbd) +## 1.12.3 (2024-04-24) [Issues and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/35) ### Bugfixes * [#718](https://github.com/Icinga/icinga-powershell-framework/issues/718) Fixes Icinga repository JSON validator to report the correct state of the validation status, in case the JSON is not valid +* [#724](https://github.com/Icinga/icinga-powershell-framework/issues/724) Fixes `icingaforwindows.pfx` creation in case another `certutil` is installed on the system and being available in the `PATH` environment * [#725](https://github.com/Icinga/icinga-powershell-framework/pull/725) Fixes Icinga for Windows certificate handling by keeping the .pfx file on the system as created, without using the certificate store. Also fixes handling for providing thumbprints for certificates, which are now loaded directly from the certificate store by also providing a new filter mechanic to fetch the proper certificates from the store ## 1.12.2 (2024-04-10) diff --git a/lib/webserver/ConvertTo-IcingaX509Certificate.psm1 b/lib/webserver/ConvertTo-IcingaX509Certificate.psm1 index 5c2e0a6..d8b4571 100644 --- a/lib/webserver/ConvertTo-IcingaX509Certificate.psm1 +++ b/lib/webserver/ConvertTo-IcingaX509Certificate.psm1 @@ -37,7 +37,7 @@ function ConvertTo-IcingaX509Certificate() # it is a temp file or we force its creation if (-Not (Test-Path $TargetFile) -Or $TempFile -Or $Force) { Write-Output "$Password - $Password" | certutil -mergepfx "$CertFile" "$TargetFile" | Set-Variable -Name 'CertUtilOutput'; + $Password" | & 'C:\Windows\system32\certutil.exe' -mergepfx "$CertFile" "$TargetFile" | Set-Variable -Name 'CertUtilOutput'; } Write-IcingaDebugMessage -Message (