diff --git a/scripts/Install-SguCredentialProviderUpdatePolicy.ps1 b/scripts/Install-SguCredentialProviderUpdatePolicy.ps1 index 9b6f4db..594b378 100644 --- a/scripts/Install-SguCredentialProviderUpdatePolicy.ps1 +++ b/scripts/Install-SguCredentialProviderUpdatePolicy.ps1 @@ -60,7 +60,8 @@ if ($PSCmdlet.ShouldProcess($GpoName, 'Make the computer startup script synchron $scriptName = "Update-SguCredentialProvider-$Version.ps1" $gpoScriptsPath = Join-Path $env:WINDIR "SYSVOL\domain\Policies\{$($gpo.Id)}\Machine\Scripts" $startupPath = Join-Path $gpoScriptsPath 'Startup' -$powershellScriptsIniPath = Join-Path $gpoScriptsPath 'psscripts.ini' +$scriptsIniPath = Join-Path $gpoScriptsPath 'scripts.ini' +$legacyPowerShellScriptsIniPath = Join-Path $gpoScriptsPath 'psscripts.ini' $scriptPath = Join-Path $startupPath $scriptName $startupScript = @" @@ -74,6 +75,13 @@ if (-not `$computerSystem.PartOfDomain -or `$computerSystem.DomainRole -ge 4) { exit 0 } +# Windows remembers the provider used at the last interactive logon. Select +# the institutional tile at startup while leaving the native password tile +# registered for manual recovery. +`$logonUiPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI' +Set-ItemProperty -Path `$logonUiPath -Name LastLoggedOnProvider ` + -Value '{D789CFD8-5AD4-489F-9B83-7EB5D9D09335}' + `$updateRoot = Join-Path `$env:ProgramData "SGU\CredentialProviderUpdates\`$version" `$markerPath = Join-Path `$updateRoot 'complete.marker' if (Test-Path -LiteralPath `$markerPath -PathType Leaf) { @@ -99,7 +107,9 @@ if (-not (Test-Path -LiteralPath `$installScript -PathType Leaf)) { if (Test-Path -LiteralPath `$stagePath -PathType Container) { Remove-Item -LiteralPath `$stagePath -Recurse -Force } - Expand-Archive -LiteralPath `$archivePath -DestinationPath `$stagePath -Force + New-Item -ItemType Directory -Path `$stagePath -Force | Out-Null + Add-Type -AssemblyName System.IO.Compression.FileSystem + [IO.Compression.ZipFile]::ExtractToDirectory(`$archivePath, `$stagePath) } if (-not (Test-Path -LiteralPath `$installScript -PathType Leaf)) { throw 'The verified update package did not contain Install-CredentialProvider.ps1.' @@ -115,8 +125,9 @@ if (-not (Test-Path -LiteralPath `$installScript -PathType Leaf)) { DomainNetbios = [string]`$settings.DomainNetbios TimeoutSeconds = [int]`$settings.TimeoutSeconds } -`$dotnet = Get-Command dotnet -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Source -ErrorAction SilentlyContinue -`$runtimeInstalled = `$dotnet -and (& `$dotnet --list-runtimes | Select-String '^Microsoft\.NETCore\.App 10\.') +`$dotnet = Join-Path `$env:ProgramFiles 'dotnet\dotnet.exe' +`$runtimeInstalled = (Test-Path -LiteralPath `$dotnet -PathType Leaf) -and + (& `$dotnet --list-runtimes | Select-String '^Microsoft\.NETCore\.App 10\.') if (-not `$runtimeInstalled) { `$runtimeInstaller = Get-ChildItem -LiteralPath (Join-Path `$stagePath 'payload\prerequisites') -Filter '*x64*.exe' -File | Select-Object -First 1 @@ -134,9 +145,15 @@ if (-not `$runtimeInstalled) { if ($PSCmdlet.ShouldProcess($startupPath, "Install '$scriptName' as a computer startup script")) { New-Item -ItemType Directory -Path $startupPath -Force | Out-Null [IO.File]::WriteAllText($scriptPath, $startupScript, [Text.UTF8Encoding]::new($false)) - $scriptsIni = "[Startup]`r`n0CmdLine=$scriptName`r`n0Parameters=`r`n" - # Windows' Scripts CSE requires UTF-16LE with a BOM for psscripts.ini. - [IO.File]::WriteAllText($powershellScriptsIniPath, $scriptsIni, [Text.Encoding]::Unicode) + $scriptUncPath = "\\$domainDnsRoot\SYSVOL\$domainDnsRoot\Policies\{$($gpo.Id)}\Machine\Scripts\Startup\$scriptName" + $scriptsIni = "[Startup]`r`n0CmdLine=powershell.exe`r`n0Parameters=-NoProfile -NonInteractive -ExecutionPolicy Bypass -File `"$scriptUncPath`"`r`n" + # The Scripts CSE requires UTF-16LE with a BOM. The explicit process + # execution policy allows the verified installer to run on Windows clients + # whose default PowerShell policy is Restricted. + [IO.File]::WriteAllText($scriptsIniPath, $scriptsIni, [Text.Encoding]::Unicode) + if (Test-Path -LiteralPath $legacyPowerShellScriptsIniPath -PathType Leaf) { + Remove-Item -LiteralPath $legacyPowerShellScriptsIniPath -Force + } # Writing SYSVOL directly does not register the Scripts CSE in the GPO's # Active Directory object. Without it, gpresult lists the GPO but the