Compare commits

..
8 Commits
42 changed files with 1297 additions and 233 deletions

No files matched your search

+7 -6
View File
@@ -61,7 +61,7 @@ Operational documentation:
- [Self-hosted RustDesk server and managed Windows remote access](docs/rustdesk-operations.md) - [Self-hosted RustDesk server and managed Windows remote access](docs/rustdesk-operations.md)
- [Domain monitoring, usage reports, and six-month retention](docs/monitoring.md) - [Domain monitoring, usage reports, and six-month retention](docs/monitoring.md)
- [Laboratorio desktop wallpaper protection](docs/laboratorio-wallpaper-policy.md) - [Laboratorio desktop wallpaper protection](docs/laboratorio-wallpaper-policy.md)
- [Azure user roaming by role with Azure Files and FSLogix](docs/user-roaming.md) - [Optional Azure user roaming by role with Azure Files and FSLogix](docs/user-roaming.md)
- [Decision: do not persist password verifiers in Redis](docs/decisions/0001-no-password-cache.md) - [Decision: do not persist password verifiers in Redis](docs/decisions/0001-no-password-cache.md)
| Prefix | Role | Default OU | Security group in the same OU | | Prefix | Role | Default OU | Security group in the same OU |
@@ -109,11 +109,12 @@ Follow [docs/lab-runbook.md](docs/lab-runbook.md). Review
For a public Azure VM, use For a public Azure VM, use
[docs/azure-vpn-deployment.md](docs/azure-vpn-deployment.md). It supports an [docs/azure-vpn-deployment.md](docs/azure-vpn-deployment.md). It supports an
optional Azure P2S gateway or direct enrollment restricted to explicit public optional Azure P2S gateway or direct enrollment restricted to explicit public
source CIDRs. P2S deployments also provision private Azure Files storage for source CIDRs. Every SGU role uses an ordinary local Windows profile by default:
role-based roaming: `AL` redirects only Documents/Desktop, while `AD` and `DO` Desktop and Documents stay under `C:\Users` and no profile share is mapped.
use an FSLogix VHDX profile after the post-domain setup step. Existing public Azure Files/FSLogix roaming remains available only as an experimental,
Azure Files deployments automatically use FSLogix Cloud Cache locally instead explicit opt-in that requires acknowledgement of its login, sign-out, storage,
of performing all profile I/O across WAN SMB. cache and recovery risks. See [docs/user-roaming.md](docs/user-roaming.md) for
the opt-in and rollback procedures.
Never disable the built-in Microsoft password Credential Provider. It is the Never disable the built-in Microsoft password Credential Provider. It is the
supported recovery path if a third-party provider fails to load. supported recovery path if a third-party provider fails to load.
Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

