diff --git a/install-kit-awindows-20260427-211240/windows/hardening-recovery.ps1 b/install-kit-awindows-20260427-211240/windows/hardening-recovery.ps1 index 05632e6..95afd22 100755 --- a/install-kit-awindows-20260427-211240/windows/hardening-recovery.ps1 +++ b/install-kit-awindows-20260427-211240/windows/hardening-recovery.ps1 @@ -116,6 +116,7 @@ $config = New-ActivityWatchDeploymentConfig ` -LogsRoot $effectiveLogsRoot ` -CollectorScript $effectiveCollector ` -EndpointCollectorScript $effectiveEndpointCollector ` + -SessionCollectorScript $effectiveSessionCollector ` -RulesPath $effectiveRules ` -PolicyPath $effectivePolicy ` -PollSeconds $effectivePollSeconds ` diff --git a/install-kit-awindows-20260427-211240/windows/worktime-session-collector.ps1 b/install-kit-awindows-20260427-211240/windows/worktime-session-collector.ps1 index 214be90..3750b6a 100644 --- a/install-kit-awindows-20260427-211240/windows/worktime-session-collector.ps1 +++ b/install-kit-awindows-20260427-211240/windows/worktime-session-collector.ps1 @@ -70,16 +70,25 @@ function Get-SessionRecords { continue } + $sessionName = '' + $sessionIdIndex = 2 + if ($parts[1] -match '^\d+$') { + $sessionIdIndex = 1 + } + else { + $sessionName = $parts[1] + } + $sessionId = 0 - if ($parts[2] -match '^\d+$') { - $sessionId = [int]$parts[2] + if ($parts[$sessionIdIndex] -match '^\d+$') { + $sessionId = [int]$parts[$sessionIdIndex] } $records += [pscustomobject]@{ username = $parts[0] - sessionName = $parts[1] + sessionName = $sessionName sessionId = $sessionId - state = $parts[3] + state = $parts[$sessionIdIndex + 1] } } } diff --git a/windows/hardening-recovery.ps1 b/windows/hardening-recovery.ps1 index 05632e6..95afd22 100755 --- a/windows/hardening-recovery.ps1 +++ b/windows/hardening-recovery.ps1 @@ -116,6 +116,7 @@ $config = New-ActivityWatchDeploymentConfig ` -LogsRoot $effectiveLogsRoot ` -CollectorScript $effectiveCollector ` -EndpointCollectorScript $effectiveEndpointCollector ` + -SessionCollectorScript $effectiveSessionCollector ` -RulesPath $effectiveRules ` -PolicyPath $effectivePolicy ` -PollSeconds $effectivePollSeconds ` diff --git a/windows/worktime-session-collector.ps1 b/windows/worktime-session-collector.ps1 index 214be90..3750b6a 100644 --- a/windows/worktime-session-collector.ps1 +++ b/windows/worktime-session-collector.ps1 @@ -70,16 +70,25 @@ function Get-SessionRecords { continue } + $sessionName = '' + $sessionIdIndex = 2 + if ($parts[1] -match '^\d+$') { + $sessionIdIndex = 1 + } + else { + $sessionName = $parts[1] + } + $sessionId = 0 - if ($parts[2] -match '^\d+$') { - $sessionId = [int]$parts[2] + if ($parts[$sessionIdIndex] -match '^\d+$') { + $sessionId = [int]$parts[$sessionIdIndex] } $records += [pscustomobject]@{ username = $parts[0] - sessionName = $parts[1] + sessionName = $sessionName sessionId = $sessionId - state = $parts[3] + state = $parts[$sessionIdIndex + 1] } } }