upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2026-02-03 04:09:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes an issue on which a JEA service would become orphaned

Browse source
This commit is contained in:
Lord Hepipud 2024-06-06 14:21:27 +02:00
parent 824b8a231a
commit 1fba01e7a2
2 changed files with 62 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/100-General/10-Changelog.md
View file

@ -11,6 +11,12 @@ 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) [Issues and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/32)
### Bugfixes
* [#734](https://github.com/Icinga/icinga-powershell-framework/issues/734) Fixes a scenario on which a JEA service could become orphaned while manually stopping the Icinga for Windows service, without gracefully shutting down JEA
### Enhancements
* [#732](https://github.com/Icinga/icinga-powershell-framework/pull/732) Adds support for TLS 1.3 and improves startup response * [#732](https://github.com/Icinga/icinga-powershell-framework/pull/732) Adds support for TLS 1.3 and improves startup response
## 1.12.3 (2024-04-24) ## 1.12.3 (2024-04-24)

115
lib/daemon/Start-IcingaPowerShellDaemon.psm1
View file

@ -17,69 +17,66 @@ function Start-IcingaForWindowsDaemon()
[switch]$JEARestart = $FALSE [switch]$JEARestart = $FALSE
); );
$Global:Icinga.Protected.RunAsDaemon = [bool]$RunAsService; $Global:Icinga.Protected.RunAsDaemon = [bool]$RunAsService;
$Global:Icinga.Protected.JEAContext = [bool]$JEAContext; $Global:Icinga.Protected.JEAContext = [bool]$JEAContext;
[string]$MainServicePidFile = (Join-Path -Path (Get-IcingaCacheDir) -ChildPath 'service.pid'); [string]$MainServicePidFile = (Join-Path -Path (Get-IcingaCacheDir) -ChildPath 'service.pid');
[string]$JeaPidFile = (Join-Path -Path (Get-IcingaCacheDir) -ChildPath 'jea.pid'); [string]$JeaPidFile = (Join-Path -Path (Get-IcingaCacheDir) -ChildPath 'jea.pid');
[string]$JeaProfile = Get-IcingaPowerShellConfig -Path 'Framework.JEAProfile'; [string]$JeaProfile = Get-IcingaPowerShellConfig -Path 'Framework.JEAProfile';
[string]$JeaPid = ''; [string]$JeaPid = '';
if (Test-IcingaJEAServiceRunning) { if ((Test-IcingaJEAServiceRunning) -eq $FALSE) {
Write-IcingaEventMessage -EventId 1503 -Namespace 'Framework'; Write-IcingaFileSecure -File ($MainServicePidFile) -Value $PID;
exit 1;
}
Write-IcingaFileSecure -File ($MainServicePidFile) -Value $PID; if ([string]::IsNullOrEmpty($JeaProfile)) {
Write-IcingaDebugMessage -Message 'Starting Icinga for Windows service without JEA context' -Objects $RunAsService, $JEARestart, $JeaProfile;
if ([string]::IsNullOrEmpty($JeaProfile)) { # Todo: Add config for active background tasks. Set it to 20 for the moment
Write-IcingaDebugMessage -Message 'Starting Icinga for Windows service without JEA context' -Objects $RunAsService, $JEARestart, $JeaProfile; Add-IcingaThreadPool -Name 'MainPool' -MaxInstances 20;
$Global:Icinga.Public.Add(
# Todo: Add config for active background tasks. Set it to 20 for the moment 'SSL',
Add-IcingaThreadPool -Name 'MainPool' -MaxInstances 20; @{
$Global:Icinga.Public.Add( 'Certificate' = $null;
'SSL', 'CertFile' = $null;
@{ 'CertThumbprint' = $null;
'Certificate' = $null; 'CertFilter' = $null;
'CertFile' = $null;
'CertThumbprint' = $null;
'CertFilter' = $null;
}
);
New-IcingaThreadInstance -Name "Main" -ThreadPool (Get-IcingaThreadPool -Name 'MainPool') -Command 'Add-IcingaForWindowsDaemon' -Start;
} else {
Write-IcingaDebugMessage -Message 'Starting Icinga for Windows service inside JEA context' -Objects $RunAsService, $JEARestart, $JeaProfile;
& powershell.exe -NoProfile -NoLogo -ConfigurationName $JeaProfile -Command {
try {
Use-Icinga -Daemon;
Write-IcingaFileSecure -File ($args[0]) -Value $PID;
$Global:Icinga.Protected.JEAContext = $TRUE;
$Global:Icinga.Protected.RunAsDaemon = $TRUE;
# Todo: Add config for active background tasks. Set it to 20 for the moment
Add-IcingaThreadPool -Name 'MainPool' -MaxInstances 20;
$Global:Icinga.Public.Add(
'SSL',
@{
'Certificate' = $null;
'CertFile' = $null;
'CertThumbprint' = $null;
'CertFilter' = $null;
}
);
New-IcingaThreadInstance -Name "Main" -ThreadPool (Get-IcingaThreadPool -Name 'MainPool') -Command 'Add-IcingaForWindowsDaemon' -Start;
while ($TRUE) {
Start-Sleep -Seconds 100;
} }
} catch { );
Write-IcingaEventMessage -EventId 1600 -Namespace 'Framework' -ExceptionObject $_;
} New-IcingaThreadInstance -Name "Main" -ThreadPool (Get-IcingaThreadPool -Name 'MainPool') -Command 'Add-IcingaForWindowsDaemon' -Start;
} -Args $JeaPidFile; } else {
Write-IcingaDebugMessage -Message 'Starting Icinga for Windows service inside JEA context' -Objects $RunAsService, $JEARestart, $JeaProfile;
& powershell.exe -NoProfile -NoLogo -ConfigurationName $JeaProfile -Command {
try {
Use-Icinga -Daemon;
Write-IcingaFileSecure -File ($args[0]) -Value $PID;
$Global:Icinga.Protected.JEAContext = $TRUE;
$Global:Icinga.Protected.RunAsDaemon = $TRUE;
# Todo: Add config for active background tasks. Set it to 20 for the moment
Add-IcingaThreadPool -Name 'MainPool' -MaxInstances 20;
$Global:Icinga.Public.Add(
'SSL',
@{
'Certificate' = $null;
'CertFile' = $null;
'CertThumbprint' = $null;
'CertFilter' = $null;
}
);
New-IcingaThreadInstance -Name "Main" -ThreadPool (Get-IcingaThreadPool -Name 'MainPool') -Command 'Add-IcingaForWindowsDaemon' -Start;
while ($TRUE) {
Start-Sleep -Seconds 100;
}
} catch {
Write-IcingaEventMessage -EventId 1600 -Namespace 'Framework' -ExceptionObject $_;
}
} -Args $JeaPidFile;
}
} }
if ($JEARestart) { if ($JEARestart) {