+33 -16
View File
@@ -62,6 +62,15 @@ plus six digits. It searches `BaseDn` by `sAMAccountName`, creates the user when
absent, moves it to the mapped OU when required, sets `userPrincipalName`, and absent, moves it to the mapped OU when required, sets `userPrincipalName`, and
passes the submitted password directly to ADSI `SetPassword`. passes the submitted password directly to ADSI `SetPassword`.
Before an account becomes usable, the broker applies explicit deny ACEs for the
Active Directory `Change Password` extended right to SELF and Everyone. Users
beneath `OU=Usuarios-SGU` therefore cannot replace the synchronized password
from Windows, Ctrl+Alt+Delete, LDAP or another client. The broker's
administrative `SetPassword` operation uses the separate `Reset Password` right
and remains able to synchronize the current institutional credential after each
successful SGU authentication. Repeated synchronizations detect the existing
ACEs and do not duplicate them.
When the authenticated HTML exposes recognized stable IDs, the broker also When the authenticated HTML exposes recognized stable IDs, the broker also
updates the applicable `displayName`, `givenName`, `sn`, `mail`, `title`, updates the applicable `displayName`, `givenName`, `sn`, `mail`, `title`,
`department`, `employeeType`, `employeeID`, `streetAddress`, `l`, `st`, and `department`, `employeeType`, `employeeID`, `streetAddress`, `l`, `st`, and
@@ -78,18 +87,20 @@ is deliberately left unset because the verified page does not expose it.
Missing metadata does not clear existing AD values and never changes the Missing metadata does not clear existing AD values and never changes the
password outcome. password outcome.
## Azure user roaming ## Optional Azure user roaming
Azure P2S deployments can add a dedicated, private Azure Files account. Student The default architecture uses local Windows profiles for every role. Desktop,
accounts (`AL`) keep a non-authoritative local profile and redirect only Documents and the remainder of the profile live under `C:\Users`; enrollment
Documents/Desktop. Administrative and professor accounts (`AD`/`DO`) receive an does not map a profile share and the domain GPO keeps FSLogix disabled.
FSLogix VHDX profile container through object-specific settings keyed to their
AD security-group SIDs. Private endpoints mount the VHDX directly; public WAN An experimental opt-in can add a dedicated Azure Files account. Student
endpoints use a local FSLogix Cloud Cache synchronized to Azure Files so profile accounts (`AL`) redirect only Documents/Desktop, while administrative and
I/O does not block on every SMB round trip. The storage account uses AD DS Kerberos with AES-256; professor accounts (`AD`/`DO`) receive an FSLogix VHDX profile container through
share-root ACLs use `CREATOR OWNER` so users cannot browse one another's data. object-specific settings. Enabling it is never implicit: both infrastructure
The bootstrap staging account is deliberately separate. See deployment and policy configuration require an explicit risk acknowledgement.
[user-roaming.md](user-roaming.md) for rollout and recovery constraints. The storage account uses AD DS Kerberos with AES-256 and share-root ACLs use
`CREATOR OWNER`. See [user-roaming.md](user-roaming.md) for the observed
sign-out/cache failure modes, staged rollout requirements and rollback.
Every synchronization also enforces one idempotent security-group membership Every synchronization also enforces one idempotent security-group membership
from the classified institutional prefix: `AL` to `SGU-Alumnos`, `AD` to from the classified institutional prefix: `AL` to `SGU-Alumnos`, `AD` to
@@ -132,11 +143,17 @@ synthetic Windows account to imitate that title or ordering.
The managed hierarchy is rooted at `OU=Usuarios-SGU`: `Docentes`, `Alumnos`, The managed hierarchy is rooted at `OU=Usuarios-SGU`: `Docentes`, `Alumnos`,
and `Administrativos` are direct child OUs beneath it. The domain GPO and `Administrativos` are direct child OUs beneath it. The domain GPO
`SGU - User session restrictions` is linked to this root and enables the `SGU - User session restrictions` is linked to this root and enables the
per-user `DisableLockWorkstation` policy and disables screen savers for the per-user `DisableLockWorkstation` and `DisableChangePassword` policies and
complete hierarchy. The computer GPO `SGU - Windows client experience` is linked disables screen savers for the complete hierarchy. The enforced laboratory
to `OU=Laboratorio`; it suppresses first-logon/privacy/diagnostic prompts, loopback GPO also applies `DisableLockWorkstation` and disables screen savers
disables location, and enforces always-on display, sleep, and hibernation for every account that logs on to a laboratory computer, including local
settings for managed clients. 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
same computer GPO configures Edge with `HideFirstRunExperience=1`,
`BrowserSignin=0`, and `SyncDisabled=1`, so shared machines do not show consumer
onboarding or permit personal browser sign-in and cloud synchronization.
That computer GPO also owns the base lock-screen image and a per-logon command That computer GPO also owns the base lock-screen image and a per-logon command
for the personalized desktop wallpaper. The client-side renderer reads the for the personalized desktop wallpaper. The client-side renderer reads the
+12 -9
View File
@@ -14,8 +14,8 @@ La plantilla crea:
- VPN Gateway opcional `VpnGw1AZ` con IKEv2/OpenVPN y autenticación por certificados; - VPN Gateway opcional `VpnGw1AZ` con IKEv2/OpenVPN y autenticación por certificados;
- pool P2S `172.30.0.0/24`, autorizado en los firewalls SGU; - pool P2S `172.30.0.0/24`, autorizado en los firewalls SGU;
- DNS de la NIC del servidor apuntando a `10.77.0.4`; - DNS de la NIC del servidor apuntando a `10.77.0.4`;
- Azure Files privado para user roaming: `AL` conserva sólo Escritorio/Documentos - perfiles locales para todos los usuarios por omisión; Azure Files/FSLogix es
y `AD`/`DO` usa contenedores de perfil FSLogix. una característica opcional que debe habilitarse y aceptarse explícitamente.
Los prefijos privados deben ser RFC1918 y no deben solaparse con las redes usadas Los prefijos privados deben ser RFC1918 y no deben solaparse con las redes usadas
por Hyper-V, el `Default Switch`, Wi-Fi o Ethernet locales. Los prefijos de por Hyper-V, el `Default Switch`, Wi-Fi o Ethernet locales. Los prefijos de
@@ -84,9 +84,10 @@ pública actual:
No utilice `0.0.0.0/0`. El despliegue de un VPN Gateway suele tardar bastante No utilice `0.0.0.0/0`. El despliegue de un VPN Gateway suele tardar bastante
más que la VM; omitirlo reduce tiempo y costo. El comando espera hasta que Azure más que la VM; omitirlo reduce tiempo y costo. El comando espera hasta que Azure
entregue un resultado final. User roaming se crea por omisión y requiere la ruta entregue un resultado final. User roaming está desactivado por omisión. Sólo se
privada del P2S; para un despliegue de enrolamiento público directo indique provisiona al indicar juntos `-DeployUserRoaming $true` y
`-DeployUserRoaming $false`. `-AcknowledgeUserRoamingRisks`, después de revisar
[sus riesgos y recuperación](user-roaming.md).
## 3. Conectarse al servidor ## 3. Conectarse al servidor
@@ -141,10 +142,12 @@ El JSON debe indicar `NetworkConfigurationMode = PlatformManaged`, el pool P2S
en `TrustedClientNetworks` cuando exista VPN y los CIDR directos en en `TrustedClientNetworks` cuando exista VPN y los CIDR directos en
`PublicEnrollmentNetworks` cuando se hayan habilitado. `PublicEnrollmentNetworks` cuando se hayan habilitado.
Después de terminar la promoción, una Azure Files al nuevo bosque y publique Después de terminar la promoción no se necesita ninguna acción de perfiles: las
las políticas por rol con `Enable-SguAzureUserRoaming.ps1`. Esta segunda fase cuentas usarán archivos locales. Si se decide realizar un piloto explícito de
requiere Azure PowerShell y el módulo oficial AzFilesHybrid porque el SID y GUID Azure Files, publique las políticas ejecutando
del bosque todavía no existen durante el despliegue Bicep. Consulte `Enable-SguAzureUserRoaming.ps1` con `-AcknowledgeUserRoamingRisks`. Esa fase opcional requiere Azure PowerShell y el
módulo oficial AzFilesHybrid porque el SID y GUID del bosque todavía no existen
durante el despliegue Bicep. Consulte
[user roaming por rol en Azure](user-roaming.md). [user roaming por rol en Azure](user-roaming.md).
## 5. Enrolar cada VM Hyper-V ## 5. Enrolar cada VM Hyper-V
+3 -1
View File
@@ -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 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 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). [welcome-wallpaper.md](welcome-wallpaper.md).
`HideEULAPage` no forma parte de esta GPO: es una opción de archivo Unattend para `HideEULAPage` no forma parte de esta GPO: es una opción de archivo Unattend para
+11 -4
View File
@@ -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 El bootstrap de servidor publica `SGU - Laboratorio wallpaper protection` en
`OU=Laboratorio` y sus OU hijas. Para actualizar un dominio existente sin volver `OU=Laboratorio` y sus OU hijas. Además de proteger el fondo, impide bloquear
a ejecutar el bootstrap, ejecute en el DC con permisos para administrar GPO: 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 ```powershell
.\scripts\Set-SguLaboratorioWallpaperPolicy.ps1 ` .\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. 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 - 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. - `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: - `Wallpaper` fija el archivo generado por SGU:
`%LOCALAPPDATA%\SGU\Wallpapers\welcome-%COMPUTERNAME%.jpg`, con estilo Fill. `%LOCALAPPDATA%\SGU\Wallpapers\welcome-%COMPUTERNAME%.jpg`, con estilo Fill.
+16
View File
@@ -0,0 +1,16 @@
# SGU Credential Provider 0.6.10
Esta versión administra Microsoft Edge en los equipos Windows del laboratorio.
- `HideFirstRunExperience=1` omite la experiencia de primera ejecución y la
pantalla de presentación.
- `BrowserSignin=0` impide iniciar sesión en Edge con cuentas personales o de
organización.
- `SyncDisabled=1` deshabilita Microsoft Sync y su solicitud de consentimiento.
- Las tres configuraciones se publican como valores obligatorios de equipo en
`SGU - Windows client experience`, vinculada a `OU=Laboratorio`.
Las directivas se escriben directamente en
`HKLM\Software\Policies\Microsoft\Edge`; las plantillas `MSEdge.admx` sólo son
necesarias para editarlas mediante la interfaz de Administrative Templates, no
para su aplicación.
+25
View File
@@ -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.
+27
View File
@@ -0,0 +1,27 @@
# SGU Credential Provider 0.6.4
Esta versión revierte el despliegue de perfiles móviles y deja los perfiles
locales como comportamiento predeterminado para todo el dominio SGU.
## Cambio operativo
- `AL`, `AD`, `DO` y cualquier otra cuenta usan un perfil local bajo `C:\Users`.
- Escritorio y Documentos vuelven a las rutas locales del usuario.
- No se configura `profilePath`, `homeDirectory` ni `homeDrive` en Active Directory.
- Las políticas deshabilitan FSLogix Profiles, ODFC, `frxsvc` y `frxccds`.
- El enlace de instalación automática de FSLogix queda deshabilitado.
- Los recursos Azure Files existentes no se destruyen y pueden conservarse para
recuperación o para un piloto futuro.
## Herramientas
`Disable-SguAzureUserRoaming.ps1` aplica el rollback idempotente en el dominio.
`Deploy-SguAzureInfrastructure.ps1` y Bicep usan
`DeployUserRoaming=false` por omisión. Tanto el aprovisionamiento como la
publicación de políticas exigen `AcknowledgeUserRoamingRisks` para volver a
activar la función opcional.
La documentación registra los tiempos prolongados de inicio/cierre, estados
pendientes de VHDX, caché obsoleta y recuperación mediante reinicio observados
durante el piloto. User roaming se considera experimental y nunca se habilita de
forma implícita.
+26
View File
@@ -0,0 +1,26 @@
# SGU Credential Provider 0.6.5
Esta versión actualiza los fondos de bienvenida de Windows y Linux sin agregar
dependencias ni trabajo de composición durante el inicio de sesión.
## Identidad visual
- El fondo base azul incorpora de forma permanente el logotipo blanco oficial
de Universidad La Salle México.
- El generador utiliza directamente ese JPEG: no abre, redimensiona ni compone
un segundo archivo de logotipo cada vez que inicia una sesión.
- Se conservan las dimensiones institucionales de `1600x1000` y el área central
disponible para el saludo personalizado.
## Texto de ubicación
- La sala aparece en una primera línea de mayor tamaño.
- La dependencia aparece debajo con una tipografía menor.
- La redacción neutral usa `Acceso a...`; cuando Active Directory contiene el
sexo enriquecido, usa `Estás ubicado...` o `Estás ubicada...`.
- La misma lógica está incluida en los enrolamientos de Windows y Linux.
- Si faltan el sexo o los metadatos de ubicación, permanecen los fallbacks
neutrales documentados y el inicio de sesión no se bloquea.
Los perfiles de usuario locales y el rollback de roaming introducido en 0.6.4
no cambian en esta versión.
+16
View File
@@ -0,0 +1,16 @@
# SGU Credential Provider 0.6.6
Esta versión ajusta la composición del fondo institucional introducido en
0.6.5.
- El logotipo blanco oficial de Universidad La Salle México queda integrado en
la esquina inferior derecha.
- Su tamaño se reduce ligeramente y se conserva un margen interior respecto de
ambos bordes para acercarlo visualmente al centro.
- El fondo original de `1600x1000`, el área central del saludo y la composición
dinámica de nombre y ubicación permanecen sin cambios.
- El generador sigue sin cargar ni componer un logotipo durante el inicio de
sesión.
No se modifican la autenticación, el enrolamiento, las políticas del dominio ni
el comportamiento de perfiles locales establecido en 0.6.4.
+17
View File
@@ -0,0 +1,17 @@
# SGU Credential Provider 0.6.7
Esta versión separa la imagen de la pantalla de bloqueo de la base utilizada
para generar el escritorio personalizado.
- `darkblue-lockscreen.jpg` contiene únicamente el fondo azul institucional,
sin logotipo ni datos personales.
- `darkblue.jpg` continúa como base del escritorio de cada sesión y conserva el
logotipo oficial integrado.
- El logo de escritorio se reduce nuevamente y se desplaza ligeramente hacia
arriba, sin interferir con el saludo central.
- El instalador, la GPO clásica, `PersonalizationCSP` y los paquetes de servidor
y cliente utilizan explícitamente el archivo correspondiente a cada función.
- Linux continúa usando sólo la base de escritorio personalizada.
No se modifican la autenticación, los perfiles locales ni las reglas de
enrolamiento.
+17
View File
@@ -0,0 +1,17 @@
# SGU Credential Provider 0.6.8
Esta versión declara al Auth Broker como la única autoridad de contraseñas para
todas las cuentas administradas bajo `OU=Usuarios-SGU`.
- Cada creación, movimiento o actualización de una cuenta agrega de forma
idempotente las denegaciones SELF y Everyone para el derecho extendido de
Active Directory `Change Password`.
- El usuario no puede cambiar la contraseña desde Windows, Ctrl+Alt+Delete,
LDAP ni herramientas equivalentes.
- El broker conserva el derecho administrativo separado `Reset Password` y
continúa sincronizando la contraseña institucional exacta mediante
`SetPassword` después de una autenticación SGU válida.
- El despliegue del broker recorre todas las cuentas existentes en
`Usuarios-SGU` y corrige aquellas que todavía permiten cambios directos.
No se modifica la contraseña institucional ni se almacena una copia adicional.
+16
View File
@@ -0,0 +1,16 @@
# SGU Credential Provider 0.6.9
Esta versión completa la autoridad de contraseñas del Auth Broker en la
interfaz de Windows.
- La GPO `SGU - User session restrictions` habilita la directiva **Remove
Change Password** para todas las cuentas bajo `OU=Usuarios-SGU`.
- La opción **Cambiar una contraseña** deja de aparecer en la pantalla de
seguridad de Ctrl+Alt+Supr.
- La protección real continúa en Active Directory mediante las denegaciones
del derecho extendido `Change Password`; la GPO únicamente evita mostrar una
acción que esas cuentas no pueden completar.
El Auth Broker conserva el derecho administrativo separado `Reset Password`
para sincronizar la contraseña institucional después de una autenticación SGU
válida.
+7
View File
@@ -18,6 +18,13 @@ the same source list. RDP uses a separate allowlist. See
`Marshal.ZeroFreeGlobalAllocUnicode`; managed references are released as soon `Marshal.ZeroFreeGlobalAllocUnicode`; managed references are released as soon
as each request completes. as each request completes.
- The broker uses the exact received value for both NTLM and AD `SetPassword`. - The broker uses the exact received value for both NTLM and AD `SetPassword`.
- Managed `Usuarios-SGU` accounts deny the SELF and Everyone `Change Password`
extended right. Only an administrator or the broker through the separate
`Reset Password` right can replace the AD password.
- The `SGU - User session restrictions` GPO also hides the **Change a
password** command from the Windows Ctrl+Alt+Delete security screen for
managed users. This is a user-interface complement to the directory ACL,
not a substitute for it.
- There is no HMAC password, pepper, local password cache, Supabase password, or - There is no HMAC password, pepper, local password cache, Supabase password, or
other derived credential in this Windows path. other derived credential in this Windows path.
- Neither application logs request bodies or passwords. Deployment configuration - Neither application logs request bodies or passwords. Deployment configuration
+107 -136
View File
@@ -1,74 +1,70 @@
# User roaming por rol en Azure # User roaming por rol en Azure (opcional)
El despliegue Azure puede crear almacenamiento privado y políticas distintas para > **Estado predeterminado:** desactivado. Todas las cuentas `AL`, `AD`, `DO` y
cada tipo de cuenta SGU: > cualquier otra cuenta de dominio usan un perfil local normal bajo `C:\Users`.
> Escritorio y Documentos permanecen en el disco del equipo; no se mapean shares
> de perfiles ni se monta un contenedor FSLogix.
La implementación se conserva para un posible piloto futuro, pero no forma parte
del enrolamiento normal. Activarla requiere dos decisiones explícitas: desplegar
la infraestructura con `-DeployUserRoaming $true
-AcknowledgeUserRoamingRisks` y después ejecutar el configurador con
`-AcknowledgeUserRoamingRisks`.
## Diseño opcional
Cuando se habilita expresamente, el comportamiento es:
| Rol | Datos conservados | Implementación | | Rol | Datos conservados | Implementación |
| --- | --- | --- | | --- | --- | --- |
| `AL` | `Desktop` y `Documents` | Redirección de carpetas a Azure Files; el resto del perfil local no es autoritativo y no se copia al iniciar o cerrar sesión. | | `AL` | `Desktop` y `Documents` | Redirección de carpetas a Azure Files; el resto del perfil sigue local. |
| `AD` / `DO` | Perfil completo | FSLogix: montaje directo del VHDX con endpoint privado o Cloud Cache local sincronizada con Azure Files cuando el endpoint es público. | | `AD` / `DO` | Perfil completo | FSLogix VHDX: montaje directo con endpoint privado o Cloud Cache con endpoint público. |
Linux conserva su solución nativa de directorios personales; no intenta montar Linux conserva su directorio personal nativo y no monta un perfil de Windows.
un perfil de Windows.
## Arquitectura y seguridad `infra/azure/main.bicep` puede crear una cuenta `StorageV2` dedicada con shares
`profiles` y `redirected`, soft delete de 14 días, private endpoint y zona
`privatelink.file.<sufijo-de-Azure>`. Su valor predeterminado
`deployUserRoaming=false` evita crear estos recursos. La cuenta de staging usada
para paquetes no se reutiliza automáticamente como almacenamiento de perfiles.
`infra/azure/main.bicep` crea, por omisión, una cuenta `StorageV2` dedicada con Los clientes de un endpoint privado requieren P2S u otra ruta privada a la VNet.
dos recursos SMB (`profiles` y `redirected`), soft delete de 14 días, un private Un endpoint público exige resolución DNS, salida TCP 445 y reglas de red de
endpoint y la zona `privatelink.file.<sufijo-de-Azure>` ligada a la VNet. El Storage limitadas a redes institucionales. El modo `Auto` selecciona `Direct`
endpoint público queda deshabilitado. La VNet entrega el DNS del controlador de para endpoint privado y `CloudCache` para uno público. `CCDLocations` y
dominio a los clientes P2S para que el nombre de Azure Files resuelva a la IP `VHDLocations` son mutuamente excluyentes.
privada. La cuenta de staging usada para transferir paquetes no se reutiliza ni
se convierte en almacenamiento de perfiles.
Los clientes deben usar el P2S de Azure o disponer de otra ruta privada a la Azure Files se integra con AD DS mediante Kerberos AES-256. Las ACL de la raíz
VNet. El modo de enrolamiento público directo no puede usar estos recursos y el usan `CREATOR OWNER` para aislar los directorios de usuarios. La clave de la
script de despliegue exige `-DeployUserRoaming $false` cuando no se despliega el cuenta se usa sólo en memoria durante la creación de ACL y no se guarda en GPO.
gateway P2S.
Para una cuenta SMB ya existente cuyo endpoint público se limite mediante el ## Riesgos que deben aceptarse
firewall de Storage a las redes institucionales, el configurador admite
`-EndpointAccess Public`. En ese modo no exige una dirección RFC1918, pero sigue
comprobando resolución DNS y TCP 445. La creación de los shares y las reglas de
red de la cuenta existente se realiza antes de ejecutar el configurador. El host
que aplica la integración AD/ACL debe conservar acceso temporal a SMB durante
esa ejecución; después se establece `defaultAction=Deny` y se deja únicamente la
red institucional autorizada. En el despliegue LCI actual esa regla final es
`200.13.89.0/24`.
El modo `-StaffProfileStorageMode Auto` es el predeterminado. Selecciona El piloto de septiembre de 2026 confirmó que esta función puede aumentar de
`Direct` con un endpoint privado y `CloudCache` con uno público. Cloud Cache forma considerable el tiempo de inicio y cierre de sesión. Antes de activarla se
mantiene el VHDX de trabajo en `C:\ProgramData\FSLogix\Cache` y sincroniza sus deben aceptar y probar, como mínimo, estos escenarios:
cambios con Azure Files, evitando que cada operación del perfil dependa de la
latencia WAN de SMB. `CCDLocations` y `VHDLocations` son mutuamente excluyentes:
el configurador elimina de forma efectiva el valor obsoleto al cambiar de modo,
incluso en clientes que ya habían aplicado la GPO anterior. Puede forzarse un
modo con `-StaffProfileStorageMode Direct` o `CloudCache`, pero `Direct` sobre
un endpoint público sólo debe usarse para diagnóstico.
Cloud Cache necesita espacio local suficiente para el perfil (30 GB de máximo - latencia o indisponibilidad de Azure Files que mantiene `Welcome` o `Sign out`
por omisión), conserva la caché tras cerrar sesión y exige al menos un proveedor durante varios minutos;
remoto sano al registrar o desmontar el perfil. Si el proveedor no completa la - VHDX remoto en estado abierto, pendiente de eliminación o de creación, con
sincronización, el cierre espera como máximo 60 segundos y después conserva la fallos como `0x80070050`;
caché local para reintentar; no la descarta. La GPO también impide el inicio - caché o proxy local obsoleto de Cloud Cache y fallos de registro como
con perfil temporal o local cuando FSLogix falla, para que una incidencia no `0xE000000B`;
produzca dos perfiles divergentes silenciosamente. - recuperación que puede exigir detener por fuerza los servicios FSLogix y
reiniciar el equipo;
- datos todavía no sincronizados, caché local insuficiente o divergencia si se
fuerza una recuperación;
- dependencia de DNS, Kerberos, TCP 445, la red y el servicio de Storage tanto
para registrar como para desmontar el perfil.
Azure Files se integra con el AD DS SGU, no con cuentas o claves guardadas en No se debe desplegar a todos los usuarios sin un piloto de inicio, cierre,
cada cliente. El script configura AES-256 para Kerberos, una ACL de mínimo desconexión, cuota, restauración y pérdida temporal del proveedor. Cloud Cache
privilegio con `CREATOR OWNER`, administradores y los grupos del rol, y permiso reduce I/O WAN síncrono, pero no elimina la dependencia al cerrar sesión.
SMB predeterminado para identidades autenticadas. La ACL NTFS mantiene aislado
el contenido de cada usuario. La clave de la cuenta se usa en memoria sólo para
crear las ACL iniciales y no se escribe en el dominio, en GPO ni en disco.
Los grupos de rol sólo pueden enumerar la raíz y crear su propio directorio; no ## 1. Desplegar la infraestructura opcional
reciben `Modify` en la raíz compartida. El directorio creado hereda `CREATOR
OWNER`, de modo que un usuario no puede modificar ni eliminar el contenedor de
otro usuario.
## 1. Desplegar la infraestructura El despliegue normal no incluye user roaming. Para crear deliberadamente sus
recursos:
El soporte está activado por omisión para despliegues P2S:
```powershell ```powershell
$azure = .\scripts\Deploy-SguAzureInfrastructure.ps1 ` $azure = .\scripts\Deploy-SguAzureInfrastructure.ps1 `
@@ -76,128 +72,103 @@ $azure = .\scripts\Deploy-SguAzureInfrastructure.ps1 `
-ResourceGroupName 'rg-sgu-lab' ` -ResourceGroupName 'rg-sgu-lab' `
-Location 'centralus' ` -Location 'centralus' `
-AdministratorUsername 'azureadmin' ` -AdministratorUsername 'azureadmin' `
-P2sRootCertificatePath $p2s.RootCertificatePath -P2sRootCertificatePath $p2s.RootCertificatePath `
-DeployUserRoaming $true `
$azure.UserRoamingStorageAccountName -AcknowledgeUserRoamingRisks
$azure.FsLogixProfilesSharePath
$azure.RedirectedFoldersSharePath
$azure.UserRoamingSetupArguments
``` ```
Puede definirse un nombre globalmente único con Puede definirse un nombre con `-UserRoamingStorageAccountName`. Si no se pasan
`-UserRoamingStorageAccountName`. Para omitir completamente el almacenamiento: los dos parámetros de aceptación, la infraestructura de perfiles no se crea.
```powershell
-DeployUserRoaming $false
```
## 2. Unir Azure Files al dominio y publicar las GPO ## 2. Unir Azure Files al dominio y publicar las GPO
Primero termine `Initialize-SguDomainController.ps1`. Después, en Windows Primero termine `Initialize-SguDomainController.ps1`. Después, en Windows
PowerShell 5.1 elevado dentro del DC: PowerShell 5.1 elevado dentro del DC, instale Azure PowerShell y el módulo oficial
[AzFilesHybrid](https://github.com/Azure-Samples/azure-files-samples/releases),
1. Instale Azure PowerShell actual (`Az.Accounts` y `Az.Storage` 8.1 o posterior). y ejecute:
2. Descargue y extraiga el módulo oficial
[AzFilesHybrid](https://github.com/Azure-Samples/azure-files-samples/releases).
3. Ejecute el configurador incluido en el paquete de servidor:
```powershell ```powershell
$storageAccountName = '<valor UserRoamingStorageAccountName del despliegue>'
$parameters = @{ $parameters = @{
SubscriptionId = '00000000-0000-0000-0000-000000000000' SubscriptionId = '00000000-0000-0000-0000-000000000000'
ResourceGroupName = 'rg-sgu-lab' ResourceGroupName = 'rg-sgu-lab'
StorageAccountName = $storageAccountName StorageAccountName = '<cuenta de perfiles>'
FsLogixProfilesShareName = 'profiles' FsLogixProfilesShareName = 'profiles'
RedirectedFoldersShareName = 'redirected' RedirectedFoldersShareName = 'redirected'
AzFilesHybridModulePath = 'C:\Admin\AzFilesHybrid' AzFilesHybridModulePath = 'C:\Admin\AzFilesHybrid'
UseDeviceAuthentication = $true UseDeviceAuthentication = $true
AcknowledgeUserRoamingRisks = $true
} }
.\payload\scripts\Enable-SguAzureUserRoaming.ps1 @parameters .\payload\scripts\Enable-SguAzureUserRoaming.ps1 @parameters
``` ```
Para reutilizar una cuenta con endpoint público: Para una cuenta autorizada con endpoint público:
```powershell ```powershell
$parameters.EndpointAccess = 'Public' $parameters.EndpointAccess = 'Public'
$parameters.StaffProfileStorageMode = 'Auto' # resuelve a CloudCache $parameters.StaffProfileStorageMode = 'Auto'
.\payload\scripts\Enable-SguAzureUserRoaming.ps1 @parameters .\payload\scripts\Enable-SguAzureUserRoaming.ps1 @parameters
``` ```
La operación es idempotente. Crea `OU=AzureFilesConfig`, une la cuenta de El script crea las GPO `SGU - AL redirected folders` y `SGU - AD-DO FSLogix
almacenamiento al bosque y publica dos GPO: profiles`, y vuelve a habilitar el enlace de instalación de FSLogix si ya existe.
No borra perfiles locales existentes salvo que se proporcione deliberadamente
`-DeleteExistingStaffLocalProfiles`.
- `SGU - AL redirected folders`, ligada a `OU=Alumnos`; ## 3. Instalar FSLogix sólo para un piloto
- `SGU - AD-DO FSLogix profiles`, ligada a `OU=Laboratorio` y habilitada sólo
mediante configuración `ObjectSpecific` para los SID de `SGU-Docentes` y
`SGU-Administrativos`.
Por seguridad, el script no borra perfiles locales existentes de AD/DO. Antes FSLogix no forma parte de Windows. Valide su licencia y descargue
de un piloto real, migre o respalde su contenido y elimínelos manualmente. El `FSLogixAppsSetup.exe` directamente de Microsoft. Puede pasarse como quinto
switch `-DeleteExistingStaffLocalProfiles` habilita la opción de FSLogix que los argumento al enrolamiento Azure o publicarse con:
elimina al aplicar el contenedor; úselo sólo después de respaldar y validar.
La identidad de Azure Files queda con contraseña sin expiración en la OU
dedicada para evitar que una cuenta de equipo sin agente pierda Kerberos a los
30 días. Si la política exige rotación, use periódicamente el procedimiento
oficial `Update-AzStorageAccountADObjectPassword` y no cambie sólo un lado.
## 3. Instalar FSLogix en los clientes Windows
FSLogix no forma parte de Windows y su licencia debe validarse para las ediciones
y suscripciones usadas. Descargue `FSLogixAppsSetup.exe` directamente de
Microsoft y agréguelo a la imagen base, o páselo como quinto argumento al
enrolamiento Azure:
```bat
Start-SguAzureClientEnrollment.cmd 10.77.0.4 C:\SGU\vpn.zip C:\SGU\client.pfx C:\SGU\root.cer C:\SGU\FSLogixAppsSetup.exe
```
`Install-SguFsLogix.ps1` exige una firma Authenticode válida de Microsoft,
instala silenciosamente sin reiniciar y comprueba `frxsvc` y `frx.exe`. Si la
imagen ya contiene FSLogix, el instalador puede omitirse. Microsoft recomienda
mantener la versión más reciente; FSLogix no se actualiza mediante Windows
Update.
Para cubrir también equipos ya unidos al dominio —incluidos los que estaban
apagados durante el despliegue— publique el instalador como script de inicio de
equipo:
```powershell ```powershell
.\payload\scripts\Publish-SguFsLogixClientDeployment.ps1 .\payload\scripts\Publish-SguFsLogixClientDeployment.ps1
``` ```
El script descarga el paquete oficial FSLogix 26.08, valida la firma El publicador valida firma y SHA-256 y crea `SGU - FSLogix client deployment`.
Authenticode de Microsoft y el SHA-256 esperado, y crea la GPO El rollback descrito abajo deshabilita su enlace para que no se instale en más
`SGU - FSLogix client deployment` ligada a `OU=Laboratorio`. El ejecutable queda equipos.
en el SYSVOL de esa GPO y se instala de forma idempotente durante el arranque;
no usa tareas programadas ni requiere que el equipo estuviera encendido al
publicarla. Si `frxsvc` y `frx.exe` ya existen, el script de inicio termina sin
reinstalar.
## 4. Validar un piloto ## 4. Desactivar y volver a perfiles locales
Después de `gpupdate /force` y reiniciar un cliente: Ejecute desde Windows PowerShell 5.1 elevado en el controlador de dominio:
```powershell
.\payload\scripts\Disable-SguAzureUserRoaming.ps1
```
Es idempotente y realiza lo siguiente:
- fija `Profiles\Enabled=0` y `ODFC\Enabled=0`;
- deshabilita `frxsvc` y `frxccds` mediante GPO;
- elimina `CCDLocations`, `VHDLocations` y valores de contenedor específicos de
los grupos `SGU-Administrativos` y `SGU-Docentes`;
- restaura Escritorio y Documentos de alumnos a
`%USERPROFILE%\Desktop` y `%USERPROFILE%\Documents`;
- deshabilita el enlace de despliegue del cliente FSLogix;
- limpia `profilePath`, `homeDirectory` y `homeDrive` de los usuarios de las OU
SGU, salvo que se use `-PreserveLegacyUserMappings`.
Después aplique `gpupdate /force` y reinicie cada Windows administrado antes de
probar un nuevo inicio de sesión. El primer ingreso vuelve a crear o reutilizar
un perfil local. El script no borra automáticamente VHDX, shares de Azure ni
cachés existentes: conservarlos permite recuperación y evita destrucción de
datos. Su eliminación debe ser una decisión separada y posterior a la validación.
## 5. Validar un piloto futuro
Después de `gpupdate /force` y reiniciar un cliente de prueba:
```powershell ```powershell
Resolve-DnsName "$($azure.UserRoamingStorageAccountName).file.core.windows.net" Resolve-DnsName "$($azure.UserRoamingStorageAccountName).file.core.windows.net"
Test-NetConnection "$($azure.UserRoamingStorageAccountName).file.core.windows.net" -Port 445 Test-NetConnection "$($azure.UserRoamingStorageAccountName).file.core.windows.net" -Port 445
Get-Service frxsvc Get-Service frxsvc
Get-ItemProperty 'HKLM:\SOFTWARE\FSLogix\Profiles\ObjectSpecific\<SID-del-grupo>' Get-ItemProperty 'HKLM:\SOFTWARE\FSLogix\Profiles\ObjectSpecific\<SID-del-grupo>'
Get-ItemProperty 'HKLM:\SOFTWARE\SGU\FSLogixDeployment'
& 'C:\Program Files\FSLogix\Apps\frx.exe' list-redirects & 'C:\Program Files\FSLogix\Apps\frx.exe' list-redirects
``` ```
En modo privado, la resolución debe devolver la IP privada del endpoint; en Revise `%ProgramData%\FSLogix\Logs\Profile`, pruebe inicio y cierre varias veces,
modo público debe devolver una dirección pública y TCP 445 debe estar permitido simule indisponibilidad y valide restauración. No active el borrado de perfiles
desde la red institucional. En Cloud Cache compruebe además que existe locales ni amplíe el alcance antes de superar esas pruebas.
`C:\ProgramData\FSLogix\Cache` y que el registro efectivo contiene
`CCDLocations`, pero no `VHDLocations`. Inicie primero con un
`AL` nuevo y confirme las ubicaciones de Escritorio/Documentos; luego pruebe un
`AD` o `DO` sin perfil local previo y confirme la creación de un VHDX en
`profiles`. Revise `%ProgramData%\FSLogix\Logs\Profile` para confirmar que el
perfil se registró sin `ERROR: 258`, perfil temporal ni retorno a `C:\Users`.
No active el borrado de perfiles locales ni despliegue a todos los
usuarios hasta probar inicio, cierre, desconexión de VPN, cuota y restauración.
Referencias de Microsoft: Referencias de Microsoft:
+35 -8
View File
@@ -1,9 +1,19 @@
# Fondo de bienvenida personalizado # Fondo de bienvenida personalizado
El enrolamiento instala un fondo base azul, las familias `Indivisa Text Sans` y El enrolamiento instala tres fondos base de escritorio y una base independiente
`Indivisa Text Serif`, y un generador local. La GPO de equipos 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
`SGU - Windows client experience` ejecuta el generador al abrir cada sesión y `SGU - Windows client experience` ejecuta el generador al abrir cada sesión y
mantiene el fondo base en la pantalla de bloqueo. mantiene la base limpia independiente en la pantalla de bloqueo.
Windows no conoce todavía la identidad que se autenticará mientras muestra la Windows no conoce todavía la identidad que se autenticará mientras muestra la
pantalla previa al inicio de sesión. Por ello, esa pantalla utiliza el fondo base pantalla previa al inicio de sesión. Por ello, esa pantalla utiliza el fondo base
@@ -28,12 +38,18 @@ restaura el comando genérico de inicio.
El saludo usa `Bienvenido/ubicado` para `Male` y `Bienvenida/ubicada` para El saludo usa `Bienvenido/ubicado` para `Male` y `Bienvenida/ubicada` para
`Female`. Cuando el enriquecimiento no produjo este dato, utiliza la redacción `Female`. Cuando el enriquecimiento no produjo este dato, utiliza la redacción
neutral `Te damos la bienvenida` y `Ubicación:`. El texto secundario sigue estas neutral `Te damos la bienvenida` y `Acceso`. La ubicación se divide en dos
reglas: líneas: la sala ocupa la primera y la dependencia aparece debajo con un tamaño
menor. Sigue estas reglas:
1. Con `location` y OU: `Acceso al Aula Flexible del Centro de Experiencia Digital.` 1. Sin sexo: `Acceso a la Sala de Aplicaciones`, seguido por
2. Con sólo uno de los datos: muestra únicamente el dato disponible. `del Laboratorio de Cómputo de Ingeniería.`
3. Sin ambos: el texto adaptado `Bienvenido/Bienvenida al Laboratorio...`; sin 2. Masculino: `Estás ubicado en el Aula Flexible`, seguido por
`del Centro de Experiencia Digital.`
3. Femenino: `Estás ubicada en la Sala de Redes`, seguido por
`del Laboratorio de Cómputo de Ingeniería.`
4. Con sólo uno de los datos: muestra únicamente el dato disponible.
5. Sin ambos: el texto adaptado `Bienvenido/Bienvenida al Laboratorio...`; sin
sexo disponible, la forma neutral `Acceso al Laboratorio de Cómputo de Ingeniería.` sexo disponible, la forma neutral `Acceso al Laboratorio de Cómputo de Ingeniería.`
La ausencia de AD, de un atributo o de una tipografía nunca bloquea la sesión. La ausencia de AD, de un atributo o de una tipografía nunca bloquea la sesión.
@@ -48,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 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. 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 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 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. el comando de inicio y la pantalla de bloqueo pertenecen a la GPO de equipos.
@@ -68,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 inicio de sesión continúan normalmente y se escribe un diagnóstico en
`~/.local/state/sgu/welcome-wallpaper.log`. `~/.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 ## Tipografía
Los archivos OTF necesarios viajan dentro de cada paquete y se cargan en memoria Los archivos OTF necesarios viajan dentro de cada paquete y se cargan en memoria
+1 -1
View File
@@ -56,7 +56,7 @@ param publicEnrollmentSourceAddressPrefixes array = []
param administratorSourceAddressPrefix string = '' param administratorSourceAddressPrefix string = ''
@description('Deploy private Azure Files shares for SGU user roaming. Clients require P2S or another private route into the VNet.') @description('Deploy private Azure Files shares for SGU user roaming. Clients require P2S or another private route into the VNet.')
param deployUserRoaming bool = true param deployUserRoaming bool = false
@description('Optional globally unique storage account name for roaming data. Leave empty to derive a stable name from the resource group.') @description('Optional globally unique storage account name for roaming data. Leave empty to derive a stable name from the resource group.')
param userRoamingStorageAccountName string = '' param userRoamingStorageAccountName string = ''
+15 -1
View File
@@ -201,6 +201,19 @@ if ($RemoteDesktopGroupDn) {
} }
} }
$managedUsersPasswordChangeCorrected = 0
if ($PSCmdlet.ShouldProcess($usersOuDn, 'Deny direct password changes for every managed SGU user')) {
$managedUsers = @(Get-ADUser -Filter * -SearchBase $usersOuDn -SearchScope Subtree `
-Properties CannotChangePassword -Server $LdapHost -ErrorAction Stop)
foreach ($managedUser in $managedUsers) {
if (-not $managedUser.CannotChangePassword) {
Set-ADAccountControl -Identity $managedUser.DistinguishedName `
-CannotChangePassword $true -Server $LdapHost -Confirm:$false
$managedUsersPasswordChangeCorrected++
}
}
}
foreach ($file in @('SGU.AuthBroker.exe', 'SGU.AuthBroker.dll', 'appsettings.json')) { foreach ($file in @('SGU.AuthBroker.exe', 'SGU.AuthBroker.dll', 'appsettings.json')) {
if (-not (Test-Path -LiteralPath (Join-Path $PublishPath $file))) { if (-not (Test-Path -LiteralPath (Join-Path $PublishPath $file))) {
throw "PublishPath is missing $file." throw "PublishPath is missing $file."
@@ -356,4 +369,5 @@ if ($PSCmdlet.ShouldProcess($installPath, 'Install the SGU Authentication Broker
} }
Get-Service -Name $serviceName | Select-Object Name, Status, StartType, Get-Service -Name $serviceName | Select-Object Name, Status, StartType,
@{ Name = 'EventLog'; Expression = { $brokerEventLogName } } @{ Name = 'EventLog'; Expression = { $brokerEventLogName } },
@{ Name = 'ExistingUsersPasswordChangeDenied'; Expression = { $managedUsersPasswordChangeCorrected } }
+5 -1
View File
@@ -18,7 +18,8 @@ param(
[string]$VpnClientAddressPoolPrefix = '172.30.0.0/24', [string]$VpnClientAddressPoolPrefix = '172.30.0.0/24',
[string[]]$PublicEnrollmentSourceAddressPrefixes = @(), [string[]]$PublicEnrollmentSourceAddressPrefixes = @(),
[string]$AdministratorSourceAddressPrefix = '', [string]$AdministratorSourceAddressPrefix = '',
[bool]$DeployUserRoaming = $true, [bool]$DeployUserRoaming = $false,
[switch]$AcknowledgeUserRoamingRisks,
[ValidatePattern('^$|^[a-z0-9]{3,24}$')] [ValidatePattern('^$|^[a-z0-9]{3,24}$')]
[string]$UserRoamingStorageAccountName = '', [string]$UserRoamingStorageAccountName = '',
[ValidatePattern('^[a-z0-9](?:[a-z0-9-]{1,61}[a-z0-9])$')] [ValidatePattern('^[a-z0-9](?:[a-z0-9-]{1,61}[a-z0-9])$')]
@@ -47,6 +48,9 @@ if (-not $AdministratorPassword) {
if ($DeployUserRoaming -and -not $DeployVpnGateway) { if ($DeployUserRoaming -and -not $DeployVpnGateway) {
throw 'Azure user roaming requires the P2S gateway deployed by this template so clients can reach the private Azure Files endpoint. Use -DeployUserRoaming $false with direct public enrollment.' throw 'Azure user roaming requires the P2S gateway deployed by this template so clients can reach the private Azure Files endpoint. Use -DeployUserRoaming $false with direct public enrollment.'
} }
if ($DeployUserRoaming -and -not $AcknowledgeUserRoamingRisks) {
throw 'User roaming is disabled by default. To provision it, also pass -AcknowledgeUserRoamingRisks after reviewing the sign-in, sign-out, storage-availability, stale-cache, and recovery risks in docs/user-roaming.md.'
}
foreach ($shareName in @($FsLogixProfilesShareName, $RedirectedFoldersShareName)) { foreach ($shareName in @($FsLogixProfilesShareName, $RedirectedFoldersShareName)) {
if ($shareName.Contains('--')) { if ($shareName.Contains('--')) {
throw "Azure Files share names cannot contain consecutive hyphens: $shareName" throw "Azure Files share names cannot contain consecutive hyphens: $shareName"
+210
View File
@@ -0,0 +1,210 @@
#Requires -Version 5.1
[CmdletBinding(SupportsShouldProcess)]
param(
[string]$DomainController = $env:COMPUTERNAME,
[string]$StudentOuName = 'Alumnos',
[string]$ProfessorOuName = 'Docentes',
[string]$AdministrativeOuName = 'Administrativos',
[string]$LaboratoryOuName = 'Laboratorio',
[string]$StudentGroupName = 'SGU-Alumnos',
[string]$ProfessorGroupName = 'SGU-Docentes',
[string]$AdministrativeGroupName = 'SGU-Administrativos',
[string]$StudentGpoName = 'SGU - AL redirected folders',
[string]$StaffGpoName = 'SGU - AD-DO FSLogix profiles',
[string]$FsLogixDeploymentGpoName = 'SGU - FSLogix client deployment',
[switch]$PreserveLegacyUserMappings
)
$ErrorActionPreference = 'Stop'
function Assert-Administrator {
$identity = [Security.Principal.WindowsIdentity]::GetCurrent()
$principal = [Security.Principal.WindowsPrincipal]::new($identity)
if (-not $principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
throw 'Run this script from an elevated Windows PowerShell 5.1 session on the SGU domain controller.'
}
}
function Set-SguPolicyValue {
param(
[Parameter(Mandatory)][string]$GpoName,
[Parameter(Mandatory)][string]$DomainName,
[Parameter(Mandatory)][string]$Server,
[Parameter(Mandatory)][string]$Key,
[Parameter(Mandatory)][string]$ValueName,
[Parameter(Mandatory)][ValidateSet('DWord','String','ExpandString')][string]$Type,
[Parameter(Mandatory)]$Value
)
if ($PSCmdlet.ShouldProcess("$GpoName :: $Key\\$ValueName", "Set rollback value $Value")) {
Remove-GPRegistryValue -Name $GpoName -Domain $DomainName -Server $Server `
-Key $Key -ValueName "**del.$ValueName" -ErrorAction SilentlyContinue | Out-Null
Set-GPRegistryValue -Name $GpoName -Domain $DomainName -Server $Server `
-Key $Key -ValueName $ValueName -Type $Type -Value $Value | Out-Null
}
}
function Remove-SguPolicyValue {
param(
[Parameter(Mandatory)][string]$GpoName,
[Parameter(Mandatory)][string]$DomainName,
[Parameter(Mandatory)][string]$Server,
[Parameter(Mandatory)][string]$Key,
[Parameter(Mandatory)][string]$ValueName
)
if ($PSCmdlet.ShouldProcess("$GpoName :: $Key\\$ValueName", 'Remove roaming value')) {
Remove-GPRegistryValue -Name $GpoName -Domain $DomainName -Server $Server `
-Key $Key -ValueName $ValueName -ErrorAction SilentlyContinue | Out-Null
Set-GPRegistryValue -Name $GpoName -Domain $DomainName -Server $Server `
-Key $Key -ValueName "**del.$ValueName" -Type String -Value '' | Out-Null
}
}
Assert-Administrator
Import-Module ActiveDirectory -ErrorAction Stop
Import-Module GroupPolicy -ErrorAction Stop
$domain = Get-ADDomain -Server $DomainController
$domainName = $domain.DNSRoot
$domainDn = $domain.DistinguishedName
$laboratoryOuDn = "OU=$LaboratoryOuName,$domainDn"
$usersOuDn = "OU=Usuarios-SGU,$domainDn"
$studentOuDn = "OU=$StudentOuName,$usersOuDn"
$professorOuDn = "OU=$ProfessorOuName,$usersOuDn"
$administrativeOuDn = "OU=$AdministrativeOuName,$usersOuDn"
foreach ($ou in $laboratoryOuDn,$studentOuDn,$professorOuDn,$administrativeOuDn) {
Get-ADOrganizationalUnit -Identity $ou -Server $DomainController -ErrorAction Stop | Out-Null
}
$staffGpo = Get-GPO -Name $StaffGpoName -Domain $domainName -Server $DomainController `
-ErrorAction SilentlyContinue
if (-not $staffGpo -and $PSCmdlet.ShouldProcess($StaffGpoName, 'Create local-profile enforcement GPO')) {
$staffGpo = New-GPO -Name $StaffGpoName -Domain $domainName -Server $DomainController
}
if (-not $staffGpo) {
throw "The GPO '$StaffGpoName' does not exist and was not created."
}
$staffLink = @(Get-GPInheritance -Target $laboratoryOuDn -Domain $domainName `
-Server $DomainController).GpoLinks |
Where-Object DisplayName -eq $StaffGpoName | Select-Object -First 1
if (-not $staffLink -and $PSCmdlet.ShouldProcess($laboratoryOuDn, "Link '$StaffGpoName'")) {
New-GPLink -Name $StaffGpoName -Target $laboratoryOuDn -Domain $domainName `
-Server $DomainController -LinkEnabled Yes | Out-Null
}
elseif ($staffLink -and -not [bool]$staffLink.Enabled -and
$PSCmdlet.ShouldProcess($laboratoryOuDn, "Enable '$StaffGpoName' rollback link")) {
Set-GPLink -Name $StaffGpoName -Target $laboratoryOuDn -Domain $domainName `
-Server $DomainController -LinkEnabled Yes | Out-Null
}
$profilesRoot = 'HKLM\SOFTWARE\FSLogix\Profiles'
Set-SguPolicyValue -GpoName $StaffGpoName -DomainName $domainName -Server $DomainController `
-Key $profilesRoot -ValueName Enabled -Type DWord -Value 0
Set-SguPolicyValue -GpoName $StaffGpoName -DomainName $domainName -Server $DomainController `
-Key 'HKLM\SOFTWARE\FSLogix\ODFC' -ValueName Enabled -Type DWord -Value 0
foreach ($serviceName in 'frxsvc','frxccds') {
Set-SguPolicyValue -GpoName $StaffGpoName -DomainName $domainName -Server $DomainController `
-Key "HKLM\SYSTEM\CurrentControlSet\Services\$serviceName" `
-ValueName Start -Type DWord -Value 4
}
Remove-SguPolicyValue -GpoName $StaffGpoName -DomainName $domainName -Server $DomainController `
-Key 'HKLM\SOFTWARE\FSLogix\Apps' -ValueName VHDCompactDisk
$profileValueNames = @(
'CCDLocations','VHDLocations','CcdUnregisterTimeout','ClearCacheOnForcedUnregister',
'ClearCacheOnLogoff','HealthyProvidersRequiredForRegister',
'HealthyProvidersRequiredForUnregister','PreventLoginWithFailure',
'PreventLoginWithTempProfile','DeleteLocalProfileWhenVHDShouldApply',
'FlipFlopProfileDirectoryName','IsDynamic','LockedRetryCount','LockedRetryInterval',
'ProfileType','ReAttachIntervalSeconds','ReAttachRetryCount','SizeInMBs','VolumeType',
'VHDCompactDisk'
)
$roleGroups = @(
Get-ADGroup -Identity "CN=$ProfessorGroupName,$professorOuDn" -Server $DomainController
Get-ADGroup -Identity "CN=$AdministrativeGroupName,$administrativeOuDn" -Server $DomainController
)
foreach ($group in $roleGroups) {
$key = "$profilesRoot\ObjectSpecific\$($group.SID.Value)"
Set-SguPolicyValue -GpoName $StaffGpoName -DomainName $domainName -Server $DomainController `
-Key $key -ValueName Enabled -Type DWord -Value 0
foreach ($valueName in $profileValueNames) {
Remove-SguPolicyValue -GpoName $StaffGpoName -DomainName $domainName `
-Server $DomainController -Key $key -ValueName $valueName
}
}
Set-SguPolicyValue -GpoName $StaffGpoName -DomainName $domainName -Server $DomainController `
-Key 'HKLM\SOFTWARE\SGU\UserRoaming' -ValueName StaffProfileStorageMode `
-Type String -Value Disabled
$studentGpo = Get-GPO -Name $StudentGpoName -Domain $domainName -Server $DomainController `
-ErrorAction SilentlyContinue
if ($studentGpo) {
$studentLink = @(Get-GPInheritance -Target $studentOuDn -Domain $domainName `
-Server $DomainController).GpoLinks |
Where-Object DisplayName -eq $StudentGpoName | Select-Object -First 1
if ($studentLink -and -not [bool]$studentLink.Enabled -and
$PSCmdlet.ShouldProcess($studentOuDn, "Enable '$StudentGpoName' local-path rollback")) {
Set-GPLink -Name $StudentGpoName -Target $studentOuDn -Domain $domainName `
-Server $DomainController -LinkEnabled Yes | Out-Null
}
$shellFoldersKey = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders'
Set-SguPolicyValue -GpoName $StudentGpoName -DomainName $domainName -Server $DomainController `
-Key $shellFoldersKey -ValueName Desktop -Type ExpandString `
-Value '%USERPROFILE%\Desktop'
Set-SguPolicyValue -GpoName $StudentGpoName -DomainName $domainName -Server $DomainController `
-Key $shellFoldersKey -ValueName Personal -Type ExpandString `
-Value '%USERPROFILE%\Documents'
Remove-SguPolicyValue -GpoName $StudentGpoName -DomainName $domainName `
-Server $DomainController -Key 'HKCU\Software\Policies\Microsoft\Windows\NetCache' `
-ValueName DisableFRAdminPin
}
$deploymentGpo = Get-GPO -Name $FsLogixDeploymentGpoName -Domain $domainName `
-Server $DomainController -ErrorAction SilentlyContinue
if ($deploymentGpo) {
$deploymentLink = @(Get-GPInheritance -Target $laboratoryOuDn -Domain $domainName `
-Server $DomainController).GpoLinks |
Where-Object DisplayName -eq $FsLogixDeploymentGpoName | Select-Object -First 1
if ($deploymentLink -and [bool]$deploymentLink.Enabled -and
$PSCmdlet.ShouldProcess($laboratoryOuDn, "Disable '$FsLogixDeploymentGpoName'")) {
Set-GPLink -Name $FsLogixDeploymentGpoName -Target $laboratoryOuDn `
-Domain $domainName -Server $DomainController -LinkEnabled No | Out-Null
}
}
$clearedUsers = [Collections.Generic.List[string]]::new()
if (-not $PreserveLegacyUserMappings) {
foreach ($roleOu in $studentOuDn,$professorOuDn,$administrativeOuDn) {
foreach ($user in Get-ADUser -SearchBase $roleOu -SearchScope Subtree -Filter * `
-Server $DomainController -Properties profilePath,homeDirectory,homeDrive) {
if ($user.profilePath -or $user.homeDirectory -or $user.homeDrive) {
if ($PSCmdlet.ShouldProcess($user.SamAccountName, 'Clear AD profile and home-drive mappings')) {
Set-ADUser -Identity $user -Server $DomainController `
-Clear profilePath,homeDirectory,homeDrive
$clearedUsers.Add($user.SamAccountName)
}
}
}
}
}
$staffGpo = Get-GPO -Name $StaffGpoName -Domain $domainName -Server $DomainController
$studentGpo = Get-GPO -Name $StudentGpoName -Domain $domainName -Server $DomainController `
-ErrorAction SilentlyContinue
$deploymentLink = @(Get-GPInheritance -Target $laboratoryOuDn -Domain $domainName `
-Server $DomainController).GpoLinks |
Where-Object DisplayName -eq $FsLogixDeploymentGpoName | Select-Object -First 1
[pscustomobject]@{
Domain = $domainName
UserRoamingEnabled = $false
StaffGpoVersion = "$($staffGpo.Computer.DSVersion)/$($staffGpo.Computer.SysVolVersion)"
StudentGpoVersion = if ($studentGpo) {
"$($studentGpo.User.DSVersion)/$($studentGpo.User.SysVolVersion)"
} else { $null }
FsLogixDeploymentLinkEnabled = [bool]$deploymentLink.Enabled
StaffProfilesEnabled = 0
StudentDesktop = '%USERPROFILE%\Desktop'
StudentDocuments = '%USERPROFILE%\Documents'
ClearedAdUsers = @($clearedUsers)
RebootManagedWindowsClients = $true
}
+26 -1
View File
@@ -29,10 +29,15 @@ param(
[int]$FsLogixProfileSizeMiB = 30000, [int]$FsLogixProfileSizeMiB = 30000,
[string]$AzFilesHybridModulePath, [string]$AzFilesHybridModulePath,
[switch]$UseDeviceAuthentication, [switch]$UseDeviceAuthentication,
[switch]$DeleteExistingStaffLocalProfiles [switch]$DeleteExistingStaffLocalProfiles,
[switch]$AcknowledgeUserRoamingRisks,
[string]$FsLogixDeploymentGpoName = 'SGU - FSLogix client deployment'
) )
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
if (-not $AcknowledgeUserRoamingRisks -and -not $WhatIfPreference) {
throw 'User roaming is an optional high-risk feature. Pass -AcknowledgeUserRoamingRisks only after reviewing docs/user-roaming.md, testing sign-in and sign-out, and accepting the documented storage and recovery failure modes.'
}
function Assert-Administrator { function Assert-Administrator {
$identity = [Security.Principal.WindowsIdentity]::GetCurrent() $identity = [Security.Principal.WindowsIdentity]::GetCurrent()
@@ -158,6 +163,8 @@ function Set-SguGpoRegistryValue {
) )
if ($PSCmdlet.ShouldProcess("$GpoName :: $Key\\$ValueName", "Set $Type policy value")) { if ($PSCmdlet.ShouldProcess("$GpoName :: $Key\\$ValueName", "Set $Type policy value")) {
Remove-GPRegistryValue -Name $GpoName -Domain $DomainName -Server $Server `
-Key $Key -ValueName "**del.$ValueName" -ErrorAction SilentlyContinue | Out-Null
Set-GPRegistryValue -Name $GpoName -Domain $DomainName -Server $Server ` Set-GPRegistryValue -Name $GpoName -Domain $DomainName -Server $Server `
-Key $Key -ValueName $ValueName -Type $Type -Value $Value | Out-Null -Key $Key -ValueName $ValueName -Type $Type -Value $Value | Out-Null
} }
@@ -431,6 +438,24 @@ $staffGpo = Ensure-SguGpoLink -Name $StaffGpoName -TargetOuDn $laboratoryOuDn `
$fsLogixRoot = 'HKLM\SOFTWARE\FSLogix\Profiles' $fsLogixRoot = 'HKLM\SOFTWARE\FSLogix\Profiles'
Set-SguGpoRegistryValue -GpoName $staffGpo.DisplayName -DomainName $domainName ` Set-SguGpoRegistryValue -GpoName $staffGpo.DisplayName -DomainName $domainName `
-Server $DomainController -Key $fsLogixRoot -ValueName 'Enabled' -Type DWord -Value 0 -Server $DomainController -Key $fsLogixRoot -ValueName 'Enabled' -Type DWord -Value 0
Set-SguGpoRegistryValue -GpoName $staffGpo.DisplayName -DomainName $domainName `
-Server $DomainController -Key 'HKLM\SYSTEM\CurrentControlSet\Services\frxsvc' `
-ValueName 'Start' -Type DWord -Value 2
Set-SguGpoRegistryValue -GpoName $staffGpo.DisplayName -DomainName $domainName `
-Server $DomainController -Key 'HKLM\SYSTEM\CurrentControlSet\Services\frxccds' `
-ValueName 'Start' -Type DWord -Value 2
$deploymentGpo = Get-GPO -Name $FsLogixDeploymentGpoName -Domain $domainName `
-Server $DomainController -ErrorAction SilentlyContinue
if ($deploymentGpo) {
$deploymentLink = @(Get-GPInheritance -Target $laboratoryOuDn -Domain $domainName `
-Server $DomainController).GpoLinks |
Where-Object DisplayName -eq $FsLogixDeploymentGpoName | Select-Object -First 1
if ($deploymentLink -and -not [bool]$deploymentLink.Enabled -and
$PSCmdlet.ShouldProcess($laboratoryOuDn, "Enable '$FsLogixDeploymentGpoName'")) {
Set-GPLink -Name $FsLogixDeploymentGpoName -Target $laboratoryOuDn `
-Domain $domainName -Server $DomainController -LinkEnabled Yes | Out-Null
}
}
$fsLogixValues = [ordered]@{ $fsLogixValues = [ordered]@{
Enabled = @{ Type = 'DWord'; Value = 1 } Enabled = @{ Type = 'DWord'; Value = 1 }
DeleteLocalProfileWhenVHDShouldApply = @{ DeleteLocalProfileWhenVHDShouldApply = @{
+6 -1
View File
@@ -370,11 +370,14 @@ install_welcome_wallpaper() {
local source_directory="${SCRIPT_DIRECTORY}/welcome-wallpaper" local source_directory="${SCRIPT_DIRECTORY}/welcome-wallpaper"
local source_script="${source_directory}/Set-SguWelcomeWallpaper.sh" local source_script="${source_directory}/Set-SguWelcomeWallpaper.sh"
local source_image="${source_directory}/darkblue.jpg" 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 install_directory='/usr/local/lib/sgu-welcome-wallpaper'
local configuration_directory='/etc/sgu' local configuration_directory='/etc/sgu'
local autostart_directory='/etc/xdg/autostart' 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 printf 'WARNING: Welcome wallpaper assets are absent; domain enrollment will continue without desktop branding.\n' >&2
return 0 return 0
fi fi
@@ -396,6 +399,8 @@ install_welcome_wallpaper() {
install -d -o root -g root -m 755 "$install_directory" "$configuration_directory" "$autostart_directory" 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 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_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 if compgen -G "${source_directory}/fonts/*.[ot]tf" >/dev/null; then
install -d -o root -g root -m 755 "${install_directory}/fonts" 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/" install -o root -g root -m 644 "${source_directory}"/fonts/*.[ot]tf "${install_directory}/fonts/"
+15
View File
@@ -38,6 +38,9 @@ $interactiveLogonPolicyPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\P
$accountPictureSourcePath = Join-Path $PublishPath 'branding\user.png' $accountPictureSourcePath = Join-Path $PublishPath 'branding\user.png'
$accountPictureDirectory = Join-Path $env:ProgramData 'Microsoft\User Account Pictures' $accountPictureDirectory = Join-Path $env:ProgramData 'Microsoft\User Account Pictures'
$welcomeWallpaperSourcePath = Join-Path $PublishPath 'branding\darkblue.jpg' $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' $welcomeWallpaperScriptSourcePath = Join-Path $PublishPath 'branding\Set-SguWelcomeWallpaper.ps1'
$welcomeFontsSourcePath = Join-Path $PublishPath 'branding\fonts' $welcomeFontsSourcePath = Join-Path $PublishPath 'branding\fonts'
$welcomeWallpaperDirectory = Join-Path $env:ProgramData 'SGU\Branding' $welcomeWallpaperDirectory = Join-Path $env:ProgramData 'SGU\Branding'
@@ -128,6 +131,9 @@ function Install-DefaultAccountPicture {
function Install-WelcomeWallpaperAssets { function Install-WelcomeWallpaperAssets {
if (-not (Test-Path -LiteralPath $welcomeWallpaperSourcePath -PathType Leaf) -or 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)) { -not (Test-Path -LiteralPath $welcomeWallpaperScriptSourcePath -PathType Leaf)) {
return $false return $false
} }
@@ -135,6 +141,12 @@ function Install-WelcomeWallpaperAssets {
New-Item -ItemType Directory -Path $welcomeWallpaperDirectory -Force | Out-Null New-Item -ItemType Directory -Path $welcomeWallpaperDirectory -Force | Out-Null
Copy-Item -LiteralPath $welcomeWallpaperSourcePath ` Copy-Item -LiteralPath $welcomeWallpaperSourcePath `
-Destination (Join-Path $welcomeWallpaperDirectory 'darkblue.jpg') -Force -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 ` Copy-Item -LiteralPath $welcomeWallpaperScriptSourcePath `
-Destination (Join-Path $welcomeWallpaperDirectory 'Set-SguWelcomeWallpaper.ps1') -Force -Destination (Join-Path $welcomeWallpaperDirectory 'Set-SguWelcomeWallpaper.ps1') -Force
if (Test-Path -LiteralPath $welcomeFontsSourcePath -PathType Container) { if (Test-Path -LiteralPath $welcomeFontsSourcePath -PathType Container) {
@@ -358,5 +370,8 @@ catch {
SystemPasswordProviderPreserved = $true SystemPasswordProviderPreserved = $true
WelcomeWallpaperAssetsInstalled = WelcomeWallpaperAssetsInstalled =
(Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'darkblue.jpg') -PathType Leaf) -and (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) (Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'Set-SguWelcomeWallpaper.ps1') -PathType Leaf)
} }
+17
View File
@@ -143,6 +143,12 @@ Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\lasalle-ma
-Destination (Join-Path $clientRoot 'payload\credential-provider\branding\user.png') -Destination (Join-Path $clientRoot 'payload\credential-provider\branding\user.png')
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') ` Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') `
-Destination (Join-Path $clientRoot 'payload\credential-provider\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') ` Copy-RequiredFile -Source (Join-Path $PSScriptRoot 'Set-SguWelcomeWallpaper.ps1') `
-Destination (Join-Path $clientRoot 'payload\credential-provider\branding\Set-SguWelcomeWallpaper.ps1') -Destination (Join-Path $clientRoot 'payload\credential-provider\branding\Set-SguWelcomeWallpaper.ps1')
foreach ($fontName in $welcomeFontNames) { foreach ($fontName in $welcomeFontNames) {
@@ -180,6 +186,10 @@ Copy-RequiredFile -Source (Join-Path $PSScriptRoot 'Set-SguWelcomeWallpaper.sh')
-Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\Set-SguWelcomeWallpaper.sh') -Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\Set-SguWelcomeWallpaper.sh')
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') ` Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') `
-Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\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) { foreach ($fontName in $welcomeFontNames) {
Copy-RequiredFile -Source (Join-Path $repositoryRoot "assets\branding\fonts\$fontName") ` Copy-RequiredFile -Source (Join-Path $repositoryRoot "assets\branding\fonts\$fontName") `
-Destination (Join-Path $linuxClientRoot "welcome-wallpaper\fonts\$fontName") -Destination (Join-Path $linuxClientRoot "welcome-wallpaper\fonts\$fontName")
@@ -196,6 +206,7 @@ Copy-RequiredFile -Source (Join-Path $PSScriptRoot 'Start-SguAzureServerBootstra
-Destination (Join-Path $serverRoot 'Start-SguAzureServerBootstrap.cmd') -Destination (Join-Path $serverRoot 'Start-SguAzureServerBootstrap.cmd')
$serverScripts = @( $serverScripts = @(
'Deploy-AuthBroker.ps1', 'Deploy-AuthBroker.ps1',
'Disable-SguAzureUserRoaming.ps1',
'Enable-SguAzureUserRoaming.ps1', 'Enable-SguAzureUserRoaming.ps1',
'Enable-SguServerRemoteManagement.ps1', 'Enable-SguServerRemoteManagement.ps1',
'Get-SguUsageReport.ps1', 'Get-SguUsageReport.ps1',
@@ -237,6 +248,12 @@ Copy-RequiredFile -Source (Join-Path $PSScriptRoot 'Set-SguWelcomeWallpaper.ps1'
-Destination (Join-Path $serverContentTarget 'welcome-wallpaper\Set-SguWelcomeWallpaper.ps1') -Destination (Join-Path $serverContentTarget 'welcome-wallpaper\Set-SguWelcomeWallpaper.ps1')
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') ` Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') `
-Destination (Join-Path $serverContentTarget 'welcome-wallpaper\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) { foreach ($fontName in $welcomeFontNames) {
Copy-RequiredFile -Source (Join-Path $repositoryRoot "assets\branding\fonts\$fontName") ` Copy-RequiredFile -Source (Join-Path $repositoryRoot "assets\branding\fonts\$fontName") `
-Destination (Join-Path $serverContentTarget "welcome-wallpaper\fonts\$fontName") -Destination (Join-Path $serverContentTarget "welcome-wallpaper\fonts\$fontName")
+29 -8
View File
@@ -5,7 +5,10 @@ param(
[string]$DomainController = $env:COMPUTERNAME, [string]$DomainController = $env:COMPUTERNAME,
[string]$EventCollectorFqdn, [string]$EventCollectorFqdn,
[string]$WelcomeWallpaperScriptPath = 'C:\ProgramData\SGU\Branding\Set-SguWelcomeWallpaper.ps1', [string]$WelcomeWallpaperScriptPath = 'C:\ProgramData\SGU\Branding\Set-SguWelcomeWallpaper.ps1',
[string]$WelcomeWallpaperBasePath = 'C:\ProgramData\SGU\Branding\darkblue.jpg' [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'
) )
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
@@ -81,9 +84,12 @@ $runPolicyKey = 'HKLM\Software\Microsoft\Windows\CurrentVersion\Run'
$personalizationPolicyKey = 'HKLM\Software\Policies\Microsoft\Windows\Personalization' $personalizationPolicyKey = 'HKLM\Software\Policies\Microsoft\Windows\Personalization'
$personalizationCspKey = 'HKLM\Software\Microsoft\Windows\CurrentVersion\PersonalizationCSP' $personalizationCspKey = 'HKLM\Software\Microsoft\Windows\CurrentVersion\PersonalizationCSP'
$cloudContentPolicyKey = 'HKLM\Software\Policies\Microsoft\Windows\CloudContent' $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}' $providerClassId = '{D789CFD8-5AD4-489F-9B83-7EB5D9D09335}'
$welcomeWallpaperCommand = 'powershell.exe -NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File "{0}" -BaseImagePath "{1}"' -f ` $welcomeWallpaperCommand = 'powershell.exe -NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File "{0}" -BaseImagePath "{1}" -AdministrativeBaseImagePath "{2}" -ProfessorBaseImagePath "{3}"' -f `
$WelcomeWallpaperScriptPath,$WelcomeWallpaperBasePath $WelcomeWallpaperScriptPath,$WelcomeWallpaperBasePath,$WelcomeAdministrativeWallpaperBasePath,$WelcomeProfessorWallpaperBasePath
$policies = @( $policies = @(
@{ Key = $dataCollectionKey; Name = 'AllowTelemetry'; Type = 'DWord'; Value = 0 }, @{ Key = $dataCollectionKey; Name = 'AllowTelemetry'; Type = 'DWord'; Value = 0 },
@{ Key = $dataCollectionKey; Name = 'DisableTelemetryOptInSettingsUx'; Type = 'DWord'; Value = 1 }, @{ Key = $dataCollectionKey; Name = 'DisableTelemetryOptInSettingsUx'; Type = 'DWord'; Value = 1 },
@@ -113,17 +119,30 @@ $policies = @(
# The machine GPO remains the authority for every interactive session. The # The machine GPO remains the authority for every interactive session. The
# local payload lets the first desktop render without depending on SMB. # local payload lets the first desktop render without depending on SMB.
@{ Key = $runPolicyKey; Name = 'SGUWelcomeWallpaper'; Type = 'String'; Value = $welcomeWallpaperCommand }, @{ Key = $runPolicyKey; Name = 'SGUWelcomeWallpaper'; Type = 'String'; Value = $welcomeWallpaperCommand },
@{ Key = $personalizationPolicyKey; Name = 'LockScreenImage'; Type = 'String'; Value = $WelcomeWallpaperBasePath }, @{ Key = $personalizationPolicyKey; Name = 'LockScreenImage'; Type = 'String'; Value = $WelcomeLockScreenBasePath },
@{ Key = $personalizationPolicyKey; Name = 'NoChangingLockScreen'; Type = 'DWord'; Value = 1 }, @{ Key = $personalizationPolicyKey; Name = 'NoChangingLockScreen'; Type = 'DWord'; Value = 1 },
# Windows 11 Pro can ignore the legacy lock-screen policy even though it is # Windows 11 Pro can ignore the legacy lock-screen policy even though it is
# present in the registry. PersonalizationCSP provides the same local image # present in the registry. PersonalizationCSP provides the same local image
# to Pro while remaining harmless on Enterprise and LTSC editions. # to Pro while remaining harmless on Enterprise and LTSC editions.
@{ Key = $personalizationCspKey; Name = 'LockScreenImagePath'; Type = 'String'; Value = $WelcomeWallpaperBasePath }, @{ Key = $personalizationCspKey; Name = 'LockScreenImagePath'; Type = 'String'; Value = $WelcomeLockScreenBasePath },
@{ Key = $personalizationCspKey; Name = 'LockScreenImageUrl'; Type = 'String'; Value = $WelcomeWallpaperBasePath }, @{ Key = $personalizationCspKey; Name = 'LockScreenImageUrl'; Type = 'String'; Value = $WelcomeLockScreenBasePath },
@{ Key = $personalizationCspKey; Name = 'LockScreenImageStatus'; Type = 'DWord'; Value = 1 }, @{ Key = $personalizationCspKey; Name = 'LockScreenImageStatus'; Type = 'DWord'; Value = 1 },
@{ Key = $cloudContentPolicyKey; Name = 'DisableWindowsSpotlightFeatures'; Type = 'DWord'; Value = 1 }, @{ Key = $cloudContentPolicyKey; Name = 'DisableWindowsSpotlightFeatures'; Type = 'DWord'; Value = 1 },
@{ Key = $cloudContentPolicyKey; Name = 'DisableWindowsSpotlightOnLockScreen'; Type = 'DWord'; Value = 1 } @{ Key = $cloudContentPolicyKey; Name = 'DisableWindowsSpotlightOnLockScreen'; Type = 'DWord'; Value = 1 },
# Shared laboratory machines should open Edge without consumer onboarding,
# 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 },
# 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 = @( $powerSettingIds = @(
@@ -176,6 +195,8 @@ $linkEnabled = $link -and (
PolicyCount = $configuredPolicies.Count PolicyCount = $configuredPolicies.Count
EventCollector = $EventCollectorFqdn EventCollector = $EventCollectorFqdn
WelcomeWallpaperCommand = $welcomeWallpaperCommand WelcomeWallpaperCommand = $welcomeWallpaperCommand
LockScreenImage = $WelcomeWallpaperBasePath WelcomeAdministrativeWallpaper = $WelcomeAdministrativeWallpaperBasePath
WelcomeProfessorWallpaper = $WelcomeProfessorWallpaperBasePath
LockScreenImage = $WelcomeLockScreenBasePath
Policies = [pscustomobject]$configuredPolicies Policies = [pscustomobject]$configuredPolicies
} }
+19
View File
@@ -10,6 +10,7 @@ param(
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
$policyKey = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System' $policyKey = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'
$policyValueName = 'DisableLockWorkstation' $policyValueName = 'DisableLockWorkstation'
$disableChangePasswordValueName = 'DisableChangePassword'
$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' $themeKey = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize'
@@ -76,6 +77,17 @@ if ($PSCmdlet.ShouldProcess($GpoName, 'Prevent SGU users from manually locking w
-Type DWord ` -Type DWord `
-Value 1 | Out-Null -Value 1 | Out-Null
# The directory ACL remains the security boundary. This user policy also
# removes the unusable Change a password action from Ctrl+Alt+Delete.
Set-GPRegistryValue `
-Name $GpoName `
-Domain $domainName `
-Server $DomainController `
-Key $policyKey `
-ValueName $disableChangePasswordValueName `
-Type DWord `
-Value 1 | Out-Null
Set-GPRegistryValue ` Set-GPRegistryValue `
-Name $GpoName ` -Name $GpoName `
-Domain $domainName ` -Domain $domainName `
@@ -135,6 +147,12 @@ $configuredValue = Get-GPRegistryValue `
-Server $DomainController ` -Server $DomainController `
-Key $policyKey ` -Key $policyKey `
-ValueName $policyValueName -ValueName $policyValueName
$disableChangePasswordValue = Get-GPRegistryValue `
-Name $GpoName `
-Domain $domainName `
-Server $DomainController `
-Key $policyKey `
-ValueName $disableChangePasswordValueName
$screenSaverValue = Get-GPRegistryValue ` $screenSaverValue = Get-GPRegistryValue `
-Name $GpoName ` -Name $GpoName `
-Domain $domainName ` -Domain $domainName `
@@ -175,6 +193,7 @@ if ($WallpaperPath) {
TargetOu = $TargetOuDn TargetOu = $TargetOuDn
LinkEnabled = [bool]$linkEnabled LinkEnabled = [bool]$linkEnabled
DisableLockWorkstation = [int]$configuredValue.Value DisableLockWorkstation = [int]$configuredValue.Value
DisableChangePassword = [int]$disableChangePasswordValue.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) DarkMode = ([int]$appsThemeValue.Value -eq 0) -and ([int]$systemThemeValue.Value -eq 0)
Wallpaper = $configuredWallpaper Wallpaper = $configuredWallpaper
@@ -25,14 +25,17 @@ if ($gpo) {
} }
else { else {
$gpo = New-GPO -Name $GpoName -Domain $domainName -Server $DomainController ` $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. The
# These are user policies scoped by the computer OU, not by the user OU. # 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. # Match the per-user/per-computer output of Set-SguWelcomeWallpaper.ps1.
$settings = @( $settings = @(
@{ Key = 'HKLM\Software\Policies\Microsoft\Windows\System'; Name = 'UserPolicyMode'; Type = 'DWord'; Value = 1 }, @{ 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\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 = 'Wallpaper'; Type = 'ExpandString'; Value = $WallpaperPath },
@{ Key = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'; Name = 'WallpaperStyle'; Type = 'String'; Value = '10' } @{ Key = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'; Name = 'WallpaperStyle'; Type = 'String'; Value = '10' }
) )
@@ -70,6 +73,7 @@ foreach ($setting in $settings) {
TargetOuDn = $TargetOuDn TargetOuDn = $TargetOuDn
WallpaperPath = $WallpaperPath WallpaperPath = $WallpaperPath
Loopback = 'Merge' Loopback = 'Merge'
DisableLockWorkstationForAllUsers = $true
Enforced = $true Enforced = $true
BackupPath = $backupPath BackupPath = $backupPath
} }
+148 -14
View File
@@ -2,6 +2,8 @@
[CmdletBinding()] [CmdletBinding()]
param( param(
[string]$BaseImagePath = (Join-Path $env:ProgramData 'SGU\Branding\darkblue.jpg'), [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]$FontsPath = (Join-Path $env:ProgramData 'SGU\Branding\fonts'),
[string]$OutputPath, [string]$OutputPath,
[string]$DisplayName, [string]$DisplayName,
@@ -10,6 +12,8 @@ param(
[string]$OrganizationalUnit, [string]$OrganizationalUnit,
[ValidateSet('Male', 'Female')] [ValidateSet('Male', 'Female')]
[string]$Gender, [string]$Gender,
[ValidateSet('Administrative', 'Professor')]
[string]$InstitutionalRole,
[ValidateRange(640, 16384)] [ValidateRange(640, 16384)]
[int]$CanvasWidth, [int]$CanvasWidth,
[ValidateRange(480, 16384)] [ValidateRange(480, 16384)]
@@ -189,7 +193,7 @@ function Get-WelcomeLocationText {
$located = switch ($Gender) { $located = switch ($Gender) {
'Male' { 'Est{0}s ubicado en' -f [char]0x00E1 } 'Male' { 'Est{0}s ubicado en' -f [char]0x00E1 }
'Female' { 'Est{0}s ubicada en' -f [char]0x00E1 } 'Female' { 'Est{0}s ubicada en' -f [char]0x00E1 }
default { 'Ubicaci{0}n:' -f [char]0x00F3 } default { $null }
} }
$engineeringLab = switch ($Gender) { $engineeringLab = switch ($Gender) {
'Male' { 'Bienvenido al Laboratorio de C{0}mputo de Ingenier{1}a.' -f [char]0x00F3,[char]0x00ED } 'Male' { 'Bienvenido al Laboratorio de C{0}mputo de Ingenier{1}a.' -f [char]0x00F3,[char]0x00ED }
@@ -202,7 +206,10 @@ function Get-WelcomeLocationText {
if ($Room -and $OuName) { if ($Room -and $OuName) {
$roomArticle = Get-SpanishArticle -Value $Room $roomArticle = Get-SpanishArticle -Value $Room
$ouArticle = Get-SpanishArticle -Value $OuName $ouArticle = Get-SpanishArticle -Value $OuName
$roomPhrase = if ($roomArticle -eq 'el') { $roomPhrase = if ($Gender) {
if ($roomArticle) { "$roomArticle $Room" } else { $Room }
}
elseif ($roomArticle -eq 'el') {
"al $Room" "al $Room"
} }
elseif ($roomArticle) { elseif ($roomArticle) {
@@ -212,18 +219,27 @@ function Get-WelcomeLocationText {
"a $Room" "a $Room"
} }
$ouPhrase = if ($ouArticle -eq 'el') { "del $OuName" } elseif ($ouArticle) { "de $ouArticle $OuName" } else { "de $OuName" } $ouPhrase = if ($ouArticle -eq 'el') { "del $OuName" } elseif ($ouArticle) { "de $ouArticle $OuName" } else { "de $OuName" }
return "Acceso $roomPhrase $ouPhrase." $primary = if ($Gender) { "$located $roomPhrase" } else { "Acceso $roomPhrase" }
return "$primary`n$ouPhrase."
} }
if ($Room) { if ($Room) {
$article = Get-SpanishArticle -Value $Room $article = Get-SpanishArticle -Value $Room
if ($Gender) {
$phrase = if ($article) { "$article $Room" } else { $Room } $phrase = if ($article) { "$article $Room" } else { $Room }
return "$located $phrase." return "$located $phrase."
} }
$destination = if ($article -eq 'el') { "al $Room" } elseif ($article) { "a $article $Room" } else { "a $Room" }
return "Acceso $destination."
}
if ($OuName) { if ($OuName) {
$article = Get-SpanishArticle -Value $OuName $article = Get-SpanishArticle -Value $OuName
if ($Gender) {
$phrase = if ($article) { "$article $OuName" } else { $OuName } $phrase = if ($article) { "$article $OuName" } else { $OuName }
return "$located $phrase." return "$located $phrase."
} }
$destination = if ($article -eq 'el') { "al $OuName" } elseif ($article) { "a $article $OuName" } else { "a $OuName" }
return "Acceso $destination."
}
return $engineeringLab return $engineeringLab
} }
@@ -237,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 { function Get-AvailableFontFamily {
param( param(
[Parameter(Mandatory)][string[]]$Candidates, [Parameter(Mandatory)][string[]]$Candidates,
@@ -299,10 +401,6 @@ trap {
throw throw
} }
if (-not (Test-Path -LiteralPath $BaseImagePath -PathType Leaf)) {
throw "The welcome wallpaper base image does not exist: $BaseImagePath"
}
$userName = [Environment]::UserName $userName = [Environment]::UserName
$metadata = $null $metadata = $null
$machineLocation = [Environment]::GetEnvironmentVariable('SGU_WELCOME_LOCATION', 'Machine') $machineLocation = [Environment]::GetEnvironmentVariable('SGU_WELCOME_LOCATION', 'Machine')
@@ -328,6 +426,22 @@ if (-not $PSBoundParameters.ContainsKey('DisplayName')) {
if (-not $DisplayName) { if (-not $DisplayName) {
$DisplayName = $userName $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')) { if (-not $PSBoundParameters.ContainsKey('Location')) {
$Location = if ($machineLocation) { $machineLocation } elseif ($metadata) { $metadata.Location } else { $null } $Location = if ($machineLocation) { $machineLocation } elseif ($metadata) { $metadata.Location } else { $null }
} }
@@ -350,6 +464,9 @@ if (-not $PSBoundParameters.ContainsKey('OrganizationalUnit')) {
} }
} }
$locationText = Get-WelcomeLocationText -Room $Location -OuName $OrganizationalUnit -Gender $Gender $locationText = Get-WelcomeLocationText -Room $Location -OuName $OrganizationalUnit -Gender $Gender
$locationLines = @($locationText -split '\r?\n', 2)
$locationPrimaryText = $locationLines[0]
$locationSecondaryText = if ($locationLines.Count -gt 1) { $locationLines[1] } else { $null }
if (-not $CanvasWidth -or -not $CanvasHeight) { if (-not $CanvasWidth -or -not $CanvasHeight) {
try { try {
@@ -371,7 +488,7 @@ if (-not $OutputPath) {
} }
New-Item -ItemType Directory -Path (Split-Path $OutputPath -Parent) -Force | Out-Null 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) $canvas = [Drawing.Bitmap]::new($CanvasWidth, $CanvasHeight, [Drawing.Imaging.PixelFormat]::Format24bppRgb)
try { try {
$graphics = [Drawing.Graphics]::FromImage($canvas) $graphics = [Drawing.Graphics]::FromImage($canvas)
@@ -409,10 +526,11 @@ try {
$panelHeight = [single](310 * $scale) $panelHeight = [single](310 * $scale)
$panelX = [single](($CanvasWidth - $panelWidth) / 2) $panelX = [single](($CanvasWidth - $panelWidth) / 2)
$panelY = [single]($CanvasHeight * 0.50 - ($panelHeight / 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) $whiteBrush = [Drawing.SolidBrush]::new([Drawing.Color]::White)
$accentBrush = [Drawing.SolidBrush]::new([Drawing.Color]::FromArgb(255, 211, 226, 255)) $accentBrush = [Drawing.SolidBrush]::new($palette.Accent)
$linePen = [Drawing.Pen]::new([Drawing.Color]::FromArgb(155, 211, 226, 255), [single](2 * $scale)) $linePen = [Drawing.Pen]::new($palette.Line, [single](2 * $scale))
$privateFonts = [Drawing.Text.PrivateFontCollection]::new() $privateFonts = [Drawing.Text.PrivateFontCollection]::new()
if (Test-Path -LiteralPath $FontsPath -PathType Container) { if (Test-Path -LiteralPath $FontsPath -PathType Container) {
foreach ($fontFile in Get-ChildItem -LiteralPath $FontsPath -File | foreach ($fontFile in Get-ChildItem -LiteralPath $FontsPath -File |
@@ -436,6 +554,8 @@ try {
-PreferredStyle ([Drawing.FontStyle]::Bold -bor [Drawing.FontStyle]::Italic) -PreferredStyle ([Drawing.FontStyle]::Bold -bor [Drawing.FontStyle]::Italic)
$locationFont = New-WelcomeFont -Family $sansFamily -Size ([single](27 * $scale)) ` $locationFont = New-WelcomeFont -Family $sansFamily -Size ([single](27 * $scale)) `
-PreferredStyle ([Drawing.FontStyle]::Regular) -PreferredStyle ([Drawing.FontStyle]::Regular)
$locationSecondaryFont = New-WelcomeFont -Family $sansFamily -Size ([single](20 * $scale)) `
-PreferredStyle ([Drawing.FontStyle]::Regular)
$format = [Drawing.StringFormat]::new() $format = [Drawing.StringFormat]::new()
$format.Alignment = [Drawing.StringAlignment]::Center $format.Alignment = [Drawing.StringAlignment]::Center
$format.LineAlignment = [Drawing.StringAlignment]::Center $format.LineAlignment = [Drawing.StringAlignment]::Center
@@ -447,11 +567,20 @@ try {
Draw-CenteredText -Graphics $graphics -Text $DisplayName -Font $nameFont ` Draw-CenteredText -Graphics $graphics -Text $DisplayName -Font $nameFont `
-Brush $whiteBrush -Bounds ([Drawing.RectangleF]::new($panelX + 30*$scale, $panelY + 64*$scale, $panelWidth - 60*$scale, 105*$scale)) -Format $format -Brush $whiteBrush -Bounds ([Drawing.RectangleF]::new($panelX + 30*$scale, $panelY + 64*$scale, $panelWidth - 60*$scale, 105*$scale)) -Format $format
$graphics.DrawLine($linePen, $panelX + 150*$scale, $panelY + 180*$scale, $panelX + $panelWidth - 150*$scale, $panelY + 180*$scale) $graphics.DrawLine($linePen, $panelX + 150*$scale, $panelY + 180*$scale, $panelX + $panelWidth - 150*$scale, $panelY + 180*$scale)
Draw-CenteredText -Graphics $graphics -Text $locationText -Font $locationFont ` if ($locationSecondaryText) {
-Brush $accentBrush -Bounds ([Drawing.RectangleF]::new($panelX + 60*$scale, $panelY + 190*$scale, $panelWidth - 120*$scale, 94*$scale)) -Format $format Draw-CenteredText -Graphics $graphics -Text $locationPrimaryText -Font $locationFont `
-Brush $accentBrush -Bounds ([Drawing.RectangleF]::new($panelX + 60*$scale, $panelY + 190*$scale, $panelWidth - 120*$scale, 46*$scale)) -Format $format
Draw-CenteredText -Graphics $graphics -Text $locationSecondaryText -Font $locationSecondaryFont `
-Brush $accentBrush -Bounds ([Drawing.RectangleF]::new($panelX + 60*$scale, $panelY + 235*$scale, $panelWidth - 120*$scale, 38*$scale)) -Format $format
}
else {
Draw-CenteredText -Graphics $graphics -Text $locationPrimaryText -Font $locationFont `
-Brush $accentBrush -Bounds ([Drawing.RectangleF]::new($panelX + 60*$scale, $panelY + 195*$scale, $panelWidth - 120*$scale, 78*$scale)) -Format $format
}
} }
finally { finally {
$format.Dispose() $format.Dispose()
$locationSecondaryFont.Dispose()
$locationFont.Dispose() $locationFont.Dispose()
$nameFont.Dispose() $nameFont.Dispose()
$welcomeFont.Dispose() $welcomeFont.Dispose()
@@ -510,15 +639,20 @@ namespace Sgu {
} }
$genderLogValue = if ($Gender) { $Gender } else { 'Neutral' } $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]@{ [pscustomobject]@{
DisplayName = $DisplayName DisplayName = $DisplayName
ComputerName = $ComputerName ComputerName = $ComputerName
Location = $Location Location = $Location
OrganizationalUnit = $OrganizationalUnit OrganizationalUnit = $OrganizationalUnit
Gender = $Gender Gender = $Gender
InstitutionalRole = $InstitutionalRole
BaseImagePath = $selectedBaseImagePath
WelcomeHeading = $welcomeHeading WelcomeHeading = $welcomeHeading
LocationText = $locationText LocationText = $locationText
LocationPrimaryText = $locationPrimaryText
LocationSecondaryText = $locationSecondaryText
OutputPath = $OutputPath OutputPath = $OutputPath
Applied = -not $SkipApply Applied = -not $SkipApply
} }
+106 -18
View File
@@ -8,6 +8,8 @@ set -uo pipefail
CONFIG_PATH=${SGU_WELCOME_CONFIG:-/etc/sgu/welcome-wallpaper.conf} CONFIG_PATH=${SGU_WELCOME_CONFIG:-/etc/sgu/welcome-wallpaper.conf}
INSTALL_ROOT=${SGU_WELCOME_ROOT:-/usr/local/lib/sgu-welcome-wallpaper} INSTALL_ROOT=${SGU_WELCOME_ROOT:-/usr/local/lib/sgu-welcome-wallpaper}
BASE_IMAGE=${SGU_WELCOME_BASE_IMAGE:-${INSTALL_ROOT}/darkblue.jpg} 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 if [[ -r $CONFIG_PATH ]]; then
# The root-owned file contains only deployment metadata, never credentials. # The root-owned file contains only deployment metadata, never credentials.
@@ -32,8 +34,6 @@ fail_softly() {
exit 0 exit 0
} }
[[ -r $BASE_IMAGE ]] || fail_softly "Missing base image: $BASE_IMAGE"
if command -v magick >/dev/null 2>&1; then if command -v magick >/dev/null 2>&1; then
image_command=(magick) image_command=(magick)
elif command -v convert >/dev/null 2>&1; then 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] }') 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 [[ -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=$(hostname -s 2>/dev/null || true)
computer_name=${computer_name^^} computer_name=${computer_name^^}
location='' location=''
@@ -129,8 +163,8 @@ fi
article_for() { article_for() {
local value=${1,,} local value=${1,,}
case "$value" in case "$value" in
sala*|aula*|facultad*|unidad*|biblioteca*|oficina*|coordinación*) printf la ;; sala*|facultad*|unidad*|biblioteca*|oficina*|coordinación*) printf la ;;
laboratorio*|centro*|edificio*|campus*|taller*|auditorio*) printf el ;; aula*|laboratorio*|centro*|edificio*|campus*|taller*|auditorio*) printf el ;;
*) printf '' ;; *) printf '' ;;
esac esac
} }
@@ -159,29 +193,60 @@ case "$gender" in
;; ;;
*) *)
welcome_text='Te damos la bienvenida,' welcome_text='Te damos la bienvenida,'
located_text='Ubicación:' located_text=''
engineering_lab_text='Acceso al Laboratorio de Cómputo de Ingeniería.' engineering_lab_text='Acceso al Laboratorio de Cómputo de Ingeniería.'
;; ;;
esac esac
location_primary=''
location_secondary=''
if [[ -n $location && -n $organizational_unit ]]; then if [[ -n $location && -n $organizational_unit ]]; then
room_article=$(article_for "$location")
if [[ -n $gender ]]; then
room_phrase=$(with_article "$location") room_phrase=$(with_article "$location")
location_primary="${located_text} ${room_phrase}"
elif [[ $room_article == el ]]; then
location_primary="Acceso al ${location}"
elif [[ -n $room_article ]]; then
location_primary="Acceso a ${room_article} ${location}"
else
location_primary="Acceso a ${location}"
fi
ou_article=$(article_for "$organizational_unit") ou_article=$(article_for "$organizational_unit")
if [[ $ou_article == el ]]; then if [[ $ou_article == el ]]; then
ou_phrase="del ${organizational_unit}" location_secondary="del ${organizational_unit}."
elif [[ -n $ou_article ]]; then elif [[ -n $ou_article ]]; then
ou_phrase="de ${ou_article} ${organizational_unit}" location_secondary="de ${ou_article} ${organizational_unit}."
else else
ou_phrase="de ${organizational_unit}" location_secondary="de ${organizational_unit}."
fi fi
location_text="${located_text} ${room_phrase} ${ou_phrase}."
elif [[ -n $location ]]; then elif [[ -n $location ]]; then
location_text="${located_text} $(with_article "$location")." room_article=$(article_for "$location")
elif [[ -n $organizational_unit ]]; then if [[ -n $gender ]]; then
location_text="${located_text} $(with_article "$organizational_unit")." location_primary="${located_text} $(with_article "$location")."
elif [[ $room_article == el ]]; then
location_primary="Acceso al ${location}."
elif [[ -n $room_article ]]; then
location_primary="Acceso a ${room_article} ${location}."
else else
location_text=$engineering_lab_text location_primary="Acceso a ${location}."
fi fi
elif [[ -n $organizational_unit ]]; then
ou_article=$(article_for "$organizational_unit")
if [[ -n $gender ]]; then
location_primary="${located_text} $(with_article "$organizational_unit")."
elif [[ $ou_article == el ]]; then
location_primary="Acceso al ${organizational_unit}."
elif [[ -n $ou_article ]]; then
location_primary="Acceso a ${ou_article} ${organizational_unit}."
else
location_primary="Acceso a ${organizational_unit}."
fi
else
location_primary=$engineering_lab_text
fi
location_text=$location_primary
[[ -n $location_secondary ]] && location_text+=$'\n'"$location_secondary"
width=1600 width=1600
height=1000 height=1000
@@ -202,6 +267,7 @@ scale=$(( height * 100 / 1000 ))
welcome_size=$(( 34 * scale / 100 )) welcome_size=$(( 34 * scale / 100 ))
name_size=$(( 70 * scale / 100 )) name_size=$(( 70 * scale / 100 ))
location_size=$(( 27 * scale / 100 )) location_size=$(( 27 * scale / 100 ))
location_secondary_size=$(( 20 * scale / 100 ))
panel_width=$(( width * 76 / 100 )) panel_width=$(( width * 76 / 100 ))
panel_height=$(( 310 * scale / 100 )) panel_height=$(( 310 * scale / 100 ))
panel_x1=$(( (width - panel_width) / 2 )) panel_x1=$(( (width - panel_width) / 2 ))
@@ -232,17 +298,39 @@ if [[ $serif_font == DejaVu-Serif ]] && command -v fc-list >/dev/null 2>&1; then
fi fi
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 "$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 "$accent_color" -stroke none -annotate "+0+$(( 116 * scale / 100 ))" "$location_secondary"
)
fi
if ! "${image_command[@]}" "$BASE_IMAGE" \ if ! "${image_command[@]}" "$BASE_IMAGE" \
-resize "${width}x${height}^" -gravity center -extent "${width}x${height}" \ -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 \ -gravity center \
-font "$sans_font" -weight 700 -style Normal -pointsize "$welcome_size" \ -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" \ -annotate "+0-$(( 92 * scale / 100 ))" "$welcome_text" \
-font "$serif_font" -weight 700 -style Italic -pointsize "$name_size" \ -font "$serif_font" -weight 700 -style Italic -pointsize "$name_size" \
-fill white -annotate "+0-$(( 22 * scale / 100 ))" "$display_name" \ -fill white -annotate "+0-$(( 22 * scale / 100 ))" "$display_name" \
-font "$sans_font" -weight 400 -style Normal -pointsize "$location_size" \ "${location_annotations[@]}" \
-fill '#D3E2FF' -annotate "+0+$(( 88 * scale / 100 ))" "$location_text" \
-quality 94 "$output_path" 2>>"$log_path"; then -quality 94 "$output_path" 2>>"$log_path"; then
fail_softly 'ImageMagick could not render the welcome wallpaper.' fail_softly 'ImageMagick could not render the welcome wallpaper.'
fi fi
@@ -270,7 +358,7 @@ if [[ $applied == false ]] && command -v xfconf-query >/dev/null 2>&1; then
fi fi
if [[ $applied == true ]]; then 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 else
log_message 'WARN Wallpaper rendered, but no supported desktop background API was found.' log_message 'WARN Wallpaper rendered, but no supported desktop background API was found.'
fi fi
+1
View File
@@ -22,4 +22,5 @@ internal static class BrokerEventIds
internal static readonly EventId DirectoryOptionalMetadataFailure = new(1301, nameof(DirectoryOptionalMetadataFailure)); internal static readonly EventId DirectoryOptionalMetadataFailure = new(1301, nameof(DirectoryOptionalMetadataFailure));
internal static readonly EventId DirectoryGroupMembershipFailure = new(1302, nameof(DirectoryGroupMembershipFailure)); internal static readonly EventId DirectoryGroupMembershipFailure = new(1302, nameof(DirectoryGroupMembershipFailure));
internal static readonly EventId DirectoryRoleGroupMembershipAdded = new(1303, nameof(DirectoryRoleGroupMembershipAdded)); internal static readonly EventId DirectoryRoleGroupMembershipAdded = new(1303, nameof(DirectoryRoleGroupMembershipAdded));
internal static readonly EventId DirectoryPasswordChangeDenied = new(1304, nameof(DirectoryPasswordChangeDenied));
} }
@@ -1,5 +1,7 @@
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.DirectoryServices; using System.DirectoryServices;
using System.Security.AccessControl;
using System.Security.Principal;
using SGU.AuthBroker.Core.Directory; using SGU.AuthBroker.Core.Directory;
using SGU.AuthBroker.Core.Identity; using SGU.AuthBroker.Core.Identity;
using SGU.AuthBroker.Core.Profiles; using SGU.AuthBroker.Core.Profiles;
@@ -15,6 +17,12 @@ public sealed class ActiveDirectorySynchronizer(
private const int InfoAttributeMaximumLength = 1024; private const int InfoAttributeMaximumLength = 1024;
private const int AccountDisabled = 0x0002; private const int AccountDisabled = 0x0002;
private const int NormalAccount = 0x0200; private const int NormalAccount = 0x0200;
private static readonly Guid ChangePasswordExtendedRight =
new("AB721A53-1E2F-11D0-9819-00AA0040529B");
private static readonly SecurityIdentifier EveryoneSid =
new(WellKnownSidType.WorldSid, null);
private static readonly SecurityIdentifier SelfSid =
new(WellKnownSidType.SelfSid, null);
private static readonly AuthenticationTypes BindFlags = private static readonly AuthenticationTypes BindFlags =
AuthenticationTypes.Secure | AuthenticationTypes.Signing | AuthenticationTypes.Sealing; AuthenticationTypes.Secure | AuthenticationTypes.Signing | AuthenticationTypes.Sealing;
@@ -117,6 +125,12 @@ public sealed class ActiveDirectorySynchronizer(
// account without its required classification. // account without its required classification.
EnsureRoleGroupMembership(user, identity); EnsureRoleGroupMembership(user, identity);
// SGU remains the password authority. Deny the user's Change
// Password extended right before making the account usable. This
// does not deny the broker's administrative Reset Password right,
// which ADSI SetPassword uses for each successful authentication.
EnsureCannotChangePassword(user, identity.UserName);
// The exact institutional password received by the broker is passed to AD. // The exact institutional password received by the broker is passed to AD.
// It is not derived, transformed, written to disk, or included in logs. // It is not derived, transformed, written to disk, or included in logs.
user.Invoke("SetPassword", [password]); user.Invoke("SetPassword", [password]);
@@ -143,6 +157,52 @@ public sealed class ActiveDirectorySynchronizer(
} }
} }
private void EnsureCannotChangePassword(DirectoryEntry user, string institutionalUser)
{
user.Options!.SecurityMasks = SecurityMasks.Dacl;
ActiveDirectorySecurity security = user.ObjectSecurity;
if (!EnsureCannotChangePassword(security))
{
return;
}
user.ObjectSecurity = security;
user.CommitChanges();
logger.LogInformation(
BrokerEventIds.DirectoryPasswordChangeDenied,
"Denied direct password changes for managed Active Directory user {InstitutionalUser}; SGU Auth Broker remains the password authority.",
institutionalUser);
}
internal static bool EnsureCannotChangePassword(ActiveDirectorySecurity security)
{
bool changed = false;
foreach (SecurityIdentifier identity in new[] { EveryoneSid, SelfSid })
{
bool exists = security
.GetAccessRules(includeExplicit: true, includeInherited: false, typeof(SecurityIdentifier))
.OfType<ActiveDirectoryAccessRule>()
.Any(rule =>
rule.AccessControlType == AccessControlType.Deny &&
rule.IdentityReference.Equals(identity) &&
rule.ObjectType == ChangePasswordExtendedRight &&
(rule.ActiveDirectoryRights & ActiveDirectoryRights.ExtendedRight) != 0);
if (exists)
{
continue;
}
security.AddAccessRule(new ActiveDirectoryAccessRule(
identity,
ActiveDirectoryRights.ExtendedRight,
AccessControlType.Deny,
ChangePasswordExtendedRight));
changed = true;
}
return changed;
}
private static void TryApplyProfile( private static void TryApplyProfile(
DirectoryEntry user, DirectoryEntry user,
UserIdentity identity, UserIdentity identity,
@@ -0,0 +1,28 @@
$repositoryRoot = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
$synchronizerPath = Join-Path $repositoryRoot 'src\SGU.AuthBroker\Services\ActiveDirectorySynchronizer.cs'
$deployPath = Join-Path $repositoryRoot 'scripts\Deploy-AuthBroker.ps1'
$userPolicyPath = Join-Path $repositoryRoot 'scripts\Set-SguDomainUserPolicies.ps1'
$synchronizer = Get-Content -LiteralPath $synchronizerPath -Raw
$deploy = Get-Content -LiteralPath $deployPath -Raw
$userPolicy = Get-Content -LiteralPath $userPolicyPath -Raw
Describe 'SGU Auth Broker password authority' {
It 'denies the Change Password extended right to SELF and Everyone before SetPassword' {
$synchronizer | Should Match 'AB721A53-1E2F-11D0-9819-00AA0040529B'
$synchronizer | Should Match 'WellKnownSidType\.WorldSid'
$synchronizer | Should Match 'WellKnownSidType\.SelfSid'
$synchronizer | Should Match 'AccessControlType\.Deny'
$synchronizer.IndexOf('EnsureCannotChangePassword(user', [StringComparison]::Ordinal) |
Should BeLessThan $synchronizer.IndexOf('user.Invoke("SetPassword"', [StringComparison]::Ordinal)
}
It 'repairs every existing account below Usuarios-SGU during broker deployment' {
$deploy | Should Match 'Get-ADUser.*-SearchBase \$usersOuDn.*-SearchScope Subtree'
$deploy | Should Match '(?s)Set-ADAccountControl.*-CannotChangePassword \$true'
}
It 'removes Change Password from the Windows security screen for managed users' {
$userPolicy | Should Match "disableChangePasswordValueName = 'DisableChangePassword'"
$userPolicy | Should Match '(?s)-ValueName \$disableChangePasswordValueName.*-Type DWord.*-Value 1'
}
}
+24
View File
@@ -83,4 +83,28 @@ Describe 'SGU Windows client enrollment scripts' {
(Get-Content -LiteralPath $computerPolicyScriptPath -Raw) | (Get-Content -LiteralPath $computerPolicyScriptPath -Raw) |
Should Match "Name = 'HideFastUserSwitching'; Type = 'DWord'; Value = 1" Should Match "Name = 'HideFastUserSwitching'; Type = 'DWord'; Value = 1"
} }
It 'separates the clean lock screen base from the branded desktop base' {
$installerSource = Get-Content -LiteralPath $credentialProviderInstallerPath -Raw
$policySource = Get-Content -LiteralPath $computerPolicyScriptPath -Raw
$packageSource = Get-Content -LiteralPath $packageScriptPath -Raw
$installerSource | Should Match 'darkblue-lockscreen\.jpg'
$packageSource | Should Match 'darkblue-lockscreen\.jpg'
$policySource | Should Match "LockScreenImage.*WelcomeLockScreenBasePath"
$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'
}
} }
+21
View File
@@ -0,0 +1,21 @@
$repositoryRoot = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
$policyPath = Join-Path $repositoryRoot 'scripts\Set-SguDomainComputerPolicies.ps1'
$packagePath = Join-Path $repositoryRoot 'scripts\New-SguBootstrapPackages.ps1'
$initializePath = Join-Path $repositoryRoot 'scripts\Initialize-SguDomainController.ps1'
$policy = Get-Content -LiteralPath $policyPath -Raw
$package = Get-Content -LiteralPath $packagePath -Raw
$initialize = Get-Content -LiteralPath $initializePath -Raw
Describe 'Managed Microsoft Edge laboratory policy' {
It 'suppresses onboarding, browser sign-in and cloud sync through mandatory machine policy' {
$policy | Should Match "edgePolicyKey = 'HKLM\\Software\\Policies\\Microsoft\\Edge'"
$policy | Should Match "Name = 'HideFirstRunExperience'; Type = 'DWord'; Value = 1"
$policy | Should Match "Name = 'BrowserSignin'; Type = 'DWord'; Value = 0"
$policy | Should Match "Name = 'SyncDisabled'; Type = 'DWord'; Value = 1"
}
It 'ships the policy script and invokes it during server initialization' {
$package | Should Match "'Set-SguDomainComputerPolicies.ps1'"
$initialize | Should Match 'Join-Path \$scriptsRoot ''Set-SguDomainComputerPolicies.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 ([regex]::Escape('%LOCALAPPDATA%\SGU\Wallpapers\welcome-%COMPUTERNAME%.jpg'))
$policySource | Should Match "Name = 'Wallpaper'; Type = 'ExpandString'" $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' { 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')) { foreach ($command in @('Get-GPO', 'Backup-GPO', 'Set-GPLink', 'New-GPLink', 'Get-GPRegistryValue')) {
$policySource | Should Match ([regex]::Escape($command)) $policySource | Should Match ([regex]::Escape($command))
@@ -1,3 +1,6 @@
using System.DirectoryServices;
using System.Security.AccessControl;
using System.Security.Principal;
using SGU.AuthBroker.Core.Profiles; using SGU.AuthBroker.Core.Profiles;
using SGU.AuthBroker.Services; using SGU.AuthBroker.Services;
using Xunit; using Xunit;
@@ -31,4 +34,29 @@ public sealed class ActiveDirectorySynchronizerTests
Assert.Null(updated); Assert.Null(updated);
} }
[Fact]
public void CannotChangePasswordRulesAreCompleteAndIdempotent()
{
ActiveDirectorySecurity security = new();
Assert.True(ActiveDirectorySynchronizer.EnsureCannotChangePassword(security));
Assert.False(ActiveDirectorySynchronizer.EnsureCannotChangePassword(security));
Guid changePasswordRight = new("AB721A53-1E2F-11D0-9819-00AA0040529B");
ActiveDirectoryAccessRule[] rules = security
.GetAccessRules(includeExplicit: true, includeInherited: false, typeof(SecurityIdentifier))
.OfType<ActiveDirectoryAccessRule>()
.Where(rule =>
rule.AccessControlType == AccessControlType.Deny &&
rule.ObjectType == changePasswordRight &&
(rule.ActiveDirectoryRights & ActiveDirectoryRights.ExtendedRight) != 0)
.ToArray();
Assert.Equal(2, rules.Length);
Assert.Contains(rules, rule => rule.IdentityReference.Equals(
new SecurityIdentifier(WellKnownSidType.WorldSid, null)));
Assert.Contains(rules, rule => rule.IdentityReference.Equals(
new SecurityIdentifier(WellKnownSidType.SelfSid, null)));
}
} }
+33 -2
View File
@@ -2,6 +2,7 @@ $repositoryRoot = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
$bicepPath = Join-Path $repositoryRoot 'infra\azure\main.bicep' $bicepPath = Join-Path $repositoryRoot 'infra\azure\main.bicep'
$deploymentPath = Join-Path $repositoryRoot 'scripts\Deploy-SguAzureInfrastructure.ps1' $deploymentPath = Join-Path $repositoryRoot 'scripts\Deploy-SguAzureInfrastructure.ps1'
$configurationPath = Join-Path $repositoryRoot 'scripts\Enable-SguAzureUserRoaming.ps1' $configurationPath = Join-Path $repositoryRoot 'scripts\Enable-SguAzureUserRoaming.ps1'
$rollbackPath = Join-Path $repositoryRoot 'scripts\Disable-SguAzureUserRoaming.ps1'
$installerPath = Join-Path $repositoryRoot 'scripts\Install-SguFsLogix.ps1' $installerPath = Join-Path $repositoryRoot 'scripts\Install-SguFsLogix.ps1'
$gpoDeploymentPath = Join-Path $repositoryRoot 'scripts\Publish-SguFsLogixClientDeployment.ps1' $gpoDeploymentPath = Join-Path $repositoryRoot 'scripts\Publish-SguFsLogixClientDeployment.ps1'
$clientBootstrapPath = Join-Path $repositoryRoot 'scripts\Invoke-SguClientBootstrap.ps1' $clientBootstrapPath = Join-Path $repositoryRoot 'scripts\Invoke-SguClientBootstrap.ps1'
@@ -11,6 +12,7 @@ $packagePath = Join-Path $repositoryRoot 'scripts\New-SguBootstrapPackages.ps1'
foreach ($scriptPath in @( foreach ($scriptPath in @(
$deploymentPath, $deploymentPath,
$configurationPath, $configurationPath,
$rollbackPath,
$installerPath, $installerPath,
$gpoDeploymentPath, $gpoDeploymentPath,
$clientBootstrapPath, $clientBootstrapPath,
@@ -40,9 +42,9 @@ $samFunction = $configurationAst.Find({
Invoke-Expression $samFunction.Extent.Text Invoke-Expression $samFunction.Extent.Text
Describe 'SGU Azure user-roaming infrastructure' { Describe 'SGU Azure user-roaming infrastructure' {
It 'deploys dedicated private Azure Files resources by default' { It 'keeps roaming disabled by default while retaining optional private Azure Files resources' {
$source = Get-Content -LiteralPath $bicepPath -Raw $source = Get-Content -LiteralPath $bicepPath -Raw
$source | Should Match 'param deployUserRoaming bool = true' $source | Should Match 'param deployUserRoaming bool = false'
$source | Should Match "purpose: 'SGU-user-roaming'" $source | Should Match "purpose: 'SGU-user-roaming'"
$source | Should Match "publicNetworkAccess: 'Disabled'" $source | Should Match "publicNetworkAccess: 'Disabled'"
$source | Should Match "privateLinkServiceId: userRoamingStorageAccount.id" $source | Should Match "privateLinkServiceId: userRoamingStorageAccount.id"
@@ -63,6 +65,8 @@ Describe 'SGU Azure user-roaming infrastructure' {
$source = Get-Content -LiteralPath $deploymentPath -Raw $source = Get-Content -LiteralPath $deploymentPath -Raw
$source | Should Match '\$DeployUserRoaming -and -not \$DeployVpnGateway' $source | Should Match '\$DeployUserRoaming -and -not \$DeployVpnGateway'
$source | Should Match 'private Azure Files endpoint' $source | Should Match 'private Azure Files endpoint'
$source | Should Match '\$DeployUserRoaming -and -not \$AcknowledgeUserRoamingRisks'
$source | Should Match '\[bool\]\$DeployUserRoaming = \$false'
} }
It 'returns every post-domain setup value from the Azure deployment' { It 'returns every post-domain setup value from the Azure deployment' {
@@ -79,6 +83,12 @@ Describe 'SGU Azure user-roaming infrastructure' {
} }
Describe 'SGU role-specific roaming policies' { Describe 'SGU role-specific roaming policies' {
It 'requires an explicit risk acknowledgement before enabling roaming' {
$source = Get-Content -LiteralPath $configurationPath -Raw
$source | Should Match '\[switch\]\$AcknowledgeUserRoamingRisks'
$source | Should Match 'optional high-risk feature'
}
It 'supports an explicitly selected public SMB endpoint while keeping private as the default' { It 'supports an explicitly selected public SMB endpoint while keeping private as the default' {
(((Get-Command $configurationPath).Parameters['EndpointAccess'].Attributes | (((Get-Command $configurationPath).Parameters['EndpointAccess'].Attributes |
Where-Object { $_ -is [Management.Automation.ValidateSetAttribute] }).ValidValues -join ',') | Where-Object { $_ -is [Management.Automation.ValidateSetAttribute] }).ValidValues -join ',') |
@@ -181,6 +191,7 @@ Describe 'SGU FSLogix image enrollment' {
It 'packages both roaming setup scripts' { It 'packages both roaming setup scripts' {
$source = Get-Content -LiteralPath $packagePath -Raw $source = Get-Content -LiteralPath $packagePath -Raw
$source | Should Match "'Install-SguFsLogix\.ps1'" $source | Should Match "'Install-SguFsLogix\.ps1'"
$source | Should Match "'Disable-SguAzureUserRoaming\.ps1'"
$source | Should Match "'Enable-SguAzureUserRoaming\.ps1'" $source | Should Match "'Enable-SguAzureUserRoaming\.ps1'"
$source | Should Match "'Publish-SguFsLogixClientDeployment\.ps1'" $source | Should Match "'Publish-SguFsLogixClientDeployment\.ps1'"
} }
@@ -196,3 +207,23 @@ Describe 'SGU FSLogix image enrollment' {
$source | Should Match 'Install-SguFsLogix-Startup\.ps1' $source | Should Match 'Install-SguFsLogix-Startup\.ps1'
} }
} }
Describe 'SGU local-profile rollback' {
It 'disables FSLogix containers and their services through computer policy' {
$source = Get-Content -LiteralPath $rollbackPath -Raw
$source | Should Match "'HKLM\\SOFTWARE\\FSLogix\\Profiles'"
$source | Should Match "'HKLM\\SOFTWARE\\FSLogix\\ODFC'"
$source | Should Match '-ValueName Enabled -Type DWord -Value 0'
$source | Should Match "'frxsvc','frxccds'"
$source | Should Match '-ValueName Start -Type DWord -Value 4'
$source | Should Match 'StaffProfileStorageMode[\s\S]*-Value Disabled'
}
It 'restores student shell folders to the local profile and disables deployment' {
$source = Get-Content -LiteralPath $rollbackPath -Raw
$source | Should Match '%USERPROFILE%\\Desktop'
$source | Should Match '%USERPROFILE%\\Documents'
$source | Should Match "-LinkEnabled No"
$source | Should Match 'profilePath,homeDirectory,homeDrive'
}
}
+117 -3
View File
@@ -18,7 +18,8 @@ function Invoke-WelcomeFixture {
[string]$DirectoryLocation = 'Sala de pruebas', [string]$DirectoryLocation = 'Sala de pruebas',
[string]$DirectoryOu = 'Laboratorio', [string]$DirectoryOu = 'Laboratorio',
[string]$MachineLocation, [string]$MachineLocation,
[string]$MachineOu [string]$MachineOu,
[string]$InstitutionalRole
) )
# Replace only the external directory lookup. Execute the actual script, # 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)) [IO.File]::WriteAllText($testScript, $fixtureSource, [Text.UTF8Encoding]::new($false))
$parameters = @{ $parameters = @{
BaseImagePath = Join-Path $repositoryRoot 'assets\branding\darkblue.jpg' 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' FontsPath = Join-Path $repositoryRoot 'assets\branding\fonts'
OutputPath = Join-Path $TestDrive ([IO.Path]::GetFileNameWithoutExtension($testScript) + '.jpg') OutputPath = Join-Path $TestDrive ([IO.Path]::GetFileNameWithoutExtension($testScript) + '.jpg')
CanvasWidth = 640 CanvasWidth = 640
@@ -44,6 +47,7 @@ function Invoke-WelcomeFixture {
SkipApply = $true SkipApply = $true
} }
if ($ExplicitGender) { $parameters.Gender = $ExplicitGender } if ($ExplicitGender) { $parameters.Gender = $ExplicitGender }
if ($InstitutionalRole) { $parameters.InstitutionalRole = $InstitutionalRole }
$previousLocalAppData = $env:LOCALAPPDATA $previousLocalAppData = $env:LOCALAPPDATA
$previousMachineLocation = $env:SGU_WELCOME_LOCATION $previousMachineLocation = $env:SGU_WELCOME_LOCATION
$previousMachineOu = $env:SGU_WELCOME_ORGANIZATIONAL_UNIT $previousMachineOu = $env:SGU_WELCOME_ORGANIZATIONAL_UNIT
@@ -81,6 +85,18 @@ Describe 'Welcome wallpaper with AD metadata' {
(Invoke-WelcomeFixture -DirectoryGender 'Male').WelcomeHeading | Should Be 'Bienvenido,' (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' { It 'honors an explicit gender over directory metadata' {
(Invoke-WelcomeFixture -DirectoryGender 'Female' -ExplicitGender 'Male').WelcomeHeading | Should Be 'Bienvenido,' (Invoke-WelcomeFixture -DirectoryGender 'Female' -ExplicitGender 'Male').WelcomeHeading | Should Be 'Bienvenido,'
} }
@@ -89,7 +105,29 @@ Describe 'Welcome wallpaper with AD metadata' {
$result = Invoke-WelcomeFixture -DirectoryGender $null ` $result = Invoke-WelcomeFixture -DirectoryGender $null `
-DirectoryLocation 'Aula Flexible' ` -DirectoryLocation 'Aula Flexible' `
-DirectoryOu 'Centro de Experiencia Digital' -DirectoryOu 'Centro de Experiencia Digital'
$result.LocationText | Should Be 'Acceso al Aula Flexible del Centro de Experiencia Digital.' $result.LocationText | Should Be "Acceso al Aula Flexible`ndel Centro de Experiencia Digital."
$result.LocationPrimaryText | Should Be 'Acceso al Aula Flexible'
$result.LocationSecondaryText | Should Be 'del Centro de Experiencia Digital.'
}
It 'uses the requested neutral, masculine and feminine location wording' {
$neutral = Invoke-WelcomeFixture -DirectoryGender $null `
-DirectoryLocation 'Sala de Aplicaciones' `
-DirectoryOu 'Laboratorio de Cómputo de Ingeniería'
$neutral.LocationPrimaryText | Should Be 'Acceso a la Sala de Aplicaciones'
$neutral.LocationSecondaryText | Should Be 'del Laboratorio de Cómputo de Ingeniería.'
$male = Invoke-WelcomeFixture -DirectoryGender 'Male' `
-DirectoryLocation 'Aula Flexible' `
-DirectoryOu 'Centro de Experiencia Digital'
$male.LocationPrimaryText | Should Be 'Estás ubicado en el Aula Flexible'
$male.LocationSecondaryText | Should Be 'del Centro de Experiencia Digital.'
$female = Invoke-WelcomeFixture -DirectoryGender 'Female' `
-DirectoryLocation 'Sala de Redes' `
-DirectoryOu 'Laboratorio de Cómputo de Ingeniería'
$female.LocationPrimaryText | Should Be 'Estás ubicada en la Sala de Redes'
$female.LocationSecondaryText | Should Be 'del Laboratorio de Cómputo de Ingeniería.'
} }
It 'keeps machine location metadata when the GPO command has no location arguments' { It 'keeps machine location metadata when the GPO command has no location arguments' {
@@ -98,6 +136,82 @@ Describe 'Welcome wallpaper with AD metadata' {
-DirectoryOu 'Laboratorio' ` -DirectoryOu 'Laboratorio' `
-MachineLocation 'Aula Flexible' ` -MachineLocation 'Aula Flexible' `
-MachineOu 'Centro de Experiencia Digital' -MachineOu 'Centro de Experiencia Digital'
$result.LocationText | Should Be 'Acceso al Aula Flexible del Centro de Experiencia Digital.' $result.LocationText | Should Be "Acceso al Aula Flexible`ndel Centro de Experiencia Digital."
}
It 'ships the logo at the lower right of the base image instead of compositing it at runtime' {
$source | Should Not Match 'lasalle-logo-blanco|DrawImage.*logo|composite.*logo'
$bitmap = [Drawing.Bitmap]::FromFile((Join-Path $repositoryRoot 'assets\branding\darkblue.jpg'))
try {
$upperLeftWhitePixels = 0
for ($x = 60; $x -lt 390; $x += 2) {
for ($y = 45; $y -lt 175; $y += 2) {
$pixel = $bitmap.GetPixel($x, $y)
if ($pixel.R -gt 220 -and $pixel.G -gt 220 -and $pixel.B -gt 220) {
$upperLeftWhitePixels++
}
}
}
$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++
}
}
}
($upperLeftWhitePixels -lt 25) | Should Be $true
($lowerRightWhitePixels -gt 250) | Should Be $true
}
finally {
$bitmap.Dispose()
}
}
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 {
$whitePixels = 0
for ($x = 0; $x -lt $bitmap.Width; $x += 4) {
for ($y = 0; $y -lt $bitmap.Height; $y += 4) {
$pixel = $bitmap.GetPixel($x, $y)
if ($pixel.R -gt 220 -and $pixel.G -gt 220 -and $pixel.B -gt 220) {
$whitePixels++
}
}
}
($whitePixels -lt 10) | Should Be $true
}
finally {
$bitmap.Dispose()
}
} }
} }