Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac531db05e | ||
|
|
c8572eb8d4 |
@@ -20,6 +20,20 @@ $remoteDesktopUsersSid = [Security.Principal.SecurityIdentifier]::new('S-1-5-32-
|
|||||||
$remoteDesktopUsersGroup = ($remoteDesktopUsersSid.Translate([Security.Principal.NTAccount]).Value -split '\\', 2)[1]
|
$remoteDesktopUsersGroup = ($remoteDesktopUsersSid.Translate([Security.Principal.NTAccount]).Value -split '\\', 2)[1]
|
||||||
|
|
||||||
if ($PSCmdlet.ShouldProcess($env:COMPUTERNAME, "Enable RDP and grant $RemoteDesktopPrincipal access")) {
|
if ($PSCmdlet.ShouldProcess($env:COMPUTERNAME, "Enable RDP and grant $RemoteDesktopPrincipal access")) {
|
||||||
|
function Invoke-PowerCfgBestEffort {
|
||||||
|
param([Parameter(Mandatory)][string[]]$Arguments)
|
||||||
|
|
||||||
|
# Start-Process keeps powercfg's policy-override diagnostic on its own
|
||||||
|
# stderr stream. In PowerShell 7, directly invoking that native command
|
||||||
|
# turns stderr into a terminating ErrorRecord under $ErrorActionPreference
|
||||||
|
# = 'Stop', which previously aborted this unrelated remediation work.
|
||||||
|
$process = Start-Process -FilePath "$env:SystemRoot\System32\powercfg.exe" `
|
||||||
|
-ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
|
||||||
|
if ($process.ExitCode -ne 0) {
|
||||||
|
Write-Warning "powercfg $($Arguments -join ' ') returned exit code $($process.ExitCode); continuing enrollment repair."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($powerChange in @(
|
foreach ($powerChange in @(
|
||||||
@('monitor-timeout-ac', '0'),
|
@('monitor-timeout-ac', '0'),
|
||||||
@('monitor-timeout-dc', '0'),
|
@('monitor-timeout-dc', '0'),
|
||||||
@@ -27,15 +41,9 @@ if ($PSCmdlet.ShouldProcess($env:COMPUTERNAME, "Enable RDP and grant $RemoteDesk
|
|||||||
@('standby-timeout-dc', '0'),
|
@('standby-timeout-dc', '0'),
|
||||||
@('hibernate-timeout-ac', '0'),
|
@('hibernate-timeout-ac', '0'),
|
||||||
@('hibernate-timeout-dc', '0'))) {
|
@('hibernate-timeout-dc', '0'))) {
|
||||||
& powercfg.exe /change $powerChange[0] $powerChange[1]
|
Invoke-PowerCfgBestEffort -Arguments @('/change', $powerChange[0], $powerChange[1])
|
||||||
if ($LASTEXITCODE -ne 0) {
|
|
||||||
throw "powercfg /change $($powerChange[0]) failed with exit code $LASTEXITCODE."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
& powercfg.exe /hibernate off
|
|
||||||
if ($LASTEXITCODE -ne 0) {
|
|
||||||
throw "powercfg /hibernate off failed with exit code $LASTEXITCODE."
|
|
||||||
}
|
}
|
||||||
|
Invoke-PowerCfgBestEffort -Arguments @('/hibernate', 'off')
|
||||||
|
|
||||||
Set-ItemProperty -LiteralPath 'HKLM:\SYSTEM\CurrentControlSet\Control\Terminal Server' `
|
Set-ItemProperty -LiteralPath 'HKLM:\SYSTEM\CurrentControlSet\Control\Terminal Server' `
|
||||||
-Name fDenyTSConnections -Type DWord -Value 0
|
-Name fDenyTSConnections -Type DWord -Value 0
|
||||||
|
|||||||
@@ -179,10 +179,14 @@ if ($PSCmdlet.ShouldProcess($installPath, 'Install and register the SGU Credenti
|
|||||||
|
|
||||||
$acl = Get-Acl -LiteralPath (Split-Path $settingsPath -Parent)
|
$acl = Get-Acl -LiteralPath (Split-Path $settingsPath -Parent)
|
||||||
$acl.SetAccessRuleProtection($true, $false)
|
$acl.SetAccessRuleProtection($true, $false)
|
||||||
|
# Resolve built-in identities by SID instead of localized display names.
|
||||||
|
# "BUILTIN\Administrators" is not resolvable on every non-English client.
|
||||||
|
$systemSid = [Security.Principal.SecurityIdentifier]::new('S-1-5-18')
|
||||||
|
$administratorsSid = [Security.Principal.SecurityIdentifier]::new('S-1-5-32-544')
|
||||||
$acl.AddAccessRule([Security.AccessControl.FileSystemAccessRule]::new(
|
$acl.AddAccessRule([Security.AccessControl.FileSystemAccessRule]::new(
|
||||||
'SYSTEM', 'FullControl', 'ContainerInherit,ObjectInherit', 'None', 'Allow'))
|
$systemSid, 'FullControl', 'ContainerInherit,ObjectInherit', 'None', 'Allow'))
|
||||||
$acl.AddAccessRule([Security.AccessControl.FileSystemAccessRule]::new(
|
$acl.AddAccessRule([Security.AccessControl.FileSystemAccessRule]::new(
|
||||||
'BUILTIN\Administrators', 'FullControl', 'ContainerInherit,ObjectInherit', 'None', 'Allow'))
|
$administratorsSid, 'FullControl', 'ContainerInherit,ObjectInherit', 'None', 'Allow'))
|
||||||
Set-Acl -LiteralPath (Split-Path $settingsPath -Parent) -AclObject $acl
|
Set-Acl -LiteralPath (Split-Path $settingsPath -Parent) -AclObject $acl
|
||||||
|
|
||||||
New-Item -Path $classRegistryPath -Force | Out-Null
|
New-Item -Path $classRegistryPath -Force | Out-Null
|
||||||
|
|||||||
@@ -71,7 +71,11 @@ if ($PSCmdlet.ShouldProcess($enrollmentRoot, 'Install the SGU enrollment repair
|
|||||||
$runtimeDirectory = Join-Path $enrollmentRoot 'prerequisites'
|
$runtimeDirectory = Join-Path $enrollmentRoot 'prerequisites'
|
||||||
New-Item -ItemType Directory -Path $runtimeDirectory -Force | Out-Null
|
New-Item -ItemType Directory -Path $runtimeDirectory -Force | Out-Null
|
||||||
$guardRuntimeInstaller = Join-Path $runtimeDirectory (Split-Path $DotNetRuntimeInstallerPath -Leaf)
|
$guardRuntimeInstaller = Join-Path $runtimeDirectory (Split-Path $DotNetRuntimeInstallerPath -Leaf)
|
||||||
Copy-Item -LiteralPath $DotNetRuntimeInstallerPath -Destination $guardRuntimeInstaller -Force
|
$sourceRuntimeInstaller = [IO.Path]::GetFullPath($DotNetRuntimeInstallerPath)
|
||||||
|
$destinationRuntimeInstaller = [IO.Path]::GetFullPath($guardRuntimeInstaller)
|
||||||
|
if (-not $sourceRuntimeInstaller.Equals($destinationRuntimeInstaller, [StringComparison]::OrdinalIgnoreCase)) {
|
||||||
|
Copy-Item -LiteralPath $DotNetRuntimeInstallerPath -Destination $guardRuntimeInstaller -Force
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$guardConfiguration = [ordered]@{
|
$guardConfiguration = [ordered]@{
|
||||||
@@ -92,10 +96,13 @@ if ($PSCmdlet.ShouldProcess($enrollmentRoot, 'Install the SGU enrollment repair
|
|||||||
|
|
||||||
$acl = Get-Acl -LiteralPath $enrollmentRoot
|
$acl = Get-Acl -LiteralPath $enrollmentRoot
|
||||||
$acl.SetAccessRuleProtection($true, $false)
|
$acl.SetAccessRuleProtection($true, $false)
|
||||||
|
# Well-known SIDs are invariant across localized Windows installations.
|
||||||
|
$systemSid = [Security.Principal.SecurityIdentifier]::new('S-1-5-18')
|
||||||
|
$administratorsSid = [Security.Principal.SecurityIdentifier]::new('S-1-5-32-544')
|
||||||
$acl.AddAccessRule([Security.AccessControl.FileSystemAccessRule]::new(
|
$acl.AddAccessRule([Security.AccessControl.FileSystemAccessRule]::new(
|
||||||
'SYSTEM', 'FullControl', 'ContainerInherit,ObjectInherit', 'None', 'Allow'))
|
$systemSid, 'FullControl', 'ContainerInherit,ObjectInherit', 'None', 'Allow'))
|
||||||
$acl.AddAccessRule([Security.AccessControl.FileSystemAccessRule]::new(
|
$acl.AddAccessRule([Security.AccessControl.FileSystemAccessRule]::new(
|
||||||
'BUILTIN\Administrators', 'FullControl', 'ContainerInherit,ObjectInherit', 'None', 'Allow'))
|
$administratorsSid, 'FullControl', 'ContainerInherit,ObjectInherit', 'None', 'Allow'))
|
||||||
Set-Acl -LiteralPath $enrollmentRoot -AclObject $acl
|
Set-Acl -LiteralPath $enrollmentRoot -AclObject $acl
|
||||||
|
|
||||||
$repairScript = Join-Path $enrollmentRoot 'Repair-SguClientEnrollment.ps1'
|
$repairScript = Join-Path $enrollmentRoot 'Repair-SguClientEnrollment.ps1'
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ $ErrorActionPreference = 'Stop'
|
|||||||
$policyKey = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'
|
$policyKey = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'
|
||||||
$policyValueName = 'DisableLockWorkstation'
|
$policyValueName = 'DisableLockWorkstation'
|
||||||
$desktopPolicyKey = 'HKCU\Software\Policies\Microsoft\Windows\Control Panel\Desktop'
|
$desktopPolicyKey = 'HKCU\Software\Policies\Microsoft\Windows\Control Panel\Desktop'
|
||||||
|
$themeKey = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize'
|
||||||
|
|
||||||
$identity = [Security.Principal.WindowsIdentity]::GetCurrent()
|
$identity = [Security.Principal.WindowsIdentity]::GetCurrent()
|
||||||
$principal = [Security.Principal.WindowsPrincipal]::new($identity)
|
$principal = [Security.Principal.WindowsPrincipal]::new($identity)
|
||||||
@@ -83,6 +84,19 @@ if ($PSCmdlet.ShouldProcess($GpoName, 'Prevent SGU users from manually locking w
|
|||||||
-Type String `
|
-Type String `
|
||||||
-Value '0' | Out-Null
|
-Value '0' | Out-Null
|
||||||
|
|
||||||
|
# Apply the native Windows dark theme at user logon. Both values are required:
|
||||||
|
# one controls the shell and the other controls supported applications.
|
||||||
|
foreach ($themeValueName in 'AppsUseLightTheme', 'SystemUsesLightTheme') {
|
||||||
|
Set-GPRegistryValue `
|
||||||
|
-Name $GpoName `
|
||||||
|
-Domain $domainName `
|
||||||
|
-Server $DomainController `
|
||||||
|
-Key $themeKey `
|
||||||
|
-ValueName $themeValueName `
|
||||||
|
-Type DWord `
|
||||||
|
-Value 0 | Out-Null
|
||||||
|
}
|
||||||
|
|
||||||
if ($WallpaperPath) {
|
if ($WallpaperPath) {
|
||||||
Set-GPRegistryValue `
|
Set-GPRegistryValue `
|
||||||
-Name $GpoName `
|
-Name $GpoName `
|
||||||
@@ -115,6 +129,18 @@ $screenSaverValue = Get-GPRegistryValue `
|
|||||||
-Server $DomainController `
|
-Server $DomainController `
|
||||||
-Key $desktopPolicyKey `
|
-Key $desktopPolicyKey `
|
||||||
-ValueName 'ScreenSaveActive'
|
-ValueName 'ScreenSaveActive'
|
||||||
|
$appsThemeValue = Get-GPRegistryValue `
|
||||||
|
-Name $GpoName `
|
||||||
|
-Domain $domainName `
|
||||||
|
-Server $DomainController `
|
||||||
|
-Key $themeKey `
|
||||||
|
-ValueName 'AppsUseLightTheme'
|
||||||
|
$systemThemeValue = Get-GPRegistryValue `
|
||||||
|
-Name $GpoName `
|
||||||
|
-Domain $domainName `
|
||||||
|
-Server $DomainController `
|
||||||
|
-Key $themeKey `
|
||||||
|
-ValueName 'SystemUsesLightTheme'
|
||||||
$link = @(Get-GPInheritance -Target $TargetOuDn -Domain $domainName -Server $DomainController).GpoLinks |
|
$link = @(Get-GPInheritance -Target $TargetOuDn -Domain $domainName -Server $DomainController).GpoLinks |
|
||||||
Where-Object DisplayName -eq $GpoName |
|
Where-Object DisplayName -eq $GpoName |
|
||||||
Select-Object -First 1
|
Select-Object -First 1
|
||||||
@@ -138,5 +164,6 @@ if ($WallpaperPath) {
|
|||||||
LinkEnabled = [bool]$linkEnabled
|
LinkEnabled = [bool]$linkEnabled
|
||||||
DisableLockWorkstation = [int]$configuredValue.Value
|
DisableLockWorkstation = [int]$configuredValue.Value
|
||||||
ScreenSaverDisabled = [string]$screenSaverValue.Value -eq '0'
|
ScreenSaverDisabled = [string]$screenSaverValue.Value -eq '0'
|
||||||
|
DarkMode = ([int]$appsThemeValue.Value -eq 0) -and ([int]$systemThemeValue.Value -eq 0)
|
||||||
Wallpaper = $configuredWallpaper
|
Wallpaper = $configuredWallpaper
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user