diff --git a/assets/branding/darkgray-administrative.png b/assets/branding/darkgray-administrative.png new file mode 100644 index 0000000..89ec67c Binary files /dev/null and b/assets/branding/darkgray-administrative.png differ diff --git a/assets/branding/darkred-professor.png b/assets/branding/darkred-professor.png new file mode 100644 index 0000000..a233ac7 Binary files /dev/null and b/assets/branding/darkred-professor.png differ diff --git a/docs/architecture.md b/docs/architecture.md index 73afd1e..84562cd 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -144,7 +144,10 @@ The managed hierarchy is rooted at `OU=Usuarios-SGU`: `Docentes`, `Alumnos`, and `Administrativos` are direct child OUs beneath it. The domain GPO `SGU - User session restrictions` is linked to this root and enables the per-user `DisableLockWorkstation` and `DisableChangePassword` policies and -disables screen savers for the complete hierarchy. The computer GPO +disables screen savers for the complete hierarchy. The enforced laboratory +loopback GPO also applies `DisableLockWorkstation` and disables screen savers +for every account that logs on to a laboratory computer, including local +accounts; it deliberately does not apply `DisableChangePassword` to them. The computer GPO `SGU - Windows client experience` is linked to `OU=Laboratorio`; it suppresses first-logon/privacy/diagnostic prompts, disables location, and enforces always-on display, sleep, and hibernation settings for managed clients. The diff --git a/docs/client-enrollment.md b/docs/client-enrollment.md index b0a0f0f..5223e55 100644 --- a/docs/client-enrollment.md +++ b/docs/client-enrollment.md @@ -189,7 +189,9 @@ los tiempos en cero al inicio y diariamente. Esa GPO también ejecuta el generador local del fondo de bienvenida y aplica el fondo azul base a la pantalla de bloqueo. El fondo individual se crea al abrir la -sesión con el nombre del usuario y `location`/OU del equipo; véase +sesión con el nombre del usuario y `location`/OU del equipo. Los alumnos conservan +la base azul; `SGU-Administrativos` recibe la variante gris oscuro y +`SGU-Docentes` la variante rojo vino. Véase [welcome-wallpaper.md](welcome-wallpaper.md). `HideEULAPage` no forma parte de esta GPO: es una opción de archivo Unattend para diff --git a/docs/laboratorio-wallpaper-policy.md b/docs/laboratorio-wallpaper-policy.md index 74552cf..e9e306d 100644 --- a/docs/laboratorio-wallpaper-policy.md +++ b/docs/laboratorio-wallpaper-policy.md @@ -1,8 +1,11 @@ -# Protección del fondo de escritorio en Laboratorio +# Protección del fondo y de sesión en Laboratorio El bootstrap de servidor publica `SGU - Laboratorio wallpaper protection` en -`OU=Laboratorio` y sus OU hijas. Para actualizar un dominio existente sin volver -a ejecutar el bootstrap, ejecute en el DC con permisos para administrar GPO: +`OU=Laboratorio` y sus OU hijas. Además de proteger el fondo, impide bloquear +la estación a **toda cuenta que abra sesión en esas máquinas**, incluidas las +cuentas locales como `ing`; no modifica las reglas independientes de cambio de +contraseña de Usuarios-SGU. Para actualizar un dominio existente sin volver a +ejecutar el bootstrap, ejecute en el DC con permisos para administrar GPO: ```powershell .\scripts\Set-SguLaboratorioWallpaperPolicy.ps1 ` @@ -14,8 +17,12 @@ los valores escritos. Admite `-WhatIf`. El vínculo está habilitado y forzado, prioridad 1, para que también alcance las OU hijas con herencia bloqueada. - Loopback **Merge** aplica las opciones de usuario según la OU de la computadora - y conserva las otras políticas del usuario. + y conserva las otras políticas del usuario. Por ello alcanza usuarios locales + y de dominio que inicien sesión en un equipo de Laboratorio. - `NoChangingWallPaper=1` bloquea el cambio desde Personalización. +- `DisableLockWorkstation=1` deshabilita Win+L y la opción **Bloquear** para + todos esos usuarios; `ScreenSaveActive=0` evita que un protector de pantalla + cree una sesión bloqueada indirectamente. - `Wallpaper` fija el archivo generado por SGU: `%LOCALAPPDATA%\SGU\Wallpapers\welcome-%COMPUTERNAME%.jpg`, con estilo Fill. diff --git a/docs/release-0.6.11.md b/docs/release-0.6.11.md new file mode 100644 index 0000000..9493fc0 --- /dev/null +++ b/docs/release-0.6.11.md @@ -0,0 +1,25 @@ +# SGU Credential Provider 0.6.11 + +## Fondos por rol + +- Alumnos y cuentas sin rol conservan el fondo azul institucional. +- `SGU-Administrativos` recibe la base gris oscuro con el logo institucional. +- `SGU-Docentes` recibe la base rojo vino con el logo institucional. +- Windows selecciona la base desde los grupos del token de inicio de sesión; Linux + usa las pertenencias que expone SSSD. No se almacenan roles ni contraseñas + adicionales. +- Si hay una pertenencia ambigua o falta una base, se usa el fondo azul y queda + un aviso de diagnóstico, sin retrasar el inicio de sesión. + +## Sesiones de laboratorio + +- La GPO aplicada por equipo en `OU=Laboratorio` mantiene loopback Merge y ahora + escribe `DisableLockWorkstation=1` para cualquier usuario que inicie sesión en + esas computadoras, incluso una cuenta local como `ing`. +- También deshabilita el protector de pantalla para evitar un bloqueo indirecto. + La regla no impide el cambio de contraseña de cuentas locales: esa restricción + continúa limitada a `OU=Usuarios-SGU` y al Auth Broker. + +Los paquetes Windows, Linux y de servidor incluyen las tres bases y la política +actualizada. Después de aplicar la GPO en un cliente existente, cierre e inicie +sesión para que el contexto del usuario procese loopback. diff --git a/docs/welcome-wallpaper.md b/docs/welcome-wallpaper.md index 5ee152c..ea38147 100644 --- a/docs/welcome-wallpaper.md +++ b/docs/welcome-wallpaper.md @@ -1,10 +1,14 @@ # Fondo de bienvenida personalizado -El enrolamiento instala dos fondos base azules. El escritorio personalizado usa -`assets/branding/darkblue.jpg`, que contiene el logotipo blanco oficial de -Universidad La Salle México, pequeño y elevado en el sector inferior derecho. -La pantalla de bloqueo usa `assets/branding/darkblue-lockscreen.jpg`, que sólo -contiene el fondo azul y nunca muestra el logo. También instala las familias +El enrolamiento instala tres fondos base de escritorio y una base independiente +de pantalla de bloqueo. Alumnos y cuentas sin rol conservan +`assets/branding/darkblue.jpg`; `SGU-Administrativos` usa +`assets/branding/darkgray-administrative.png` y `SGU-Docentes` usa +`assets/branding/darkred-professor.png`. Las tres bases de escritorio contienen +el logotipo blanco oficial de Universidad La Salle México, pequeño y elevado en +el sector inferior derecho. La pantalla de bloqueo usa +`assets/branding/darkblue-lockscreen.jpg`, que sólo contiene el fondo azul y +nunca muestra el logo. También instala las familias `Indivisa Text Sans` y `Indivisa Text Serif`, y un generador local. El logotipo está horneado únicamente en la base de escritorio: el generador no carga, redimensiona ni compone otro logo durante el inicio de sesión. La GPO de equipos @@ -60,6 +64,13 @@ GPO crea el valor de equipo `SGUWelcomeWallpaper` bajo el contexto de cada usuario y puede leer sus datos de AD. El resultado se guarda en `%LOCALAPPDATA%\SGU\Wallpapers` y se aplica con la API nativa de Windows. +La selección de la base se hace a partir de los SID presentes en el token de +inicio de sesión, sin una segunda consulta a AD: exactamente un grupo +`SGU-Administrativos` selecciona gris y exactamente un grupo `SGU-Docentes` +selecciona rojo. Una cuenta sin esos grupos —incluidos los alumnos— conserva el +azul. Si faltase una imagen, el generador vuelve de forma segura a la base azul; +si detecta ambos grupos, también usa azul y registra una advertencia diagnóstica. + La antigua directiva estática de escritorio se elimina para que no sobrescriba el archivo individual. La personalización sigue estando gobernada por dominio: el comando de inicio y la pantalla de bloqueo pertenecen a la GPO de equipos. @@ -80,6 +91,10 @@ dependencia o la API del escritorio no está disponible, el enrolamiento y el inicio de sesión continúan normalmente y se escribe un diagnóstico en `~/.local/state/sgu/welcome-wallpaper.log`. +El generador Linux sigue la misma clasificación con `id -nG`: alumnos y cuentas +sin rol usan azul, `SGU-Administrativos` gris y `SGU-Docentes` rojo. No almacena +la pertenencia ni contraseñas locales. + ## Tipografía Los archivos OTF necesarios viajan dentro de cada paquete y se cargan en memoria diff --git a/scripts/Enroll-SguLinuxDomainClient.sh b/scripts/Enroll-SguLinuxDomainClient.sh index 2fd208c..2fa8561 100755 --- a/scripts/Enroll-SguLinuxDomainClient.sh +++ b/scripts/Enroll-SguLinuxDomainClient.sh @@ -370,11 +370,14 @@ install_welcome_wallpaper() { local source_directory="${SCRIPT_DIRECTORY}/welcome-wallpaper" local source_script="${source_directory}/Set-SguWelcomeWallpaper.sh" local source_image="${source_directory}/darkblue.jpg" + local source_administrative_image="${source_directory}/darkgray-administrative.png" + local source_professor_image="${source_directory}/darkred-professor.png" local install_directory='/usr/local/lib/sgu-welcome-wallpaper' local configuration_directory='/etc/sgu' local autostart_directory='/etc/xdg/autostart' - if [[ ! -r $source_script || ! -r $source_image ]]; then + if [[ ! -r $source_script || ! -r $source_image || + ! -r $source_administrative_image || ! -r $source_professor_image ]]; then printf 'WARNING: Welcome wallpaper assets are absent; domain enrollment will continue without desktop branding.\n' >&2 return 0 fi @@ -396,6 +399,8 @@ install_welcome_wallpaper() { install -d -o root -g root -m 755 "$install_directory" "$configuration_directory" "$autostart_directory" install -o root -g root -m 755 "$source_script" "${install_directory}/Set-SguWelcomeWallpaper.sh" install -o root -g root -m 644 "$source_image" "${install_directory}/darkblue.jpg" + install -o root -g root -m 644 "$source_administrative_image" "${install_directory}/darkgray-administrative.png" + install -o root -g root -m 644 "$source_professor_image" "${install_directory}/darkred-professor.png" if compgen -G "${source_directory}/fonts/*.[ot]tf" >/dev/null; then install -d -o root -g root -m 755 "${install_directory}/fonts" install -o root -g root -m 644 "${source_directory}"/fonts/*.[ot]tf "${install_directory}/fonts/" diff --git a/scripts/Install-CredentialProvider.ps1 b/scripts/Install-CredentialProvider.ps1 index a0653d0..0c691ae 100644 --- a/scripts/Install-CredentialProvider.ps1 +++ b/scripts/Install-CredentialProvider.ps1 @@ -38,6 +38,8 @@ $interactiveLogonPolicyPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\P $accountPictureSourcePath = Join-Path $PublishPath 'branding\user.png' $accountPictureDirectory = Join-Path $env:ProgramData 'Microsoft\User Account Pictures' $welcomeWallpaperSourcePath = Join-Path $PublishPath 'branding\darkblue.jpg' +$welcomeAdministrativeWallpaperSourcePath = Join-Path $PublishPath 'branding\darkgray-administrative.png' +$welcomeProfessorWallpaperSourcePath = Join-Path $PublishPath 'branding\darkred-professor.png' $welcomeLockScreenSourcePath = Join-Path $PublishPath 'branding\darkblue-lockscreen.jpg' $welcomeWallpaperScriptSourcePath = Join-Path $PublishPath 'branding\Set-SguWelcomeWallpaper.ps1' $welcomeFontsSourcePath = Join-Path $PublishPath 'branding\fonts' @@ -129,6 +131,8 @@ function Install-DefaultAccountPicture { function Install-WelcomeWallpaperAssets { if (-not (Test-Path -LiteralPath $welcomeWallpaperSourcePath -PathType Leaf) -or + -not (Test-Path -LiteralPath $welcomeAdministrativeWallpaperSourcePath -PathType Leaf) -or + -not (Test-Path -LiteralPath $welcomeProfessorWallpaperSourcePath -PathType Leaf) -or -not (Test-Path -LiteralPath $welcomeLockScreenSourcePath -PathType Leaf) -or -not (Test-Path -LiteralPath $welcomeWallpaperScriptSourcePath -PathType Leaf)) { return $false @@ -137,6 +141,10 @@ function Install-WelcomeWallpaperAssets { New-Item -ItemType Directory -Path $welcomeWallpaperDirectory -Force | Out-Null Copy-Item -LiteralPath $welcomeWallpaperSourcePath ` -Destination (Join-Path $welcomeWallpaperDirectory 'darkblue.jpg') -Force + Copy-Item -LiteralPath $welcomeAdministrativeWallpaperSourcePath ` + -Destination (Join-Path $welcomeWallpaperDirectory 'darkgray-administrative.png') -Force + Copy-Item -LiteralPath $welcomeProfessorWallpaperSourcePath ` + -Destination (Join-Path $welcomeWallpaperDirectory 'darkred-professor.png') -Force Copy-Item -LiteralPath $welcomeLockScreenSourcePath ` -Destination (Join-Path $welcomeWallpaperDirectory 'darkblue-lockscreen.jpg') -Force Copy-Item -LiteralPath $welcomeWallpaperScriptSourcePath ` @@ -362,6 +370,8 @@ catch { SystemPasswordProviderPreserved = $true WelcomeWallpaperAssetsInstalled = (Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'darkblue.jpg') -PathType Leaf) -and + (Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'darkgray-administrative.png') -PathType Leaf) -and + (Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'darkred-professor.png') -PathType Leaf) -and (Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'darkblue-lockscreen.jpg') -PathType Leaf) -and (Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'Set-SguWelcomeWallpaper.ps1') -PathType Leaf) } diff --git a/scripts/New-SguBootstrapPackages.ps1 b/scripts/New-SguBootstrapPackages.ps1 index 5d54fe8..ec0058b 100644 --- a/scripts/New-SguBootstrapPackages.ps1 +++ b/scripts/New-SguBootstrapPackages.ps1 @@ -143,6 +143,10 @@ Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\lasalle-ma -Destination (Join-Path $clientRoot 'payload\credential-provider\branding\user.png') Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') ` -Destination (Join-Path $clientRoot 'payload\credential-provider\branding\darkblue.jpg') +Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkgray-administrative.png') ` + -Destination (Join-Path $clientRoot 'payload\credential-provider\branding\darkgray-administrative.png') +Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkred-professor.png') ` + -Destination (Join-Path $clientRoot 'payload\credential-provider\branding\darkred-professor.png') Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue-lockscreen.jpg') ` -Destination (Join-Path $clientRoot 'payload\credential-provider\branding\darkblue-lockscreen.jpg') Copy-RequiredFile -Source (Join-Path $PSScriptRoot 'Set-SguWelcomeWallpaper.ps1') ` @@ -182,6 +186,10 @@ Copy-RequiredFile -Source (Join-Path $PSScriptRoot 'Set-SguWelcomeWallpaper.sh') -Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\Set-SguWelcomeWallpaper.sh') Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') ` -Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\darkblue.jpg') +Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkgray-administrative.png') ` + -Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\darkgray-administrative.png') +Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkred-professor.png') ` + -Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\darkred-professor.png') foreach ($fontName in $welcomeFontNames) { Copy-RequiredFile -Source (Join-Path $repositoryRoot "assets\branding\fonts\$fontName") ` -Destination (Join-Path $linuxClientRoot "welcome-wallpaper\fonts\$fontName") @@ -240,6 +248,10 @@ Copy-RequiredFile -Source (Join-Path $PSScriptRoot 'Set-SguWelcomeWallpaper.ps1' -Destination (Join-Path $serverContentTarget 'welcome-wallpaper\Set-SguWelcomeWallpaper.ps1') Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') ` -Destination (Join-Path $serverContentTarget 'welcome-wallpaper\darkblue.jpg') +Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkgray-administrative.png') ` + -Destination (Join-Path $serverContentTarget 'welcome-wallpaper\darkgray-administrative.png') +Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkred-professor.png') ` + -Destination (Join-Path $serverContentTarget 'welcome-wallpaper\darkred-professor.png') Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue-lockscreen.jpg') ` -Destination (Join-Path $serverContentTarget 'welcome-wallpaper\darkblue-lockscreen.jpg') foreach ($fontName in $welcomeFontNames) { diff --git a/scripts/Set-SguDomainComputerPolicies.ps1 b/scripts/Set-SguDomainComputerPolicies.ps1 index 79b9540..caad4c4 100644 --- a/scripts/Set-SguDomainComputerPolicies.ps1 +++ b/scripts/Set-SguDomainComputerPolicies.ps1 @@ -6,6 +6,8 @@ param( [string]$EventCollectorFqdn, [string]$WelcomeWallpaperScriptPath = 'C:\ProgramData\SGU\Branding\Set-SguWelcomeWallpaper.ps1', [string]$WelcomeWallpaperBasePath = 'C:\ProgramData\SGU\Branding\darkblue.jpg', + [string]$WelcomeAdministrativeWallpaperBasePath = 'C:\ProgramData\SGU\Branding\darkgray-administrative.png', + [string]$WelcomeProfessorWallpaperBasePath = 'C:\ProgramData\SGU\Branding\darkred-professor.png', [string]$WelcomeLockScreenBasePath = 'C:\ProgramData\SGU\Branding\darkblue-lockscreen.jpg' ) @@ -83,9 +85,11 @@ $personalizationPolicyKey = 'HKLM\Software\Policies\Microsoft\Windows\Personaliz $personalizationCspKey = 'HKLM\Software\Microsoft\Windows\CurrentVersion\PersonalizationCSP' $cloudContentPolicyKey = 'HKLM\Software\Policies\Microsoft\Windows\CloudContent' $edgePolicyKey = 'HKLM\Software\Policies\Microsoft\Edge' +$workstationUserPolicyKey = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System' +$desktopUserPolicyKey = 'HKCU\Software\Policies\Microsoft\Windows\Control Panel\Desktop' $providerClassId = '{D789CFD8-5AD4-489F-9B83-7EB5D9D09335}' -$welcomeWallpaperCommand = 'powershell.exe -NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File "{0}" -BaseImagePath "{1}"' -f ` - $WelcomeWallpaperScriptPath,$WelcomeWallpaperBasePath +$welcomeWallpaperCommand = 'powershell.exe -NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File "{0}" -BaseImagePath "{1}" -AdministrativeBaseImagePath "{2}" -ProfessorBaseImagePath "{3}"' -f ` + $WelcomeWallpaperScriptPath,$WelcomeWallpaperBasePath,$WelcomeAdministrativeWallpaperBasePath,$WelcomeProfessorWallpaperBasePath $policies = @( @{ Key = $dataCollectionKey; Name = 'AllowTelemetry'; Type = 'DWord'; Value = 0 }, @{ Key = $dataCollectionKey; Name = 'DisableTelemetryOptInSettingsUx'; Type = 'DWord'; Value = 1 }, @@ -131,7 +135,14 @@ $policies = @( # personal browser profiles, or Microsoft cloud synchronization. @{ Key = $edgePolicyKey; Name = 'HideFirstRunExperience'; Type = 'DWord'; Value = 1 }, @{ Key = $edgePolicyKey; Name = 'BrowserSignin'; Type = 'DWord'; Value = 0 }, - @{ Key = $edgePolicyKey; Name = 'SyncDisabled'; Type = 'DWord'; Value = 1 } + @{ Key = $edgePolicyKey; Name = 'SyncDisabled'; Type = 'DWord'; Value = 1 }, + + # User policy is evaluated through the computer-scoped loopback policy in + # Set-SguLaboratorioWallpaperPolicy.ps1. Keep this authoritative copy in + # the primary client GPO as well so every managed lab workstation has the + # same intent during recovery or when the wallpaper GPO is rebuilt. + @{ Key = $workstationUserPolicyKey; Name = 'DisableLockWorkstation'; Type = 'DWord'; Value = 1 }, + @{ Key = $desktopUserPolicyKey; Name = 'ScreenSaveActive'; Type = 'String'; Value = '0' } ) $powerSettingIds = @( @@ -184,6 +195,8 @@ $linkEnabled = $link -and ( PolicyCount = $configuredPolicies.Count EventCollector = $EventCollectorFqdn WelcomeWallpaperCommand = $welcomeWallpaperCommand + WelcomeAdministrativeWallpaper = $WelcomeAdministrativeWallpaperBasePath + WelcomeProfessorWallpaper = $WelcomeProfessorWallpaperBasePath LockScreenImage = $WelcomeLockScreenBasePath Policies = [pscustomobject]$configuredPolicies } diff --git a/scripts/Set-SguLaboratorioWallpaperPolicy.ps1 b/scripts/Set-SguLaboratorioWallpaperPolicy.ps1 index 738737e..d478c42 100644 --- a/scripts/Set-SguLaboratorioWallpaperPolicy.ps1 +++ b/scripts/Set-SguLaboratorioWallpaperPolicy.ps1 @@ -25,14 +25,17 @@ if ($gpo) { } else { $gpo = New-GPO -Name $GpoName -Domain $domainName -Server $DomainController ` - -Comment 'Protects the SGU desktop wallpaper on Laboratorio computers and child OUs; loopback Merge preserves existing user policies.' + -Comment 'Protects the SGU desktop wallpaper and prevents workstation locking for every user on Laboratorio computers and child OUs; loopback Merge preserves existing user policies.' } - -# These are user policies scoped by the computer OU, not by the user OU. +# These are user policies scoped by the computer OU, not by the user OU. The +# enforced loopback GPO therefore applies to local accounts such as .\ing as +# well as domain accounts that log on to a managed laboratory machine. # Match the per-user/per-computer output of Set-SguWelcomeWallpaper.ps1. $settings = @( @{ Key = 'HKLM\Software\Policies\Microsoft\Windows\System'; Name = 'UserPolicyMode'; Type = 'DWord'; Value = 1 }, @{ Key = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\ActiveDesktop'; Name = 'NoChangingWallPaper'; Type = 'DWord'; Value = 1 }, + @{ Key = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'; Name = 'DisableLockWorkstation'; Type = 'DWord'; Value = 1 }, + @{ Key = 'HKCU\Software\Policies\Microsoft\Windows\Control Panel\Desktop'; Name = 'ScreenSaveActive'; Type = 'String'; Value = '0' }, @{ Key = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'; Name = 'Wallpaper'; Type = 'ExpandString'; Value = $WallpaperPath }, @{ Key = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'; Name = 'WallpaperStyle'; Type = 'String'; Value = '10' } ) @@ -70,6 +73,7 @@ foreach ($setting in $settings) { TargetOuDn = $TargetOuDn WallpaperPath = $WallpaperPath Loopback = 'Merge' + DisableLockWorkstationForAllUsers = $true Enforced = $true BackupPath = $backupPath } diff --git a/scripts/Set-SguWelcomeWallpaper.ps1 b/scripts/Set-SguWelcomeWallpaper.ps1 index 5555c6b..add9df3 100644 --- a/scripts/Set-SguWelcomeWallpaper.ps1 +++ b/scripts/Set-SguWelcomeWallpaper.ps1 @@ -2,6 +2,8 @@ [CmdletBinding()] param( [string]$BaseImagePath = (Join-Path $env:ProgramData 'SGU\Branding\darkblue.jpg'), + [string]$AdministrativeBaseImagePath = (Join-Path $env:ProgramData 'SGU\Branding\darkgray-administrative.png'), + [string]$ProfessorBaseImagePath = (Join-Path $env:ProgramData 'SGU\Branding\darkred-professor.png'), [string]$FontsPath = (Join-Path $env:ProgramData 'SGU\Branding\fonts'), [string]$OutputPath, [string]$DisplayName, @@ -10,6 +12,8 @@ param( [string]$OrganizationalUnit, [ValidateSet('Male', 'Female')] [string]$Gender, + [ValidateSet('Administrative', 'Professor')] + [string]$InstitutionalRole, [ValidateRange(640, 16384)] [int]$CanvasWidth, [ValidateRange(480, 16384)] @@ -249,6 +253,92 @@ function Get-WelcomeHeading { } } +function Get-SguSessionInstitutionalRole { + # The role comes from the logon token rather than a directory query. That + # keeps the correct institutional base available when a domain controller + # is temporarily unavailable after an interactive sign-in. + try { + $identity = [Security.Principal.WindowsIdentity]::GetCurrent() + $roles = @() + foreach ($groupSid in @($identity.Groups)) { + try { + $accountName = [string]$groupSid.Translate([Security.Principal.NTAccount]).Value + $groupName = ($accountName -split '\\')[-1] + if ([string]::Equals($groupName, 'SGU-Administrativos', [StringComparison]::OrdinalIgnoreCase)) { + $roles += 'Administrative' + } + elseif ([string]::Equals($groupName, 'SGU-Docentes', [StringComparison]::OrdinalIgnoreCase)) { + $roles += 'Professor' + } + } + catch { + # A stale or unresolved SID must not prevent desktop startup. + } + } + $roles = @($roles | Select-Object -Unique) + if ($roles.Count -eq 1) { + return [string]$roles[0] + } + if ($roles.Count -gt 1) { + Write-WelcomeLog -Message 'WARN Multiple SGU role groups were present; using the neutral desktop base.' + } + } + catch { + Write-WelcomeLog -Message ('WARN SGU role lookup was unavailable: ' + $_.Exception.Message) + } + return $null +} + +function Resolve-SguWelcomeBaseImage { + param( + [Parameter(Mandatory)][string]$DefaultPath, + [string]$AdministrativePath, + [string]$ProfessorPath, + [string]$Role + ) + + $rolePath = switch ($Role) { + 'Administrative' { $AdministrativePath; break } + 'Professor' { $ProfessorPath; break } + default { $null } + } + if ($rolePath -and (Test-Path -LiteralPath $rolePath -PathType Leaf)) { + return $rolePath + } + if ($rolePath) { + Write-WelcomeLog -Message ("WARN The {0} wallpaper base is missing; using the neutral base." -f $Role) + } + return $DefaultPath +} + +function Get-SguWelcomePalette { + param([string]$Role) + + switch ($Role) { + 'Professor' { + return [pscustomobject]@{ + Panel = [Drawing.Color]::FromArgb(82, 45, 0, 9) + Accent = [Drawing.Color]::FromArgb(255, 255, 226, 232) + Line = [Drawing.Color]::FromArgb(160, 255, 226, 232) + } + } + 'Administrative' { + return [pscustomobject]@{ + Panel = [Drawing.Color]::FromArgb(82, 8, 8, 8) + Accent = [Drawing.Color]::FromArgb(255, 238, 238, 238) + Line = [Drawing.Color]::FromArgb(160, 238, 238, 238) + } + } + default { + return [pscustomobject]@{ + Panel = [Drawing.Color]::FromArgb(72, 0, 13, 58) + Accent = [Drawing.Color]::FromArgb(255, 211, 226, 255) + Line = [Drawing.Color]::FromArgb(155, 211, 226, 255) + } + } + } +} + function Get-AvailableFontFamily { param( [Parameter(Mandatory)][string[]]$Candidates, @@ -311,10 +401,6 @@ trap { throw } -if (-not (Test-Path -LiteralPath $BaseImagePath -PathType Leaf)) { - throw "The welcome wallpaper base image does not exist: $BaseImagePath" -} - $userName = [Environment]::UserName $metadata = $null $machineLocation = [Environment]::GetEnvironmentVariable('SGU_WELCOME_LOCATION', 'Machine') @@ -340,6 +426,22 @@ if (-not $PSBoundParameters.ContainsKey('DisplayName')) { if (-not $DisplayName) { $DisplayName = $userName } +if (-not $PSBoundParameters.ContainsKey('InstitutionalRole')) { + $detectedInstitutionalRole = Get-SguSessionInstitutionalRole + # Like Gender, InstitutionalRole is ValidateSet-bound. Do not assign a + # missing token role because PowerShell validates even an explicit $null. + if ($detectedInstitutionalRole -in @('Administrative', 'Professor')) { + $InstitutionalRole = $detectedInstitutionalRole + } +} +$selectedBaseImagePath = Resolve-SguWelcomeBaseImage ` + -DefaultPath $BaseImagePath ` + -AdministrativePath $AdministrativeBaseImagePath ` + -ProfessorPath $ProfessorBaseImagePath ` + -Role $InstitutionalRole +if (-not (Test-Path -LiteralPath $selectedBaseImagePath -PathType Leaf)) { + throw "The welcome wallpaper base image does not exist: $selectedBaseImagePath" +} if (-not $PSBoundParameters.ContainsKey('Location')) { $Location = if ($machineLocation) { $machineLocation } elseif ($metadata) { $metadata.Location } else { $null } } @@ -386,7 +488,7 @@ if (-not $OutputPath) { } New-Item -ItemType Directory -Path (Split-Path $OutputPath -Parent) -Force | Out-Null -$source = [Drawing.Image]::FromFile($BaseImagePath) +$source = [Drawing.Image]::FromFile($selectedBaseImagePath) $canvas = [Drawing.Bitmap]::new($CanvasWidth, $CanvasHeight, [Drawing.Imaging.PixelFormat]::Format24bppRgb) try { $graphics = [Drawing.Graphics]::FromImage($canvas) @@ -424,10 +526,11 @@ try { $panelHeight = [single](310 * $scale) $panelX = [single](($CanvasWidth - $panelWidth) / 2) $panelY = [single]($CanvasHeight * 0.50 - ($panelHeight / 2)) - $panelBrush = [Drawing.SolidBrush]::new([Drawing.Color]::FromArgb(72, 0, 13, 58)) + $palette = Get-SguWelcomePalette -Role $InstitutionalRole + $panelBrush = [Drawing.SolidBrush]::new($palette.Panel) $whiteBrush = [Drawing.SolidBrush]::new([Drawing.Color]::White) - $accentBrush = [Drawing.SolidBrush]::new([Drawing.Color]::FromArgb(255, 211, 226, 255)) - $linePen = [Drawing.Pen]::new([Drawing.Color]::FromArgb(155, 211, 226, 255), [single](2 * $scale)) + $accentBrush = [Drawing.SolidBrush]::new($palette.Accent) + $linePen = [Drawing.Pen]::new($palette.Line, [single](2 * $scale)) $privateFonts = [Drawing.Text.PrivateFontCollection]::new() if (Test-Path -LiteralPath $FontsPath -PathType Container) { foreach ($fontFile in Get-ChildItem -LiteralPath $FontsPath -File | @@ -536,13 +639,16 @@ namespace Sgu { } $genderLogValue = if ($Gender) { $Gender } else { 'Neutral' } -Write-WelcomeLog -Message ("OK computer={0}; gender={1}; location={2}; ou={3}; output={4}" -f $ComputerName,$genderLogValue,[bool]$Location,[bool]$OrganizationalUnit,$OutputPath) +$roleLogValue = if ($InstitutionalRole) { $InstitutionalRole } else { 'Neutral' } +Write-WelcomeLog -Message ("OK computer={0}; gender={1}; role={2}; location={3}; ou={4}; output={5}" -f $ComputerName,$genderLogValue,$roleLogValue,[bool]$Location,[bool]$OrganizationalUnit,$OutputPath) [pscustomobject]@{ DisplayName = $DisplayName ComputerName = $ComputerName Location = $Location OrganizationalUnit = $OrganizationalUnit Gender = $Gender + InstitutionalRole = $InstitutionalRole + BaseImagePath = $selectedBaseImagePath WelcomeHeading = $welcomeHeading LocationText = $locationText LocationPrimaryText = $locationPrimaryText diff --git a/scripts/Set-SguWelcomeWallpaper.sh b/scripts/Set-SguWelcomeWallpaper.sh index b2ecccc..7f3a316 100644 --- a/scripts/Set-SguWelcomeWallpaper.sh +++ b/scripts/Set-SguWelcomeWallpaper.sh @@ -8,6 +8,8 @@ set -uo pipefail CONFIG_PATH=${SGU_WELCOME_CONFIG:-/etc/sgu/welcome-wallpaper.conf} INSTALL_ROOT=${SGU_WELCOME_ROOT:-/usr/local/lib/sgu-welcome-wallpaper} BASE_IMAGE=${SGU_WELCOME_BASE_IMAGE:-${INSTALL_ROOT}/darkblue.jpg} +ADMINISTRATIVE_BASE_IMAGE=${SGU_WELCOME_ADMINISTRATIVE_BASE_IMAGE:-${INSTALL_ROOT}/darkgray-administrative.png} +PROFESSOR_BASE_IMAGE=${SGU_WELCOME_PROFESSOR_BASE_IMAGE:-${INSTALL_ROOT}/darkred-professor.png} if [[ -r $CONFIG_PATH ]]; then # The root-owned file contains only deployment metadata, never credentials. @@ -32,8 +34,6 @@ fail_softly() { exit 0 } -[[ -r $BASE_IMAGE ]] || fail_softly "Missing base image: $BASE_IMAGE" - if command -v magick >/dev/null 2>&1; then image_command=(magick) elif command -v convert >/dev/null 2>&1; then @@ -48,6 +48,40 @@ account_name=${account_name##*\\} display_name=$(getent passwd "$raw_user" 2>/dev/null | awk -F: 'NR == 1 { split($5,a,","); print a[1] }') [[ -n $display_name ]] || display_name=$account_name +# The SSSD/PAM token carries the institutional role at logon. Select the +# branded base without a second directory request; AL and unknown accounts +# intentionally retain the standard blue image. +institutional_role='' +session_groups=$(id -nG "$raw_user" 2>/dev/null || id -nG 2>/dev/null || true) +administrative_group=false +professor_group=false +for group in $session_groups; do + group=${group##*\\} + group=${group%@*} + case "${group,,}" in + sgu-administrativos) administrative_group=true ;; + sgu-docentes) professor_group=true ;; + esac +done +if [[ $administrative_group == true && $professor_group == false ]]; then + institutional_role='Administrative' + if [[ -r $ADMINISTRATIVE_BASE_IMAGE ]]; then + BASE_IMAGE=$ADMINISTRATIVE_BASE_IMAGE + else + log_message 'WARN Administrative wallpaper base is missing; using the neutral base.' + fi +elif [[ $professor_group == true && $administrative_group == false ]]; then + institutional_role='Professor' + if [[ -r $PROFESSOR_BASE_IMAGE ]]; then + BASE_IMAGE=$PROFESSOR_BASE_IMAGE + else + log_message 'WARN Professor wallpaper base is missing; using the neutral base.' + fi +elif [[ $administrative_group == true || $professor_group == true ]]; then + log_message 'WARN Multiple SGU role groups were present; using the neutral desktop base.' +fi +[[ -r $BASE_IMAGE ]] || fail_softly "Missing base image: $BASE_IMAGE" + computer_name=$(hostname -s 2>/dev/null || true) computer_name=${computer_name^^} location='' @@ -264,23 +298,35 @@ if [[ $serif_font == DejaVu-Serif ]] && command -v fc-list >/dev/null 2>&1; then fi fi +panel_fill='rgba(0,13,58,0.30)' +accent_color='#D3E2FF' +case "$institutional_role" in + Professor) + panel_fill='rgba(45,0,9,0.38)' + accent_color='#FFE2E8' + ;; + Administrative) + panel_fill='rgba(8,8,8,0.38)' + accent_color='#EEEEEE' + ;; +esac location_annotations=( -font "$sans_font" -weight 400 -style Normal -pointsize "$location_size" - -fill '#D3E2FF' -stroke none -annotate "+0+$(( 76 * scale / 100 ))" "$location_primary" + -fill "$accent_color" -stroke none -annotate "+0+$(( 76 * scale / 100 ))" "$location_primary" ) if [[ -n $location_secondary ]]; then location_annotations+=( -font "$sans_font" -weight 400 -style Normal -pointsize "$location_secondary_size" - -fill '#D3E2FF' -stroke none -annotate "+0+$(( 116 * scale / 100 ))" "$location_secondary" + -fill "$accent_color" -stroke none -annotate "+0+$(( 116 * scale / 100 ))" "$location_secondary" ) fi if ! "${image_command[@]}" "$BASE_IMAGE" \ -resize "${width}x${height}^" -gravity center -extent "${width}x${height}" \ - -fill 'rgba(0,13,58,0.30)' -draw "rectangle ${panel_x1},${panel_y1} ${panel_x2},${panel_y2}" \ + -fill "$panel_fill" -draw "rectangle ${panel_x1},${panel_y1} ${panel_x2},${panel_y2}" \ -gravity center \ -font "$sans_font" -weight 700 -style Normal -pointsize "$welcome_size" \ - -fill '#D3E2FF' -stroke 'rgba(0,0,0,0.48)' -strokewidth 1 \ + -fill "$accent_color" -stroke 'rgba(0,0,0,0.48)' -strokewidth 1 \ -annotate "+0-$(( 92 * scale / 100 ))" "$welcome_text" \ -font "$serif_font" -weight 700 -style Italic -pointsize "$name_size" \ -fill white -annotate "+0-$(( 22 * scale / 100 ))" "$display_name" \ @@ -312,7 +358,7 @@ if [[ $applied == false ]] && command -v xfconf-query >/dev/null 2>&1; then fi if [[ $applied == true ]]; then - log_message "OK computer=${computer_name}; gender=${gender:-Neutral}; location=$([[ -n $location ]] && printf true || printf false); ou=$([[ -n $organizational_unit ]] && printf true || printf false); output=${output_path}" + log_message "OK computer=${computer_name}; gender=${gender:-Neutral}; role=${institutional_role:-Neutral}; location=$([[ -n $location ]] && printf true || printf false); ou=$([[ -n $organizational_unit ]] && printf true || printf false); output=${output_path}" else log_message 'WARN Wallpaper rendered, but no supported desktop background API was found.' fi diff --git a/tests/ClientEnrollmentScripts.Tests.ps1 b/tests/ClientEnrollmentScripts.Tests.ps1 index bc94526..afc48e4 100644 --- a/tests/ClientEnrollmentScripts.Tests.ps1 +++ b/tests/ClientEnrollmentScripts.Tests.ps1 @@ -94,4 +94,17 @@ Describe 'SGU Windows client enrollment scripts' { $policySource | Should Match "LockScreenImagePath.*WelcomeLockScreenBasePath" $policySource | Should Match "LockScreenImageUrl.*WelcomeLockScreenBasePath" } + + It 'ships all role-specific wallpaper bases and passes them to the per-logon renderer' { + $installerSource = Get-Content -LiteralPath $credentialProviderInstallerPath -Raw + $policySource = Get-Content -LiteralPath $computerPolicyScriptPath -Raw + $packageSource = Get-Content -LiteralPath $packageScriptPath -Raw + foreach ($assetName in 'darkgray-administrative.png','darkred-professor.png') { + Test-Path -LiteralPath (Join-Path $repositoryRoot "assets\branding\$assetName") -PathType Leaf | Should Be $true + $installerSource | Should Match ([regex]::Escape($assetName)) + $packageSource | Should Match ([regex]::Escape($assetName)) + } + $policySource | Should Match 'AdministrativeBaseImagePath' + $policySource | Should Match 'ProfessorBaseImagePath' + } } diff --git a/tests/LaboratorioWallpaperPolicy.Tests.ps1 b/tests/LaboratorioWallpaperPolicy.Tests.ps1 index e9098e9..5a505c9 100644 --- a/tests/LaboratorioWallpaperPolicy.Tests.ps1 +++ b/tests/LaboratorioWallpaperPolicy.Tests.ps1 @@ -22,6 +22,12 @@ Describe 'Laboratorio wallpaper policy packaging and scope' { $policySource | Should Match ([regex]::Escape('%LOCALAPPDATA%\SGU\Wallpapers\welcome-%COMPUTERNAME%.jpg')) $policySource | Should Match "Name = 'Wallpaper'; Type = 'ExpandString'" } + It 'prevents every local or domain user on a laboratory machine from locking it' { + $policySource | Should Match "Name = 'DisableLockWorkstation'; Type = 'DWord'; Value = 1" + $policySource | Should Match "Name = 'ScreenSaveActive'; Type = 'String'; Value = '0'" + $policySource | Should Match 'local accounts such as \.\\ing' + $policySource | Should Match 'DisableLockWorkstationForAllUsers = \$true' + } It 'reuses and backs up an existing GPO and verifies the result' { foreach ($command in @('Get-GPO', 'Backup-GPO', 'Set-GPLink', 'New-GPLink', 'Get-GPRegistryValue')) { $policySource | Should Match ([regex]::Escape($command)) diff --git a/tests/WelcomeWallpaper.Tests.ps1 b/tests/WelcomeWallpaper.Tests.ps1 index 75f3a39..3032d68 100644 --- a/tests/WelcomeWallpaper.Tests.ps1 +++ b/tests/WelcomeWallpaper.Tests.ps1 @@ -18,7 +18,8 @@ function Invoke-WelcomeFixture { [string]$DirectoryLocation = 'Sala de pruebas', [string]$DirectoryOu = 'Laboratorio', [string]$MachineLocation, - [string]$MachineOu + [string]$MachineOu, + [string]$InstitutionalRole ) # Replace only the external directory lookup. Execute the actual script, @@ -37,6 +38,8 @@ function Invoke-WelcomeFixture { [IO.File]::WriteAllText($testScript, $fixtureSource, [Text.UTF8Encoding]::new($false)) $parameters = @{ BaseImagePath = Join-Path $repositoryRoot 'assets\branding\darkblue.jpg' + AdministrativeBaseImagePath = Join-Path $repositoryRoot 'assets\branding\darkgray-administrative.png' + ProfessorBaseImagePath = Join-Path $repositoryRoot 'assets\branding\darkred-professor.png' FontsPath = Join-Path $repositoryRoot 'assets\branding\fonts' OutputPath = Join-Path $TestDrive ([IO.Path]::GetFileNameWithoutExtension($testScript) + '.jpg') CanvasWidth = 640 @@ -44,6 +47,7 @@ function Invoke-WelcomeFixture { SkipApply = $true } if ($ExplicitGender) { $parameters.Gender = $ExplicitGender } + if ($InstitutionalRole) { $parameters.InstitutionalRole = $InstitutionalRole } $previousLocalAppData = $env:LOCALAPPDATA $previousMachineLocation = $env:SGU_WELCOME_LOCATION $previousMachineOu = $env:SGU_WELCOME_ORGANIZATIONAL_UNIT @@ -81,6 +85,18 @@ Describe 'Welcome wallpaper with AD metadata' { (Invoke-WelcomeFixture -DirectoryGender 'Male').WelcomeHeading | Should Be 'Bienvenido,' } + It 'uses role-specific desktop bases while keeping unclassified users blue' { + $administrative = Invoke-WelcomeFixture -DirectoryGender $null -InstitutionalRole 'Administrative' + $professor = Invoke-WelcomeFixture -DirectoryGender $null -InstitutionalRole 'Professor' + $unclassified = Invoke-WelcomeFixture -DirectoryGender $null + + $administrative.BaseImagePath | Should Be (Join-Path $repositoryRoot 'assets\branding\darkgray-administrative.png') + $administrative.InstitutionalRole | Should Be 'Administrative' + $professor.BaseImagePath | Should Be (Join-Path $repositoryRoot 'assets\branding\darkred-professor.png') + $professor.InstitutionalRole | Should Be 'Professor' + $unclassified.BaseImagePath | Should Be (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') + } + It 'honors an explicit gender over directory metadata' { (Invoke-WelcomeFixture -DirectoryGender 'Female' -ExplicitGender 'Male').WelcomeHeading | Should Be 'Bienvenido,' } @@ -153,6 +169,33 @@ Describe 'Welcome wallpaper with AD metadata' { } } + It 'ships the administrative gray and professor red branded bases' { + foreach ($assetName in 'darkgray-administrative.png','darkred-professor.png') { + $assetPath = Join-Path $repositoryRoot "assets\branding\$assetName" + Test-Path -LiteralPath $assetPath -PathType Leaf | Should Be $true + $bitmap = [Drawing.Bitmap]::FromFile($assetPath) + try { + # Image generation may preserve the 16:10 composition with a + # slightly different absolute raster size. The renderer crops + # to the active display, so the invariant is the aspect ratio. + ([Math]::Round($bitmap.Width / $bitmap.Height, 2)) | Should Be 1.6 + $lowerRightWhitePixels = 0 + for ($x = 1260; $x -lt 1510; $x += 2) { + for ($y = 740; $y -lt 860; $y += 2) { + $pixel = $bitmap.GetPixel($x, $y) + if ($pixel.R -gt 220 -and $pixel.G -gt 220 -and $pixel.B -gt 220) { + $lowerRightWhitePixels++ + } + } + } + ($lowerRightWhitePixels -gt 250) | Should Be $true + } + finally { $bitmap.Dispose() } + } + $source | Should Match 'SGU-Administrativos' + $source | Should Match 'SGU-Docentes' + } + It 'keeps the lock screen base free of the desktop logo' { $bitmap = [Drawing.Bitmap]::FromFile((Join-Path $repositoryRoot 'assets\branding\darkblue-lockscreen.jpg')) try {