Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
77091c023d | ||
|
|
21890047e2 | ||
|
|
db35d86df1 | ||
|
|
63fbaf65dc | ||
|
|
6fb703b015 | ||
|
|
acfdcd5bbf | ||
|
|
771dc60f7d | ||
|
|
2e972a06bd | ||
|
|
42f405e69c | ||
|
|
ba2aca5c2a |
No files matched your search
@@ -13,20 +13,27 @@ Ready-to-run bootstrap packages are published on the
|
|||||||
|
|
||||||
## Authentication contract
|
## Authentication contract
|
||||||
|
|
||||||
1. The Windows tile collects a `DO`, `AL`, or `AD` institutional key and a password.
|
1. Windows selects **Acceso Institucional** by default. The built-in
|
||||||
2. It sends that exact password over mutually authenticated TLS to the broker.
|
Microsoft password provider stays available for recovery.
|
||||||
3. The broker validates the same key/password pair against the lightweight SGU
|
2. Ordinary domain usernames go straight to Windows for Active Directory
|
||||||
NTLM root. Only an authoritative `401`/`403` rejects the credential.
|
authentication. A `DO`, `AL`, or `AD` key is checked against SGU first.
|
||||||
4. After successful authentication, the broker makes a separately bounded,
|
3. The tile sends recognized institutional keys and their exact passwords over
|
||||||
best-effort request for the minimum available SGU profile fields.
|
mutually authenticated TLS. After SGU accepts the credential, the broker
|
||||||
5. On success, the broker creates or moves the AD user, updates the available
|
performs an idempotent Active Directory UPSERT: it creates or repairs the
|
||||||
name/mail/title/department/address metadata when available, and sets the AD password
|
account, role OU and group, supported profile fields, and AD password.
|
||||||
to the exact submitted password.
|
4. If SGU rejects the key or is unavailable, the unchanged credentials go to
|
||||||
6. The Credential Provider serializes the original `SecureString` to Windows.
|
Windows. Existing AD accounts can authenticate there; unknown or misspelled
|
||||||
|
accounts are rejected by Windows and are never created.
|
||||||
|
|
||||||
No derived password is created. Passwords are not written to a database, file,
|
No derived password is created. Passwords are not written to a database, file,
|
||||||
event log, application log, command line, or response.
|
event log, application log, command line, or response.
|
||||||
|
|
||||||
|
This makes Active Directory the only Windows sign-in account while preserving
|
||||||
|
automatic synchronization: if a person changes their institutional password,
|
||||||
|
the next successful Acceso Institucional sign-in updates the domain password
|
||||||
|
before Windows continues. A matching prefix alone never creates an account;
|
||||||
|
the institutional authority must first accept the submitted password.
|
||||||
|
|
||||||
For administrative accounts, profile enrichment first verifies the employee
|
For administrative accounts, profile enrichment first verifies the employee
|
||||||
number against the incident overview, then reads the structured given names and
|
number against the incident overview, then reads the structured given names and
|
||||||
surnames from `datos/personales.aspx` and the postal address from
|
surnames from `datos/personales.aspx` and the postal address from
|
||||||
|
|||||||
+23
-11
@@ -52,15 +52,24 @@ Broker timeout, TLS failure, 429, or 5xx
|
|||||||
-> only the last AD password succeeds
|
-> only the last AD password succeeds
|
||||||
```
|
```
|
||||||
|
|
||||||
An explicit `400` or `401` from the broker is different: the provider displays
|
An explicit `400` or `401` from SGU does not create or update an account. The
|
||||||
an error and does not serialize the rejected credential.
|
tile submits the unchanged credentials to Windows, which accepts them only if
|
||||||
|
they match an existing Active Directory account.
|
||||||
|
|
||||||
## Account synchronization
|
## Account synchronization
|
||||||
|
|
||||||
The broker normalizes the username to uppercase and accepts exactly two letters
|
The visible Windows experience is one **Acceso Institucional** sign-in tile,
|
||||||
plus six digits. It searches `BaseDn` by `sAMAccountName`, creates the user when
|
selected by default, with `Usuario` and `Contraseña`. Ordinary usernames go
|
||||||
absent, moves it to the mapped OU when required, sets `userPrincipalName`, and
|
straight to Windows for domain authentication. A `DO`, `AL`, or `AD` key is
|
||||||
passes the submitted password directly to ADSI `SetPassword`.
|
checked by the broker against SGU. After SGU accepts the submitted password,
|
||||||
|
the broker searches `BaseDn` by `sAMAccountName`, creates the user when absent,
|
||||||
|
moves it to the mapped OU when required, sets `userPrincipalName`, and passes
|
||||||
|
that same password directly to ADSI `SetPassword`. This is an idempotent UPSERT
|
||||||
|
performed on every successful sign-in, so the next sign-in after an institutional
|
||||||
|
password change updates AD before Windows validates the interactive logon. If
|
||||||
|
SGU rejects the credential or is unavailable, the unchanged credentials go to
|
||||||
|
Windows; only an existing AD account can then authenticate. A matching username
|
||||||
|
pattern alone never provisions an account.
|
||||||
|
|
||||||
Before an account becomes usable, the broker applies explicit deny ACEs for the
|
Before an account becomes usable, the broker applies explicit deny ACEs for the
|
||||||
Active Directory `Change Password` extended right to SELF and Everyone. Users
|
Active Directory `Change Password` extended right to SELF and Everyone. Users
|
||||||
@@ -125,9 +134,10 @@ Windows client maps the group into its local **Remote Desktop Users** group.
|
|||||||
Every synchronized user also receives `La Salle` in the AD
|
Every synchronized user also receives `La Salle` in the AD
|
||||||
`company` attribute unless deployment configuration supplies another default.
|
`company` attribute unless deployment configuration supplies another default.
|
||||||
|
|
||||||
The generic SGU credential is rendered as a dedicated branded tile instead of
|
The generic Acceso Institucional credential is rendered as a dedicated
|
||||||
being grouped below the anonymous **Other user** tile. Machine policy assigns
|
branded tile instead of being grouped below the anonymous **Other user** tile.
|
||||||
the SGU CLSID as the default provider, hides the last signed-in identity, and
|
Machine policy assigns
|
||||||
|
the provider CLSID as the default provider, hides the last signed-in identity, and
|
||||||
disables local-user enumeration while retaining the built-in Microsoft password
|
disables local-user enumeration while retaining the built-in Microsoft password
|
||||||
provider and its **Other user** recovery path. The computer GPO also applies
|
provider and its **Other user** recovery path. The computer GPO also applies
|
||||||
Windows' native default account picture to named Windows accounts; client
|
Windows' native default account picture to named Windows accounts; client
|
||||||
@@ -146,8 +156,10 @@ and `Administrativos` are direct child OUs beneath it. The domain GPO
|
|||||||
per-user `DisableLockWorkstation` and `DisableChangePassword` policies and
|
per-user `DisableLockWorkstation` and `DisableChangePassword` policies and
|
||||||
disables screen savers for the complete hierarchy. The enforced laboratory
|
disables screen savers for the complete hierarchy. The enforced laboratory
|
||||||
loopback GPO also applies `DisableLockWorkstation` and disables screen savers
|
loopback GPO also applies `DisableLockWorkstation` and disables screen savers
|
||||||
for every account that logs on to a laboratory computer, including local
|
for domain accounts. Its computer-startup script runs as `LocalSystem` and
|
||||||
accounts; it deliberately does not apply `DisableChangePassword` to them. The computer GPO
|
writes the same setting into every existing local profile and the Default
|
||||||
|
profile template, covering local accounts such as `ing`; it deliberately does
|
||||||
|
not apply `DisableChangePassword` to them. The computer GPO
|
||||||
`SGU - Windows client experience` is linked to `OU=Laboratorio`; it suppresses
|
`SGU - Windows client experience` is linked to `OU=Laboratorio`; it suppresses
|
||||||
first-logon/privacy/diagnostic prompts, disables location, and enforces
|
first-logon/privacy/diagnostic prompts, disables location, and enforces
|
||||||
always-on display, sleep, and hibernation settings for managed clients. The
|
always-on display, sleep, and hibernation settings for managed clients. The
|
||||||
|
|||||||
@@ -56,6 +56,13 @@ Eso es comportamiento esperado, no una caída del servicio.
|
|||||||
nombre y ubicación. El Credential Provider mantiene su propio límite de **90
|
nombre y ubicación. El Credential Provider mantiene su propio límite de **90
|
||||||
segundos**: si SGU excede ese presupuesto, Windows continúa por el fallback
|
segundos**: si SGU excede ese presupuesto, Windows continúa por el fallback
|
||||||
normal de AD o credenciales de dominio en caché.
|
normal de AD o credenciales de dominio en caché.
|
||||||
|
Cuando el HTML confirma la clave institucional, el broker solicita la foto
|
||||||
|
del endpoint de SGU con la misma sesión autenticada: `tp=1` para alumnos y
|
||||||
|
`tp=2` para administrativos/docentes. Solo acepta JPEG de hasta 100 KiB, con
|
||||||
|
un límite adicional de 3 segundos. Un error, HTML de login, timeout o foto
|
||||||
|
inválida conserva la foto anterior y no impide el inicio de sesión. La
|
||||||
|
escritura de `thumbnailPhoto` en AD también es independiente de los demás
|
||||||
|
metadatos y de la sincronización de contraseña.
|
||||||
- El instalador configura recuperación del servicio con reinicios a los 5, 15
|
- El instalador configura recuperación del servicio con reinicios a los 5, 15
|
||||||
y 60 segundos y reinicia el contador de fallos después de 24 horas.
|
y 60 segundos y reinicia el contador de fallos después de 24 horas.
|
||||||
- Si el broker o SGU no está disponible, el Credential Provider entrega la
|
- Si el broker o SGU no está disponible, el Credential Provider entrega la
|
||||||
|
|||||||
@@ -187,6 +187,13 @@ pantalla, suspensión, hibernación y suspensión híbrida, conectado a corrient
|
|||||||
batería. El guard de enrolamiento vuelve a aplicar `powercfg /hibernate off` y
|
batería. El guard de enrolamiento vuelve a aplicar `powercfg /hibernate off` y
|
||||||
los tiempos en cero al inicio y diariamente.
|
los tiempos en cero al inicio y diariamente.
|
||||||
|
|
||||||
|
El enrollment de Windows también aplica `DisableLockWorkstation=1` a **todos
|
||||||
|
los perfiles locales existentes** y a la plantilla `C:\Users\Default`. El
|
||||||
|
trabajo se ejecuta una sola vez como `LocalSystem` y termina; no deja una tarea
|
||||||
|
programada. La GPO de Laboratorio repite la misma operación como script de
|
||||||
|
inicio de equipo para que un cliente ya unido, o una cuenta local creada
|
||||||
|
después, también reciba la restricción.
|
||||||
|
|
||||||
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. Los alumnos conservan
|
sesión con el nombre del usuario y `location`/OU del equipo. Los alumnos conservan
|
||||||
@@ -225,12 +232,15 @@ administradores.
|
|||||||
|
|
||||||
El proveedor usa un mosaico genérico dedicado, no una credencial asociada al SID
|
El proveedor usa un mosaico genérico dedicado, no una credencial asociada al SID
|
||||||
anónimo de **Other user**. Windows muestra la imagen institucional y la etiqueta
|
anónimo de **Other user**. Windows muestra la imagen institucional y la etiqueta
|
||||||
`La Salle · Acceso SGU`; el encabezado `Acceso institucional SGU`
|
`Acceso Institucional`; el encabezado `Iniciar sesión` se publica como
|
||||||
se publica como `CPFT_LARGE_TEXT` solamente en el mosaico seleccionado. LogonUI
|
`CPFT_LARGE_TEXT` solamente en el mosaico seleccionado. El instalador selecciona
|
||||||
|
ese proveedor por defecto. Los usuarios de dominio se validan contra Active
|
||||||
|
Directory; las claves institucionales aceptadas por SGU hacen el UPSERT en AD
|
||||||
|
desde ese mismo mosaico. LogonUI
|
||||||
elige la familia, el peso y el tamaño final y no expone opciones de tipografía a
|
elige la familia, el peso y el tamaño final y no expone opciones de tipografía a
|
||||||
un Credential Provider.
|
un Credential Provider.
|
||||||
|
|
||||||
La configuración soportada garantiza que SGU queda seleccionado por defecto y
|
La configuración soportada garantiza que Acceso Institucional queda seleccionado por defecto y
|
||||||
que no se conserva el último usuario. El orden vertical exacto de mosaicos lo
|
que no se conserva el último usuario. El orden vertical exacto de mosaicos lo
|
||||||
decide LogonUI y no tiene una directiva pública. Por seguridad no se filtra ni
|
decide LogonUI y no tiene una directiva pública. Por seguridad no se filtra ni
|
||||||
se elimina **Other user**: Microsoft recomienda conservar al menos un proveedor
|
se elimina **Other user**: Microsoft recomienda conservar al menos un proveedor
|
||||||
|
|||||||
+1
-1
@@ -136,7 +136,7 @@ On Windows 10:
|
|||||||
```
|
```
|
||||||
|
|
||||||
Use Lithnet's `Invoke-CredUI` test utility when available, or sign out/restart
|
Use Lithnet's `Invoke-CredUI` test utility when available, or sign out/restart
|
||||||
the VM and select **Acceso institucional SGU**. Keep the built-in Windows
|
the VM and select **Acceso Institucional**. Keep the built-in Windows
|
||||||
password provider available through **Other user**.
|
password provider available through **Other user**.
|
||||||
|
|
||||||
On the domain controller, apply the SGU user and computer policies once:
|
On the domain controller, apply the SGU user and computer policies once:
|
||||||
|
|||||||
@@ -17,8 +17,11 @@ 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. Por ello alcanza usuarios locales
|
y conserva las otras políticas del usuario. Para no depender de que Windows
|
||||||
y de dominio que inicien sesión en un equipo de Laboratorio.
|
procese una GPO de usuario para una cuenta local, la GPO también instala un
|
||||||
|
script de **inicio de equipo** que corre como `LocalSystem`: escribe la regla
|
||||||
|
en cada perfil local existente y en `C:\Users\Default\NTUSER.DAT`. Así `ing`,
|
||||||
|
`alumno` y cualquier cuenta local nueva reciben `DisableLockWorkstation=1`.
|
||||||
- `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
|
- `DisableLockWorkstation=1` deshabilita Win+L y la opción **Bloquear** para
|
||||||
todos esos usuarios; `ScreenSaveActive=0` evita que un protector de pantalla
|
todos esos usuarios; `ScreenSaveActive=0` evita que un protector de pantalla
|
||||||
@@ -32,8 +35,9 @@ de inicio de sesión. No aplica a Linux. Es una restricción de la interfaz de
|
|||||||
Windows, no una barrera contra administradores ni contra la modificación directa
|
Windows, no una barrera contra administradores ni contra la modificación directa
|
||||||
del JPG, que está dentro del perfil del usuario.
|
del JPG, que está dentro del perfil del usuario.
|
||||||
|
|
||||||
Tras actualizar las políticas del equipo, cierre e inicie sesión para procesar
|
Tras actualizar las políticas del equipo, reinicie el equipo o ejecute de nuevo
|
||||||
loopback y comprobar la política de usuario con `gpresult /h resultado.html`.
|
el enrollment para procesar el script de perfiles locales. Después, cierre e
|
||||||
|
inicie sesión para comprobar la política de usuario con `gpresult /h resultado.html`.
|
||||||
Compruebe también visualmente el fondo y Personalización en una sesión de dominio.
|
Compruebe también visualmente el fondo y Personalización en una sesión de dominio.
|
||||||
La validación por WinRM no sustituye esa prueba de escritorio interactivo.
|
La validación por WinRM no sustituye esa prueba de escritorio interactivo.
|
||||||
|
|
||||||
|
|||||||
+7
-4
@@ -27,13 +27,16 @@ rol, `TraceId`, resultado y tiempo total. Los Event ID estables distinguen:
|
|||||||
- `1100` SGU aceptó la autenticación; `1101` timeout; `1102` fallo de red/DNS;
|
- `1100` SGU aceptó la autenticación; `1101` timeout; `1102` fallo de red/DNS;
|
||||||
- `1200` enriquecimiento completado y cantidad de campos; `1201` HTML sin los
|
- `1200` enriquecimiento completado y cantidad de campos; `1201` HTML sin los
|
||||||
IDs admitidos; `1202` timeout; `1203` excepción; `1204` página opcional no
|
IDs admitidos; `1202` timeout; `1203` excepción; `1204` página opcional no
|
||||||
disponible;
|
disponible; `1205` foto SGU no disponible o timeout; `1206` imagen rechazada
|
||||||
|
por tipo, tamaño o formato;
|
||||||
- `1300` fallo de sincronización AD; `1301` metadatos opcionales no aplicados;
|
- `1300` fallo de sincronización AD; `1301` metadatos opcionales no aplicados;
|
||||||
`1302` membresía RDP opcional no aplicada; `1303` cuenta agregada a su grupo
|
`1302` membresía RDP opcional no aplicada; `1303` cuenta agregada a su grupo
|
||||||
institucional de Alumnos, Administrativos o Docentes.
|
institucional de Alumnos, Administrativos o Docentes; `1304` cambio de
|
||||||
|
contraseña denegado; `1305` foto opcional no aplicada en AD.
|
||||||
|
|
||||||
No se almacena HTML, contraseña, hash de contraseña ni contenido de la
|
Los registros no almacenan HTML, contraseñas, hashes ni cuerpos de respuesta
|
||||||
respuesta SGU.
|
de SGU. Solo la imagen JPEG validada se guarda en `thumbnailPhoto` del usuario
|
||||||
|
de Active Directory; sus bytes no aparecen en los eventos.
|
||||||
|
|
||||||
## Retención
|
## Retención
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# SGU Credential Provider 0.6.12
|
||||||
|
|
||||||
|
Esta corrección hace que la restricción **No bloquear estación de trabajo** sea
|
||||||
|
efectiva también para cuentas locales de equipos Windows del Laboratorio.
|
||||||
|
|
||||||
|
- Durante el enrollment y su reparación, se ejecuta un trabajador temporal como
|
||||||
|
`LocalSystem` que fija `DisableLockWorkstation=1` en cada perfil local
|
||||||
|
existente y en `C:\Users\Default\NTUSER.DAT`.
|
||||||
|
- La GPO `SGU - Laboratorio wallpaper protection` instala el mismo código como
|
||||||
|
script de inicio de equipo. Esto alcanza máquinas ya unidas al dominio en su
|
||||||
|
siguiente arranque, incluso si sólo se usa una cuenta local como `ing`.
|
||||||
|
- El script de inicio usa un lanzador `cmd` con PowerShell en modo Bypass para
|
||||||
|
no depender de la política de ejecución local. El enrollment no deja una
|
||||||
|
tarea programada permanente.
|
||||||
|
|
||||||
|
Los usuarios de dominio siguen recibiendo la directiva por su GPO de usuario y
|
||||||
|
por loopback. Esta versión sólo corrige la cobertura de perfiles locales.
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# SGU Credential Provider 0.6.13
|
||||||
|
|
||||||
|
La pantalla de inicio de sesión ahora presenta una sola credencial visible:
|
||||||
|
**La Salle**, con los campos `Usuario` y `Contraseña`. Ya no muestra el texto
|
||||||
|
“Acceso Institucional SGU”.
|
||||||
|
|
||||||
|
La autenticación institucional permanece dentro del broker, sin una segunda
|
||||||
|
captura. Después de cada autenticación válida, el broker ejecuta su UPSERT de
|
||||||
|
Active Directory: crea o repara la cuenta, la OU, el grupo, los datos de perfil
|
||||||
|
disponibles y la contraseña de AD. Así, la siguiente sesión después de cambiar
|
||||||
|
una contraseña institucional sincroniza esa contraseña con el dominio.
|
||||||
|
|
||||||
|
El patrón `DO`, `AL` o `AD` con seis dígitos continúa siendo sólo un formato de
|
||||||
|
usuario. No autoriza ni crea cuentas por sí mismo: la autoridad institucional
|
||||||
|
debe validar la contraseña antes de que el UPSERT haga cambios en AD.
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# SGU Credential Provider 0.6.14
|
||||||
|
|
||||||
|
El mosaico predeterminado se llama **Acceso Institucional**. En él se pueden
|
||||||
|
usar tanto cuentas existentes de Active Directory como claves institucionales
|
||||||
|
DO, AL y AD:
|
||||||
|
|
||||||
|
- Los usuarios de dominio que no son claves institucionales se envían
|
||||||
|
directamente a Windows para validación por Active Directory.
|
||||||
|
- Las claves institucionales se validan primero contra SGU. Si SGU las acepta,
|
||||||
|
el broker enriquece o actualiza la cuenta y sincroniza la contraseña con AD.
|
||||||
|
- Si SGU rechaza la clave o no está disponible, Windows valida la credencial
|
||||||
|
existente contra AD o las credenciales de dominio guardadas en caché. Una
|
||||||
|
cuenta inexistente no se crea sin una validación SGU correcta.
|
||||||
|
- El instalador y la GPO seleccionan **Acceso Institucional** como predeterminado
|
||||||
|
y conservan el proveedor de contraseña de Microsoft para recuperación.
|
||||||
|
|
||||||
|
El mosaico recopila el usuario y la contraseña una sola vez. La contraseña no
|
||||||
|
se deriva ni se guarda en un archivo, base de datos o registro.
|
||||||
+8
-6
@@ -87,13 +87,15 @@ Use an enterprise CA with revocation checking in production.
|
|||||||
|
|
||||||
## Recovery and availability
|
## Recovery and availability
|
||||||
|
|
||||||
The provider distinguishes an authoritative rejection from unavailable
|
The provider distinguishes an SGU rejection from unavailable infrastructure:
|
||||||
infrastructure:
|
|
||||||
|
|
||||||
- `400`/`401`: fail closed and show an error.
|
- `400`/`401`: do not create or update the account; submit the unchanged
|
||||||
- timeout, TLS/connectivity error, `429`, or `5xx`: submit the unchanged credential
|
credential to Windows so an existing AD account can authenticate.
|
||||||
to Windows. Windows must still validate it against AD or the cached domain
|
- timeout, TLS/connectivity error, `429`, or `5xx`: submit the unchanged
|
||||||
verifier, so this does not grant access without the last synchronized password.
|
credential to Windows. Windows must still validate it against AD or its cached
|
||||||
|
domain verifier, so this does not grant access without a domain credential.
|
||||||
|
- usernames that do not match the institutional key format go directly to
|
||||||
|
Windows and are never sent to SGU or provisioned by the broker.
|
||||||
|
|
||||||
Redis is deliberately not used for password continuity. A second persistent
|
Redis is deliberately not used for password continuity. A second persistent
|
||||||
password verifier duplicates attackable credential material, while a reversible
|
password verifier duplicates attackable credential material, while a reversible
|
||||||
|
|||||||
@@ -97,8 +97,9 @@ usuario que cerró sesión y deshabilita la enumeración de usuarios locales en
|
|||||||
equipo unido al dominio. No modifica ni oculta el proveedor de contraseña de
|
equipo unido al dominio. No modifica ni oculta el proveedor de contraseña de
|
||||||
Microsoft; **Other user** permanece como ruta de recuperación.
|
Microsoft; **Other user** permanece como ruta de recuperación.
|
||||||
|
|
||||||
Cerrar sesión o reiniciar el equipo. El acceso SGU debe quedar seleccionado por
|
Cerrar sesión o reiniciar el equipo. **Acceso Institucional** debe quedar
|
||||||
defecto y el proveedor de contraseña de Microsoft debe permanecer disponible.
|
seleccionado por defecto; el proveedor nativo de Microsoft permanece disponible
|
||||||
|
para recuperación.
|
||||||
|
|
||||||
## 5. Verificación
|
## 5. Verificación
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
# Acceso remoto administrado por el dominio
|
||||||
|
|
||||||
|
`Install-SguWorkstationRemoteAccessPolicy.ps1` registra un script de inicio de
|
||||||
|
equipo en la GPO existente **SGU - Windows client experience**, vinculada a
|
||||||
|
`OU=Laboratorio`. El bootstrap del controlador lo instala después de crear esa
|
||||||
|
GPO. No crea una tarea programada en los clientes.
|
||||||
|
|
||||||
|
Al arrancar una estación Windows 10 u 11 unida al dominio, el script activa
|
||||||
|
Escritorio remoto con NLA y PowerShell Remoting, inicia `TermService` y `WinRM`,
|
||||||
|
y añade el grupo `LCI\SG-Laboratorio-Usuarios-RDP` a Usuarios de escritorio
|
||||||
|
remoto. Sus reglas de firewall admiten los puertos TCP 3389 y 5985 y UDP 3389
|
||||||
|
solo desde la subred local. En arranques siguientes comprueba el estado y solo
|
||||||
|
corrige las diferencias.
|
||||||
|
|
||||||
|
Para aplicar una versión nueva a un cliente, ejecute PowerShell como
|
||||||
|
administrador y después reinicie:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
gpupdate /target:computer /force
|
||||||
|
Restart-Computer
|
||||||
|
```
|
||||||
|
|
||||||
|
La GPO de actualización del proveedor de credenciales también se ejecuta al
|
||||||
|
inicio de equipo; `gpupdate` sin reiniciar no instala el proveedor nuevo.
|
||||||
|
Compruebe la aplicación con `gpresult /scope computer /r`, `Test-WSMan` y una
|
||||||
|
conexión RDP desde la misma subred. Si el equipo no puede autenticarse ante
|
||||||
|
el controlador (`Test-ComputerSecureChannel` devuelve `False`), repare primero
|
||||||
|
la relación de confianza desde el propio cliente con credenciales de dominio
|
||||||
|
autorizadas; un equipo sin canal seguro no puede recibir de forma fiable sus
|
||||||
|
políticas. No elimine ni vuelva a crear su objeto de AD para forzar una GPO.
|
||||||
|
|
||||||
|
Desde un equipo administrador no unido al dominio, PowerShell Remoting por
|
||||||
|
HTTP requiere indicar `-Credential` y confiar explícitamente en el destino
|
||||||
|
mediante `TrustedHosts`, o utilizar WinRM por HTTPS. `Test-WSMan` solo verifica
|
||||||
|
el listener; no inicia sesión. Las reglas locales de la estación no abren
|
||||||
|
puertos en Azure ni en el router del laboratorio.
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
[CmdletBinding()]
|
||||||
|
param([string]$RemoteDesktopPrincipal = 'LCI\SG-Laboratorio-Usuarios-RDP')
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$computer = Get-CimInstance Win32_ComputerSystem
|
||||||
|
if (-not $computer.PartOfDomain -or $computer.DomainRole -ge 4) { return }
|
||||||
|
|
||||||
|
$terminalKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Terminal Server'
|
||||||
|
$rdpKey = Join-Path $terminalKey 'WinStations\RDP-Tcp'
|
||||||
|
if ((Get-ItemPropertyValue -Path $terminalKey -Name fDenyTSConnections) -ne 0) {
|
||||||
|
Set-ItemProperty -Path $terminalKey -Name fDenyTSConnections -Value 0
|
||||||
|
}
|
||||||
|
if ((Get-ItemPropertyValue -Path $rdpKey -Name UserAuthentication) -ne 1) {
|
||||||
|
Set-ItemProperty -Path $rdpKey -Name UserAuthentication -Value 1
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($name in @('TermService', 'WinRM')) {
|
||||||
|
$service = Get-Service -Name $name
|
||||||
|
if ($service.StartType -ne 'Automatic') { Set-Service -Name $name -StartupType Automatic }
|
||||||
|
if ($service.Status -ne 'Running') { Start-Service -Name $name }
|
||||||
|
}
|
||||||
|
|
||||||
|
# Each domain refresh carries this script through SYSVOL. Apply only the
|
||||||
|
# narrowly scoped inbound rules required by an administrator on the same LAN.
|
||||||
|
$rules = @(
|
||||||
|
@{ Name = 'SGU-Workstation-WinRM-HTTP'; Protocol = 'TCP'; Port = '5985' },
|
||||||
|
@{ Name = 'SGU-Workstation-RDP-TCP'; Protocol = 'TCP'; Port = '3389' },
|
||||||
|
@{ Name = 'SGU-Workstation-RDP-UDP'; Protocol = 'UDP'; Port = '3389' }
|
||||||
|
)
|
||||||
|
foreach ($rule in $rules) {
|
||||||
|
$existing = Get-NetFirewallRule -Name $rule.Name -ErrorAction SilentlyContinue
|
||||||
|
if ($existing) {
|
||||||
|
$port = $existing | Get-NetFirewallPortFilter
|
||||||
|
$address = $existing | Get-NetFirewallAddressFilter
|
||||||
|
$valid = $existing.Enabled -eq 'True' -and $existing.Action -eq 'Allow' -and
|
||||||
|
$existing.Direction -eq 'Inbound' -and $existing.Profile -eq 'Any' -and
|
||||||
|
$port.Protocol -eq $rule.Protocol -and [string]$port.LocalPort -eq $rule.Port -and
|
||||||
|
@($address.RemoteAddress).Count -eq 1 -and $address.RemoteAddress -eq 'LocalSubnet'
|
||||||
|
if ($valid) { continue }
|
||||||
|
$existing | Remove-NetFirewallRule
|
||||||
|
}
|
||||||
|
New-NetFirewallRule -Name $rule.Name -DisplayName $rule.Name -Enabled True `
|
||||||
|
-Direction Inbound -Action Allow -Profile Any -Protocol $rule.Protocol `
|
||||||
|
-LocalPort $rule.Port -RemoteAddress LocalSubnet | Out-Null
|
||||||
|
}
|
||||||
|
|
||||||
|
# WinRM's administrative-template policy creates the listener. This also
|
||||||
|
# restores the Windows PowerShell session endpoint when it was disabled.
|
||||||
|
$listener = @(Get-ChildItem WSMan:\localhost\Listener -ErrorAction SilentlyContinue |
|
||||||
|
Where-Object { $_.Keys -contains 'Transport=HTTP' })
|
||||||
|
$endpoint = Get-PSSessionConfiguration -Name Microsoft.PowerShell -ErrorAction SilentlyContinue
|
||||||
|
if (-not $listener -or -not $endpoint) {
|
||||||
|
Enable-PSRemoting -Force -SkipNetworkProfileCheck | Out-Null
|
||||||
|
}
|
||||||
|
|
||||||
|
# The built-in local group has a stable SID across Windows display languages.
|
||||||
|
$groupSid = [Security.Principal.SecurityIdentifier]::new('S-1-5-32-555')
|
||||||
|
$groupName = ($groupSid.Translate([Security.Principal.NTAccount]).Value -split '\\', 2)[1]
|
||||||
|
try {
|
||||||
|
$principalSid = ([Security.Principal.NTAccount]::new($RemoteDesktopPrincipal)).Translate(
|
||||||
|
[Security.Principal.SecurityIdentifier]).Value
|
||||||
|
$group = [ADSI]("WinNT://$env:COMPUTERNAME/$groupName,group")
|
||||||
|
$memberSids = @($group.psbase.Invoke('Members') | ForEach-Object {
|
||||||
|
try {
|
||||||
|
$bytes = $_.GetType().InvokeMember('objectSid',
|
||||||
|
[Reflection.BindingFlags]::GetProperty, $null, $_, $null)
|
||||||
|
if ($bytes) { ([Security.Principal.SecurityIdentifier]::new([byte[]]$bytes, 0)).Value }
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
})
|
||||||
|
if ($memberSids -notcontains $principalSid) {
|
||||||
|
Add-LocalGroupMember -Group $groupName -Member $principalSid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
# A temporarily unavailable DC must not prevent RDP and WinRM from starting.
|
||||||
|
Write-Warning "Remote Desktop group membership could not be verified: $($_.Exception.Message)"
|
||||||
|
}
|
||||||
@@ -44,6 +44,7 @@ foreach ($scriptName in @(
|
|||||||
'Install-CredentialProvider.ps1',
|
'Install-CredentialProvider.ps1',
|
||||||
'Install-SguEnrollmentGuard.ps1',
|
'Install-SguEnrollmentGuard.ps1',
|
||||||
'Set-SguStandardLocalUser.ps1',
|
'Set-SguStandardLocalUser.ps1',
|
||||||
|
'Set-SguLocalProfileSecurityPolicies.ps1',
|
||||||
'Test-SguClientEnrollment.ps1',
|
'Test-SguClientEnrollment.ps1',
|
||||||
'Repair-SguClientEnrollment.ps1',
|
'Repair-SguClientEnrollment.ps1',
|
||||||
'Enable-LabRemoteAccess.ps1',
|
'Enable-LabRemoteAccess.ps1',
|
||||||
|
|||||||
@@ -29,10 +29,14 @@ $eventNames = @{
|
|||||||
1202 = 'ProfileEnrichmentTimeout'
|
1202 = 'ProfileEnrichmentTimeout'
|
||||||
1203 = 'ProfileEnrichmentFailure'
|
1203 = 'ProfileEnrichmentFailure'
|
||||||
1204 = 'ProfilePageUnavailable'
|
1204 = 'ProfilePageUnavailable'
|
||||||
|
1205 = 'ProfilePhotoUnavailable'
|
||||||
|
1206 = 'ProfilePhotoInvalid'
|
||||||
1300 = 'DirectorySynchronizationFailure'
|
1300 = 'DirectorySynchronizationFailure'
|
||||||
1301 = 'DirectoryOptionalMetadataFailure'
|
1301 = 'DirectoryOptionalMetadataFailure'
|
||||||
1302 = 'DirectoryGroupMembershipFailure'
|
1302 = 'DirectoryGroupMembershipFailure'
|
||||||
1303 = 'DirectoryRoleGroupMembershipAdded'
|
1303 = 'DirectoryRoleGroupMembershipAdded'
|
||||||
|
1304 = 'DirectoryPasswordChangeDenied'
|
||||||
|
1305 = 'DirectoryPhotoFailure'
|
||||||
}
|
}
|
||||||
|
|
||||||
# Keep these reads unfiltered. Besides making archived and current logs behave
|
# Keep these reads unfiltered. Besides making archived and current logs behave
|
||||||
|
|||||||
@@ -519,6 +519,8 @@ foreach ($requiredPath in @(
|
|||||||
(Join-Path $scriptsRoot 'New-LabCertificate.ps1'),
|
(Join-Path $scriptsRoot 'New-LabCertificate.ps1'),
|
||||||
(Join-Path $scriptsRoot 'Set-LabBrokerDns.ps1'),
|
(Join-Path $scriptsRoot 'Set-LabBrokerDns.ps1'),
|
||||||
(Join-Path $scriptsRoot 'Set-SguDomainComputerPolicies.ps1'),
|
(Join-Path $scriptsRoot 'Set-SguDomainComputerPolicies.ps1'),
|
||||||
|
(Join-Path $scriptsRoot 'Enable-SguWorkstationRemoteAccess.ps1'),
|
||||||
|
(Join-Path $scriptsRoot 'Install-SguWorkstationRemoteAccessPolicy.ps1'),
|
||||||
(Join-Path $scriptsRoot 'Set-SguDomainUserPolicies.ps1'),
|
(Join-Path $scriptsRoot 'Set-SguDomainUserPolicies.ps1'),
|
||||||
(Join-Path $scriptsRoot 'Set-SguLaboratorioWallpaperPolicy.ps1'),
|
(Join-Path $scriptsRoot 'Set-SguLaboratorioWallpaperPolicy.ps1'),
|
||||||
(Join-Path $scriptsRoot 'Enable-SguServerRemoteManagement.ps1'),
|
(Join-Path $scriptsRoot 'Enable-SguServerRemoteManagement.ps1'),
|
||||||
@@ -820,6 +822,10 @@ $collectorFqdn = "$env:COMPUTERNAME.$DomainName"
|
|||||||
-TargetOuDn $laboratoryOuDn `
|
-TargetOuDn $laboratoryOuDn `
|
||||||
-DomainController $env:COMPUTERNAME `
|
-DomainController $env:COMPUTERNAME `
|
||||||
-EventCollectorFqdn $collectorFqdn | Out-Null
|
-EventCollectorFqdn $collectorFqdn | Out-Null
|
||||||
|
|
||||||
|
& (Join-Path $scriptsRoot 'Install-SguWorkstationRemoteAccessPolicy.ps1') `
|
||||||
|
-TargetOuDn $laboratoryOuDn `
|
||||||
|
-DomainController $env:COMPUTERNAME | Out-Null
|
||||||
& (Join-Path $scriptsRoot 'Install-SguDomainMonitoring.ps1') `
|
& (Join-Path $scriptsRoot 'Install-SguDomainMonitoring.ps1') `
|
||||||
-CollectorFqdn $collectorFqdn `
|
-CollectorFqdn $collectorFqdn `
|
||||||
-ComputerOuDn $laboratoryOuDn `
|
-ComputerOuDn $laboratoryOuDn `
|
||||||
|
|||||||
@@ -300,10 +300,7 @@ if ($PSCmdlet.ShouldProcess($installPath, 'Install and register the SGU Credenti
|
|||||||
New-ItemProperty -Path $classRegistryPath -Name ThreadingModel -Value Both -PropertyType String -Force | Out-Null
|
New-ItemProperty -Path $classRegistryPath -Name ThreadingModel -Value Both -PropertyType String -Force | Out-Null
|
||||||
|
|
||||||
New-Item -Path $providerRegistryPath -Force | Out-Null
|
New-Item -Path $providerRegistryPath -Force | Out-Null
|
||||||
# Windows PowerShell 5.1 interprets an UTF-8 script without a BOM using the
|
Set-Item -Path $providerRegistryPath -Value 'Acceso Institucional'
|
||||||
# current ANSI code page. Construct the middle dot from its Unicode value so
|
|
||||||
# the LogonUI registry label remains correct on every client locale.
|
|
||||||
Set-Item -Path $providerRegistryPath -Value ('La Salle {0} Acceso SGU' -f [char]0x00B7)
|
|
||||||
|
|
||||||
if (-not $DoNotSetAsDefaultCredentialProvider) {
|
if (-not $DoNotSetAsDefaultCredentialProvider) {
|
||||||
if (-not (Test-Path -LiteralPath $defaultProviderPolicyPath)) {
|
if (-not (Test-Path -LiteralPath $defaultProviderPolicyPath)) {
|
||||||
@@ -316,7 +313,7 @@ if ($PSCmdlet.ShouldProcess($installPath, 'Install and register the SGU Credenti
|
|||||||
-Force | Out-Null
|
-Force | Out-Null
|
||||||
}
|
}
|
||||||
|
|
||||||
# Do not leave a signed-out SGU identity exposed as a persistent user tile.
|
# Do not leave a signed-out domain identity exposed as a persistent user tile.
|
||||||
# The Microsoft password provider remains registered and supplies Other user.
|
# The Microsoft password provider remains registered and supplies Other user.
|
||||||
if (-not (Test-Path -LiteralPath $interactiveLogonPolicyPath)) {
|
if (-not (Test-Path -LiteralPath $interactiveLogonPolicyPath)) {
|
||||||
New-Item -Path $interactiveLogonPolicyPath -Force | Out-Null
|
New-Item -Path $interactiveLogonPolicyPath -Force | Out-Null
|
||||||
|
|||||||
@@ -0,0 +1,190 @@
|
|||||||
|
[CmdletBinding(SupportsShouldProcess)]
|
||||||
|
param(
|
||||||
|
[string]$Version = '0.6.16',
|
||||||
|
|
||||||
|
[ValidatePattern('^https://')]
|
||||||
|
[string]$ClientPackageUri = 'https://gitea.lci.ulsa.mx/alexrg/SGU-CredentialProvider/releases/download/v0.6.16/sgu-windows-client-bootstrap-0.6.16.zip',
|
||||||
|
|
||||||
|
[ValidatePattern('^[0-9A-Fa-f]{64}$')]
|
||||||
|
[string]$ClientPackageSha256 = 'AFC40A87E83A6B27319792F575C384EBB175F42DCF670B7AB620A64C75ED499B',
|
||||||
|
|
||||||
|
[string]$GpoName = 'SGU - Credential Provider update',
|
||||||
|
|
||||||
|
[string]$DomainController = $env:COMPUTERNAME
|
||||||
|
)
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
|
||||||
|
$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 session on a domain controller or management host.'
|
||||||
|
}
|
||||||
|
|
||||||
|
Import-Module ActiveDirectory -ErrorAction Stop
|
||||||
|
Import-Module GroupPolicy -ErrorAction Stop
|
||||||
|
|
||||||
|
$domain = Get-ADDomain -Server $DomainController -ErrorAction Stop
|
||||||
|
$domainDnsRoot = $domain.DNSRoot
|
||||||
|
$domainDn = $domain.DistinguishedName
|
||||||
|
$gpo = Get-GPO -Name $GpoName -Domain $domainDnsRoot -Server $DomainController -ErrorAction SilentlyContinue
|
||||||
|
if (-not $gpo -and $PSCmdlet.ShouldProcess($GpoName, 'Create computer startup update policy')) {
|
||||||
|
$gpo = New-GPO -Name $GpoName -Domain $domainDnsRoot -Server $DomainController
|
||||||
|
}
|
||||||
|
if (-not $gpo) {
|
||||||
|
throw "The GPO '$GpoName' does not exist and was not created."
|
||||||
|
}
|
||||||
|
|
||||||
|
$existingLink = @(Get-GPInheritance -Target $domainDn -Domain $domainDnsRoot -Server $DomainController).GpoLinks |
|
||||||
|
Where-Object DisplayName -eq $GpoName |
|
||||||
|
Select-Object -First 1
|
||||||
|
if (-not $existingLink -and
|
||||||
|
$PSCmdlet.ShouldProcess($domainDn, "Link and enable '$GpoName'")) {
|
||||||
|
New-GPLink -Name $GpoName -Target $domainDn -Domain $domainDnsRoot -Server $DomainController -LinkEnabled Yes | Out-Null
|
||||||
|
}
|
||||||
|
elseif ($existingLink -and
|
||||||
|
$existingLink.Enabled -notin @($true, 'Yes') -and
|
||||||
|
$PSCmdlet.ShouldProcess($domainDn, "Enable '$GpoName'")) {
|
||||||
|
Set-GPLink -Name $GpoName -Target $domainDn -Domain $domainDnsRoot -Server $DomainController -LinkEnabled Yes | Out-Null
|
||||||
|
}
|
||||||
|
|
||||||
|
$systemPolicyKey = 'HKLM\Software\Policies\Microsoft\Windows\System'
|
||||||
|
$winlogonPolicyKey = 'HKLM\Software\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon'
|
||||||
|
if ($PSCmdlet.ShouldProcess($GpoName, 'Make the computer startup script synchronous')) {
|
||||||
|
Set-GPRegistryValue -Name $GpoName -Domain $domainDnsRoot -Server $DomainController `
|
||||||
|
-Key $systemPolicyKey -ValueName 'RunStartupScriptSync' -Type DWord -Value 1
|
||||||
|
Set-GPRegistryValue -Name $GpoName -Domain $domainDnsRoot -Server $DomainController `
|
||||||
|
-Key $winlogonPolicyKey -ValueName 'SyncForegroundPolicy' -Type DWord -Value 1
|
||||||
|
}
|
||||||
|
|
||||||
|
$scriptName = "Update-SguCredentialProvider-$Version.ps1"
|
||||||
|
$gpoScriptsPath = Join-Path $env:WINDIR "SYSVOL\domain\Policies\{$($gpo.Id)}\Machine\Scripts"
|
||||||
|
$startupPath = Join-Path $gpoScriptsPath 'Startup'
|
||||||
|
$scriptsIniPath = Join-Path $gpoScriptsPath 'scripts.ini'
|
||||||
|
$legacyPowerShellScriptsIniPath = Join-Path $gpoScriptsPath 'psscripts.ini'
|
||||||
|
$scriptPath = Join-Path $startupPath $scriptName
|
||||||
|
|
||||||
|
$startupScript = @"
|
||||||
|
`$ErrorActionPreference = 'Stop'
|
||||||
|
`$version = '$Version'
|
||||||
|
`$packageUri = '$ClientPackageUri'
|
||||||
|
`$expectedSha256 = '$($ClientPackageSha256.ToUpperInvariant())'
|
||||||
|
|
||||||
|
`$computerSystem = Get-CimInstance Win32_ComputerSystem
|
||||||
|
if (-not `$computerSystem.PartOfDomain -or `$computerSystem.DomainRole -ge 4) {
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# Windows remembers the provider used at the last interactive logon. Select
|
||||||
|
# the institutional tile at startup while leaving the native password tile
|
||||||
|
# registered for manual recovery.
|
||||||
|
`$logonUiPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI'
|
||||||
|
Set-ItemProperty -Path `$logonUiPath -Name LastLoggedOnProvider -Value '{D789CFD8-5AD4-489F-9B83-7EB5D9D09335}'
|
||||||
|
|
||||||
|
`$updateRoot = Join-Path `$env:ProgramData "SGU\CredentialProviderUpdates\`$version"
|
||||||
|
`$markerPath = Join-Path `$updateRoot 'complete.marker'
|
||||||
|
if (Test-Path -LiteralPath `$markerPath -PathType Leaf) {
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
New-Item -ItemType Directory -Path `$updateRoot -Force | Out-Null
|
||||||
|
`$archivePath = Join-Path `$updateRoot 'client-bootstrap.zip'
|
||||||
|
`$stagePath = Join-Path `$updateRoot 'package'
|
||||||
|
if ((Test-Path -LiteralPath `$archivePath -PathType Leaf) -and
|
||||||
|
(Get-FileHash -LiteralPath `$archivePath -Algorithm SHA256).Hash -ne `$expectedSha256) {
|
||||||
|
Remove-Item -LiteralPath `$archivePath -Force
|
||||||
|
}
|
||||||
|
if (-not (Test-Path -LiteralPath `$archivePath -PathType Leaf)) {
|
||||||
|
Invoke-WebRequest -Uri `$packageUri -OutFile `$archivePath -UseBasicParsing -TimeoutSec 600
|
||||||
|
}
|
||||||
|
if ((Get-FileHash -LiteralPath `$archivePath -Algorithm SHA256).Hash -ne `$expectedSha256) {
|
||||||
|
throw 'The SGU Credential Provider update package did not match its expected SHA-256.'
|
||||||
|
}
|
||||||
|
|
||||||
|
`$installScript = Join-Path `$stagePath 'payload\scripts\Install-CredentialProvider.ps1'
|
||||||
|
if (-not (Test-Path -LiteralPath `$installScript -PathType Leaf)) {
|
||||||
|
if (Test-Path -LiteralPath `$stagePath -PathType Container) {
|
||||||
|
Remove-Item -LiteralPath `$stagePath -Recurse -Force
|
||||||
|
}
|
||||||
|
New-Item -ItemType Directory -Path `$stagePath -Force | Out-Null
|
||||||
|
Add-Type -AssemblyName System.IO.Compression.FileSystem
|
||||||
|
[IO.Compression.ZipFile]::ExtractToDirectory(`$archivePath, `$stagePath)
|
||||||
|
}
|
||||||
|
if (-not (Test-Path -LiteralPath `$installScript -PathType Leaf)) {
|
||||||
|
throw 'The verified update package did not contain Install-CredentialProvider.ps1.'
|
||||||
|
}
|
||||||
|
|
||||||
|
`$settingsPath = Join-Path `$env:ProgramData 'SGU\CredentialProvider\settings.json'
|
||||||
|
`$settings = Get-Content -LiteralPath `$settingsPath -Raw | ConvertFrom-Json
|
||||||
|
`$installParameters = @{
|
||||||
|
PublishPath = (Join-Path `$stagePath 'payload\credential-provider')
|
||||||
|
BrokerEndpoint = [string]`$settings.BrokerEndpoint
|
||||||
|
ClientCertificateThumbprint = [string]`$settings.ClientCertificateThumbprint
|
||||||
|
ServerCertificateThumbprint = [string]`$settings.ServerCertificateThumbprint
|
||||||
|
DomainNetbios = [string]`$settings.DomainNetbios
|
||||||
|
TimeoutSeconds = [int]`$settings.TimeoutSeconds
|
||||||
|
}
|
||||||
|
`$dotnet = Join-Path `$env:ProgramFiles 'dotnet\dotnet.exe'
|
||||||
|
`$runtimeInstalled = (Test-Path -LiteralPath `$dotnet -PathType Leaf) -and
|
||||||
|
(& `$dotnet --list-runtimes | Select-String '^Microsoft\.NETCore\.App 10\.')
|
||||||
|
if (-not `$runtimeInstalled) {
|
||||||
|
`$runtimeInstaller = Get-ChildItem -LiteralPath (Join-Path `$stagePath 'payload\prerequisites') -Filter '*x64*.exe' -File |
|
||||||
|
Select-Object -First 1
|
||||||
|
if (-not `$runtimeInstaller) {
|
||||||
|
throw 'The update package does not contain the required .NET x64 runtime installer.'
|
||||||
|
}
|
||||||
|
`$installParameters.InstallDotNetRuntime = `$true
|
||||||
|
`$installParameters.DotNetRuntimeInstallerPath = `$runtimeInstaller.FullName
|
||||||
|
}
|
||||||
|
|
||||||
|
& `$installScript @installParameters | Out-Null
|
||||||
|
[IO.File]::WriteAllText(`$markerPath, (Get-Date).ToUniversalTime().ToString('o'), [Text.UTF8Encoding]::new(`$false))
|
||||||
|
"@
|
||||||
|
|
||||||
|
if ($PSCmdlet.ShouldProcess($startupPath, "Install '$scriptName' as a computer startup script")) {
|
||||||
|
New-Item -ItemType Directory -Path $startupPath -Force | Out-Null
|
||||||
|
[IO.File]::WriteAllText($scriptPath, $startupScript, [Text.UTF8Encoding]::new($false))
|
||||||
|
$scriptUncPath = "\\$domainDnsRoot\SYSVOL\$domainDnsRoot\Policies\{$($gpo.Id)}\Machine\Scripts\Startup\$scriptName"
|
||||||
|
$scriptsIni = "[Startup]`r`n0CmdLine=powershell.exe`r`n0Parameters=-NoProfile -NonInteractive -ExecutionPolicy Bypass -File `"$scriptUncPath`"`r`n"
|
||||||
|
# The Scripts CSE requires UTF-16LE with a BOM. The explicit process
|
||||||
|
# execution policy allows the verified installer to run on Windows clients
|
||||||
|
# whose default PowerShell policy is Restricted.
|
||||||
|
[IO.File]::WriteAllText($scriptsIniPath, $scriptsIni, [Text.Encoding]::Unicode)
|
||||||
|
if (Test-Path -LiteralPath $legacyPowerShellScriptsIniPath -PathType Leaf) {
|
||||||
|
Remove-Item -LiteralPath $legacyPowerShellScriptsIniPath -Force
|
||||||
|
}
|
||||||
|
|
||||||
|
# Writing SYSVOL directly does not register the Scripts CSE in the GPO's
|
||||||
|
# Active Directory object. Without it, gpresult lists the GPO but the
|
||||||
|
# client never executes its startup script.
|
||||||
|
$gpoDn = "CN={$($gpo.Id)},CN=Policies,CN=System,$domainDn"
|
||||||
|
$gpoObject = Get-ADObject -Identity $gpoDn -Server $DomainController `
|
||||||
|
-Properties gPCMachineExtensionNames,versionNumber
|
||||||
|
$scriptExtension = '[{42B5FAAE-6536-11D2-AE5A-0000F87571E3}{40B6664F-4972-11D1-A7CA-0000F87571E3}]'
|
||||||
|
$extensionNames = [string]$gpoObject.gPCMachineExtensionNames
|
||||||
|
if ($extensionNames.IndexOf($scriptExtension, [StringComparison]::OrdinalIgnoreCase) -lt 0) {
|
||||||
|
Set-ADObject -Identity $gpoDn -Server $DomainController `
|
||||||
|
-Replace @{gPCMachineExtensionNames = "$extensionNames$scriptExtension"}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Keep the AD and SYSVOL computer versions synchronized and force clients
|
||||||
|
# to process this corrected script registration on their next refresh.
|
||||||
|
$gptIniPath = Join-Path (Split-Path (Split-Path $gpoScriptsPath -Parent) -Parent) 'GPT.ini'
|
||||||
|
$gptIni = Get-Content -LiteralPath $gptIniPath -Raw
|
||||||
|
$gptVersion = [int]([regex]::Match($gptIni, '(?m)^Version=(\d+)\r?$').Groups[1].Value)
|
||||||
|
$adVersion = [int]$gpoObject.versionNumber
|
||||||
|
$baseVersion = [Math]::Max($gptVersion, $adVersion)
|
||||||
|
$nextVersion = ($baseVersion -band -65536) -bor (($baseVersion + 1) -band 65535)
|
||||||
|
$updatedGptIni = [regex]::Replace($gptIni, '(?m)^Version=\d+\r?$', "Version=$nextVersion")
|
||||||
|
[IO.File]::WriteAllText($gptIniPath, $updatedGptIni, [Text.Encoding]::ASCII)
|
||||||
|
Set-ADObject -Identity $gpoDn -Server $DomainController -Replace @{versionNumber = $nextVersion}
|
||||||
|
}
|
||||||
|
|
||||||
|
[pscustomobject]@{
|
||||||
|
GpoName = $gpo.DisplayName
|
||||||
|
GpoId = $gpo.Id
|
||||||
|
LinkedTarget = $domainDn
|
||||||
|
StartupScript = $scriptPath
|
||||||
|
Version = $Version
|
||||||
|
PackageSha256 = $ClientPackageSha256.ToUpperInvariant()
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
[CmdletBinding(SupportsShouldProcess)]
|
||||||
|
param(
|
||||||
|
[string]$TargetOuDn = 'OU=Laboratorio,DC=lci,DC=lasalle,DC=mx',
|
||||||
|
[string]$GpoName = 'SGU - Windows client experience',
|
||||||
|
[string]$DomainController = $env:COMPUTERNAME
|
||||||
|
)
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$identity = [Security.Principal.WindowsIdentity]::GetCurrent()
|
||||||
|
if (-not ([Security.Principal.WindowsPrincipal]::new($identity)).IsInRole(
|
||||||
|
[Security.Principal.WindowsBuiltInRole]::Administrator)) {
|
||||||
|
throw 'Run this script elevated on the domain controller.'
|
||||||
|
}
|
||||||
|
Import-Module ActiveDirectory -ErrorAction Stop
|
||||||
|
Import-Module GroupPolicy -ErrorAction Stop
|
||||||
|
|
||||||
|
$targetOu = Get-ADOrganizationalUnit -Identity $TargetOuDn -Server $DomainController
|
||||||
|
$domain = Get-ADDomain -Server $DomainController
|
||||||
|
if (-not $targetOu.DistinguishedName.EndsWith($domain.DistinguishedName,
|
||||||
|
[StringComparison]::OrdinalIgnoreCase)) {
|
||||||
|
throw 'The target OU is outside the domain.'
|
||||||
|
}
|
||||||
|
$domainName = $domain.DNSRoot
|
||||||
|
$gpo = Get-GPO -Name $GpoName -Domain $domainName -Server $DomainController -ErrorAction Stop
|
||||||
|
$links = @(Get-GPInheritance -Target $TargetOuDn -Domain $domainName -Server $DomainController).GpoLinks
|
||||||
|
if (-not @($links | Where-Object { $_.DisplayName -eq $GpoName -and
|
||||||
|
[string]$_.Enabled -in @('True','Yes') }).Count) {
|
||||||
|
throw "The existing GPO '$GpoName' must be linked and enabled on $TargetOuDn."
|
||||||
|
}
|
||||||
|
|
||||||
|
# The existing machine GPO also manages the credential tile. The startup
|
||||||
|
# script is a native Group Policy extension, not a scheduled client task.
|
||||||
|
$scriptName = 'Enable-SguWorkstationRemoteAccess.ps1'
|
||||||
|
$sourcePath = Join-Path $PSScriptRoot $scriptName
|
||||||
|
$startupRoot = Join-Path $env:WINDIR "SYSVOL\domain\Policies\{$($gpo.Id)}\Machine\Scripts"
|
||||||
|
$startupPath = Join-Path $startupRoot "Startup\$scriptName"
|
||||||
|
$scriptsIniPath = Join-Path $startupRoot 'scripts.ini'
|
||||||
|
$source = [IO.File]::ReadAllText($sourcePath)
|
||||||
|
$unc = "\\$domainName\SYSVOL\$domainName\Policies\{$($gpo.Id)}\Machine\Scripts\Startup\$scriptName"
|
||||||
|
$ini = "[Startup]`r`n0CmdLine=powershell.exe`r`n0Parameters=-NoProfile -NonInteractive -ExecutionPolicy Bypass -File `"$unc`"`r`n"
|
||||||
|
$scriptChanged = -not (Test-Path -LiteralPath $startupPath) -or
|
||||||
|
[IO.File]::ReadAllText($startupPath) -cne $source
|
||||||
|
$iniChanged = -not (Test-Path -LiteralPath $scriptsIniPath) -or
|
||||||
|
[IO.File]::ReadAllText($scriptsIniPath) -cne $ini
|
||||||
|
|
||||||
|
if (($scriptChanged -or $iniChanged) -and
|
||||||
|
$PSCmdlet.ShouldProcess($startupRoot, 'Install computer startup script')) {
|
||||||
|
New-Item -ItemType Directory -Path (Split-Path $startupPath) -Force | Out-Null
|
||||||
|
[IO.File]::WriteAllText($startupPath, $source, [Text.UTF8Encoding]::new($false))
|
||||||
|
[IO.File]::WriteAllText($scriptsIniPath, $ini, [Text.Encoding]::Unicode)
|
||||||
|
$gpoDn = "CN={$($gpo.Id)},CN=Policies,CN=System,$($domain.DistinguishedName)"
|
||||||
|
$adGpo = Get-ADObject -Identity $gpoDn -Server $DomainController `
|
||||||
|
-Properties gPCMachineExtensionNames,versionNumber
|
||||||
|
$extension = '[{42B5FAAE-6536-11D2-AE5A-0000F87571E3}{40B6664F-4972-11D1-A7CA-0000F87571E3}]'
|
||||||
|
$names = [string]$adGpo.gPCMachineExtensionNames
|
||||||
|
if ($names.IndexOf($extension, [StringComparison]::OrdinalIgnoreCase) -lt 0) {
|
||||||
|
Set-ADObject -Identity $gpoDn -Server $DomainController `
|
||||||
|
-Replace @{gPCMachineExtensionNames = "$names$extension"}
|
||||||
|
}
|
||||||
|
$gptPath = Join-Path (Split-Path (Split-Path $startupRoot -Parent) -Parent) 'GPT.ini'
|
||||||
|
$gpt = [IO.File]::ReadAllText($gptPath)
|
||||||
|
$gptVersion = [int]([regex]::Match($gpt, '(?m)^Version=(\d+)\r?$').Groups[1].Value)
|
||||||
|
$baseVersion = [Math]::Max($gptVersion, [int]$adGpo.versionNumber)
|
||||||
|
$nextVersion = ($baseVersion -band -65536) -bor (($baseVersion + 1) -band 65535)
|
||||||
|
[IO.File]::WriteAllText($gptPath,
|
||||||
|
[regex]::Replace($gpt, '(?m)^Version=\d+\r?$', "Version=$nextVersion"),
|
||||||
|
[Text.Encoding]::ASCII)
|
||||||
|
Set-ADObject -Identity $gpoDn -Server $DomainController -Replace @{versionNumber = $nextVersion}
|
||||||
|
}
|
||||||
|
|
||||||
|
[pscustomobject]@{
|
||||||
|
GpoName = $GpoName
|
||||||
|
GpoId = $gpo.Id
|
||||||
|
TargetOu = $TargetOuDn
|
||||||
|
StartupScript = $startupPath
|
||||||
|
Changed = $scriptChanged -or $iniChanged
|
||||||
|
}
|
||||||
@@ -129,6 +129,7 @@ $clientScripts = @(
|
|||||||
'Register-SguClientCertificate.ps1',
|
'Register-SguClientCertificate.ps1',
|
||||||
'Repair-SguClientEnrollment.ps1',
|
'Repair-SguClientEnrollment.ps1',
|
||||||
'Set-SguStandardLocalUser.ps1',
|
'Set-SguStandardLocalUser.ps1',
|
||||||
|
'Set-SguLocalProfileSecurityPolicies.ps1',
|
||||||
'Test-SguClientEnrollment.ps1'
|
'Test-SguClientEnrollment.ps1'
|
||||||
)
|
)
|
||||||
foreach ($scriptName in $clientScripts) {
|
foreach ($scriptName in $clientScripts) {
|
||||||
@@ -209,9 +210,11 @@ $serverScripts = @(
|
|||||||
'Disable-SguAzureUserRoaming.ps1',
|
'Disable-SguAzureUserRoaming.ps1',
|
||||||
'Enable-SguAzureUserRoaming.ps1',
|
'Enable-SguAzureUserRoaming.ps1',
|
||||||
'Enable-SguServerRemoteManagement.ps1',
|
'Enable-SguServerRemoteManagement.ps1',
|
||||||
|
'Enable-SguWorkstationRemoteAccess.ps1',
|
||||||
'Get-SguUsageReport.ps1',
|
'Get-SguUsageReport.ps1',
|
||||||
'Get-SguBrokerLog.ps1',
|
'Get-SguBrokerLog.ps1',
|
||||||
'Install-SguDomainMonitoring.ps1',
|
'Install-SguDomainMonitoring.ps1',
|
||||||
|
'Install-SguWorkstationRemoteAccessPolicy.ps1',
|
||||||
'Publish-SguFsLogixClientDeployment.ps1',
|
'Publish-SguFsLogixClientDeployment.ps1',
|
||||||
'Install-SguRustDeskClient.ps1',
|
'Install-SguRustDeskClient.ps1',
|
||||||
'Install-SguRustDeskLinuxEnrollment.ps1',
|
'Install-SguRustDeskLinuxEnrollment.ps1',
|
||||||
@@ -225,6 +228,7 @@ $serverScripts = @(
|
|||||||
'Set-LabBrokerDns.ps1',
|
'Set-LabBrokerDns.ps1',
|
||||||
'Set-SguDomainComputerPolicies.ps1',
|
'Set-SguDomainComputerPolicies.ps1',
|
||||||
'Set-SguLaboratorioWallpaperPolicy.ps1',
|
'Set-SguLaboratorioWallpaperPolicy.ps1',
|
||||||
|
'Set-SguLocalProfileSecurityPolicies.ps1',
|
||||||
'Set-SguDomainUserPolicies.ps1'
|
'Set-SguDomainUserPolicies.ps1'
|
||||||
)
|
)
|
||||||
foreach ($scriptName in $serverScripts) {
|
foreach ($scriptName in $serverScripts) {
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ param(
|
|||||||
[string]$TargetOuDn = 'OU=Laboratorio,DC=lci,DC=lasalle,DC=mx',
|
[string]$TargetOuDn = 'OU=Laboratorio,DC=lci,DC=lasalle,DC=mx',
|
||||||
[string]$GpoName = 'SGU - Laboratorio wallpaper protection',
|
[string]$GpoName = 'SGU - Laboratorio wallpaper protection',
|
||||||
[string]$DomainController = $env:COMPUTERNAME,
|
[string]$DomainController = $env:COMPUTERNAME,
|
||||||
[string]$WallpaperPath = '%LOCALAPPDATA%\SGU\Wallpapers\welcome-%COMPUTERNAME%.jpg'
|
[string]$WallpaperPath = '%LOCALAPPDATA%\SGU\Wallpapers\welcome-%COMPUTERNAME%.jpg',
|
||||||
|
[string]$LocalProfilePolicyScriptPath = (Join-Path $PSScriptRoot 'Set-SguLocalProfileSecurityPolicies.ps1')
|
||||||
)
|
)
|
||||||
|
|
||||||
$ErrorActionPreference = 'Stop'
|
$ErrorActionPreference = 'Stop'
|
||||||
@@ -12,6 +13,118 @@ Import-Module ActiveDirectory -ErrorAction Stop
|
|||||||
Import-Module GroupPolicy -ErrorAction Stop
|
Import-Module GroupPolicy -ErrorAction Stop
|
||||||
$domainName = (Get-ADDomain -Server $DomainController).DNSRoot
|
$domainName = (Get-ADDomain -Server $DomainController).DNSRoot
|
||||||
Get-ADOrganizationalUnit -Identity $TargetOuDn -Server $DomainController -ErrorAction Stop | Out-Null
|
Get-ADOrganizationalUnit -Identity $TargetOuDn -Server $DomainController -ErrorAction Stop | Out-Null
|
||||||
|
|
||||||
|
function Set-SguLocalProfilePolicyStartupScript {
|
||||||
|
param(
|
||||||
|
[Parameter(Mandatory)]$Gpo,
|
||||||
|
[Parameter(Mandatory)][string]$DomainName,
|
||||||
|
[Parameter(Mandatory)][string]$DomainController,
|
||||||
|
[Parameter(Mandatory)][string]$SourceScript
|
||||||
|
)
|
||||||
|
|
||||||
|
if (-not (Test-Path -LiteralPath $SourceScript -PathType Leaf)) {
|
||||||
|
throw 'Set-SguLocalProfileSecurityPolicies.ps1 must be beside Set-SguLaboratorioWallpaperPolicy.ps1.'
|
||||||
|
}
|
||||||
|
|
||||||
|
$domainDn = (Get-ADDomain -Server $DomainController).DistinguishedName
|
||||||
|
$gpoAdPath = "CN={$($Gpo.Id)},CN=Policies,CN=System,$domainDn"
|
||||||
|
$gpoAd = Get-ADObject -Identity $gpoAdPath -Properties gPCFileSysPath,gPCMachineExtensionNames,versionNumber `
|
||||||
|
-Server $DomainController -ErrorAction Stop
|
||||||
|
$scriptsRoot = Join-Path $gpoAd.gPCFileSysPath 'Machine\Scripts'
|
||||||
|
$startupRoot = Join-Path $scriptsRoot 'Startup'
|
||||||
|
$destinationScript = Join-Path $startupRoot 'Set-SguLocalProfileSecurityPolicies.ps1'
|
||||||
|
$startupLauncher = Join-Path $startupRoot 'Start-SguLocalProfileSecurityPolicies.cmd'
|
||||||
|
$scriptsIniPath = Join-Path $scriptsRoot 'scripts.ini'
|
||||||
|
$legacyPowerShellScriptsIniPath = Join-Path $scriptsRoot 'psscripts.ini'
|
||||||
|
$scriptsIni = @"
|
||||||
|
[Startup]
|
||||||
|
0CmdLine=Start-SguLocalProfileSecurityPolicies.cmd
|
||||||
|
0Parameters=
|
||||||
|
"@
|
||||||
|
$normalizedScriptsIni = $scriptsIni.TrimEnd("`r", "`n")
|
||||||
|
$launcherContents = @"
|
||||||
|
@echo off
|
||||||
|
"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoLogo -NoProfile -NonInteractive -ExecutionPolicy Bypass -File "%~dp0Set-SguLocalProfileSecurityPolicies.ps1" -RunAsSystem
|
||||||
|
exit /b %ERRORLEVEL%
|
||||||
|
"@
|
||||||
|
$normalizedLauncherContents = $launcherContents.TrimEnd("`r", "`n")
|
||||||
|
$legacyManagedPowerShellScriptsIni = @"
|
||||||
|
[Startup]
|
||||||
|
0CmdLine=Set-SguLocalProfileSecurityPolicies.ps1
|
||||||
|
0Parameters=-RunAsSystem
|
||||||
|
"@.TrimEnd("`r", "`n")
|
||||||
|
# These are the Script CSE and its Group Policy editor snap-in. Domain
|
||||||
|
# clients ignore scripts.ini unless this CSE pair is on the GPO object.
|
||||||
|
$startupScriptExtension = '[{42B5FAAE-6536-11D2-AE5A-0000F87571E3}{40B66650-4972-11D1-A7CA-0000F87571E3}]'
|
||||||
|
# gPCMachineExtensionNames is a single concatenated AD attribute, even
|
||||||
|
# though it holds several CSE/snap-in GUID pairs.
|
||||||
|
$extensionValue = [string]($gpoAd.gPCMachineExtensionNames -join '')
|
||||||
|
$needsExtension = $extensionValue -notmatch [regex]::Escape($startupScriptExtension)
|
||||||
|
$needsScript = -not (Test-Path -LiteralPath $destinationScript -PathType Leaf)
|
||||||
|
if (-not $needsScript) {
|
||||||
|
$needsScript = (Get-FileHash -LiteralPath $SourceScript -Algorithm SHA256).Hash -ne
|
||||||
|
(Get-FileHash -LiteralPath $destinationScript -Algorithm SHA256).Hash
|
||||||
|
}
|
||||||
|
$needsIni = -not (Test-Path -LiteralPath $scriptsIniPath -PathType Leaf) -or
|
||||||
|
(Get-Content -LiteralPath $scriptsIniPath -Raw).TrimEnd("`r", "`n") -ne $normalizedScriptsIni
|
||||||
|
$needsLauncher = -not (Test-Path -LiteralPath $startupLauncher -PathType Leaf) -or
|
||||||
|
(Get-Content -LiteralPath $startupLauncher -Raw).TrimEnd("`r", "`n") -ne $normalizedLauncherContents
|
||||||
|
$removeLegacyPowerShellScriptsIni = (Test-Path -LiteralPath $legacyPowerShellScriptsIniPath -PathType Leaf) -and
|
||||||
|
(Get-Content -LiteralPath $legacyPowerShellScriptsIniPath -Raw).TrimEnd("`r", "`n") -eq $legacyManagedPowerShellScriptsIni
|
||||||
|
|
||||||
|
if ($needsScript -or $needsIni -or $needsLauncher -or $needsExtension -or $removeLegacyPowerShellScriptsIni) {
|
||||||
|
New-Item -ItemType Directory -Path $startupRoot -Force | Out-Null
|
||||||
|
Copy-Item -LiteralPath $SourceScript -Destination $destinationScript -Force
|
||||||
|
Set-Content -LiteralPath $scriptsIniPath -Value $normalizedScriptsIni -Encoding ASCII -NoNewline
|
||||||
|
Set-Content -LiteralPath $startupLauncher -Value $normalizedLauncherContents -Encoding ASCII -NoNewline
|
||||||
|
if ($removeLegacyPowerShellScriptsIni) {
|
||||||
|
Remove-Item -LiteralPath $legacyPowerShellScriptsIniPath -Force
|
||||||
|
}
|
||||||
|
if ($needsExtension) {
|
||||||
|
$extensionValue += $startupScriptExtension
|
||||||
|
}
|
||||||
|
|
||||||
|
# A GPO is replicated as both its SYSVOL file tree and its AD object.
|
||||||
|
# Bump the computer-side version only after the files are ready, then
|
||||||
|
# publish the same version in AD so clients process this new startup
|
||||||
|
# script on their next boot.
|
||||||
|
$currentVersion = [int64]$gpoAd.versionNumber
|
||||||
|
$currentComputerVersion = $currentVersion -band 0xFFFF
|
||||||
|
if ($currentComputerVersion -ge 65535) {
|
||||||
|
throw 'The laboratory GPO computer version cannot be incremented further.'
|
||||||
|
}
|
||||||
|
$nextVersion = ($currentVersion -band 0xFFFF0000) -bor ($currentComputerVersion + 1)
|
||||||
|
$gptIniPath = Join-Path $gpoAd.gPCFileSysPath 'gpt.ini'
|
||||||
|
$gptIni = Get-Content -LiteralPath $gptIniPath -Raw
|
||||||
|
$gptIni = [regex]::Replace($gptIni, '(?m)^Version=\d+\s*$', "Version=$nextVersion")
|
||||||
|
Set-Content -LiteralPath $gptIniPath -Value $gptIni -Encoding ASCII
|
||||||
|
# Set-ADObject validates a -Replace hashtable as one value type, so
|
||||||
|
# update the extension string and integer version in separate writes.
|
||||||
|
Set-ADObject -Identity $gpoAd.DistinguishedName -Server $DomainController -Replace @{
|
||||||
|
gPCMachineExtensionNames = $extensionValue
|
||||||
|
}
|
||||||
|
Set-ADObject -Identity $gpoAd.DistinguishedName -Server $DomainController -Replace @{
|
||||||
|
versionNumber = $nextVersion
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$verifiedGpoAd = Get-ADObject -Identity $gpoAdPath -Properties gPCMachineExtensionNames `
|
||||||
|
-Server $DomainController -ErrorAction Stop
|
||||||
|
if ([string]($verifiedGpoAd.gPCMachineExtensionNames -join '') -notmatch [regex]::Escape($startupScriptExtension) -or
|
||||||
|
-not (Test-Path -LiteralPath $destinationScript -PathType Leaf) -or
|
||||||
|
-not (Test-Path -LiteralPath $startupLauncher -PathType Leaf) -or
|
||||||
|
(Get-Content -LiteralPath $scriptsIniPath -Raw).TrimEnd("`r", "`n") -ne $normalizedScriptsIni -or
|
||||||
|
(Get-Content -LiteralPath $startupLauncher -Raw).TrimEnd("`r", "`n") -ne $normalizedLauncherContents) {
|
||||||
|
throw 'The laboratory local-profile startup policy was not configured correctly.'
|
||||||
|
}
|
||||||
|
|
||||||
|
return [pscustomobject]@{
|
||||||
|
Configured = $true
|
||||||
|
Script = $destinationScript
|
||||||
|
RunsAs = 'LocalSystem'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (-not $PSCmdlet.ShouldProcess($TargetOuDn, "Apply '$GpoName' with enforced loopback Merge")) {
|
if (-not $PSCmdlet.ShouldProcess($TargetOuDn, "Apply '$GpoName' with enforced loopback Merge")) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -67,6 +180,8 @@ foreach ($setting in $settings) {
|
|||||||
throw "Wallpaper policy verification failed for $($setting.Name)."
|
throw "Wallpaper policy verification failed for $($setting.Name)."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$startupPolicy = Set-SguLocalProfilePolicyStartupScript -Gpo $gpo -DomainName $domainName `
|
||||||
|
-DomainController $DomainController -SourceScript $LocalProfilePolicyScriptPath
|
||||||
[pscustomobject]@{
|
[pscustomobject]@{
|
||||||
Name = $gpo.DisplayName
|
Name = $gpo.DisplayName
|
||||||
Id = $gpo.Id
|
Id = $gpo.Id
|
||||||
@@ -74,6 +189,8 @@ foreach ($setting in $settings) {
|
|||||||
WallpaperPath = $WallpaperPath
|
WallpaperPath = $WallpaperPath
|
||||||
Loopback = 'Merge'
|
Loopback = 'Merge'
|
||||||
DisableLockWorkstationForAllUsers = $true
|
DisableLockWorkstationForAllUsers = $true
|
||||||
|
LocalProfileStartupPolicy = $startupPolicy.Configured
|
||||||
|
LocalProfileStartupScript = $startupPolicy.Script
|
||||||
Enforced = $true
|
Enforced = $true
|
||||||
BackupPath = $backupPath
|
BackupPath = $backupPath
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,249 @@
|
|||||||
|
#Requires -Version 5.1
|
||||||
|
[CmdletBinding(SupportsShouldProcess)]
|
||||||
|
param(
|
||||||
|
[switch]$RunAsSystem,
|
||||||
|
[string]$StatePath = "$env:ProgramData\SGU\Enrollment\local-profile-security-policy.json"
|
||||||
|
)
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$policyRelativePath = 'Software\Microsoft\Windows\CurrentVersion\Policies\System'
|
||||||
|
$policyValueName = 'DisableLockWorkstation'
|
||||||
|
$systemSid = 'S-1-5-18'
|
||||||
|
|
||||||
|
function Test-SguRunningAsSystem {
|
||||||
|
$currentSid = [Security.Principal.WindowsIdentity]::GetCurrent().User.Value
|
||||||
|
return $currentSid -eq $systemSid
|
||||||
|
}
|
||||||
|
|
||||||
|
function Set-SguRegistryDword {
|
||||||
|
param(
|
||||||
|
[Parameter(Mandatory)][string]$RegistryPath,
|
||||||
|
[Parameter(Mandatory)][string]$Name,
|
||||||
|
[Parameter(Mandatory)][int]$Value
|
||||||
|
)
|
||||||
|
|
||||||
|
New-Item -Path $RegistryPath -Force | Out-Null
|
||||||
|
New-ItemProperty -Path $RegistryPath -Name $Name -PropertyType DWord -Value $Value -Force | Out-Null
|
||||||
|
$actual = Get-ItemPropertyValue -Path $RegistryPath -Name $Name -ErrorAction Stop
|
||||||
|
if ([int]$actual -ne $Value) {
|
||||||
|
throw "Could not set $Name to $Value in $RegistryPath."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Set-SguRegHiveDword {
|
||||||
|
param(
|
||||||
|
[Parameter(Mandatory)][string]$Hive,
|
||||||
|
[Parameter(Mandatory)][string]$Name,
|
||||||
|
[Parameter(Mandatory)][int]$Value
|
||||||
|
)
|
||||||
|
|
||||||
|
# Do not use the PowerShell registry provider against an offline NTUSER.DAT
|
||||||
|
# hive. It can retain a registry-key handle until the runspace exits, which
|
||||||
|
# prevents reg.exe from unloading that hive. reg.exe opens and closes its
|
||||||
|
# own handle before returning.
|
||||||
|
$key = "$Hive\$policyRelativePath"
|
||||||
|
& reg.exe add $key /v $Name /t REG_DWORD /d $Value /f | Out-Null
|
||||||
|
if ($LASTEXITCODE -ne 0) {
|
||||||
|
throw "Could not set $Name in offline hive $Hive (exit code $LASTEXITCODE)."
|
||||||
|
}
|
||||||
|
$verification = (& reg.exe query $key /v $Name) -join [Environment]::NewLine
|
||||||
|
if ($LASTEXITCODE -ne 0 -or ($verification -notmatch "\b$Name\b\s+REG_DWORD\s+0x0*1\b")) {
|
||||||
|
throw "Could not verify $Name in offline hive $Hive."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Invoke-SguProfileHivePolicy {
|
||||||
|
param(
|
||||||
|
[Parameter(Mandatory)]$Profile,
|
||||||
|
[Parameter(Mandatory)][string]$HiveName
|
||||||
|
)
|
||||||
|
|
||||||
|
$profilePath = [string]$Profile.LocalPath
|
||||||
|
$ntUserDat = Join-Path $profilePath 'NTUSER.DAT'
|
||||||
|
if (-not (Test-Path -LiteralPath $ntUserDat -PathType Leaf)) {
|
||||||
|
return [pscustomobject]@{
|
||||||
|
UserName = Split-Path $profilePath -Leaf
|
||||||
|
Sid = [string]$Profile.SID
|
||||||
|
LocalPath = $profilePath
|
||||||
|
Status = 'SkippedNoHive'
|
||||||
|
DisableLockWorkstation = $false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$userName = Split-Path $profilePath -Leaf
|
||||||
|
$loadedHivePath = "Registry::HKEY_USERS\$($Profile.SID)"
|
||||||
|
if ($Profile.Loaded -and (Test-Path -LiteralPath $loadedHivePath)) {
|
||||||
|
Set-SguRegistryDword -RegistryPath (Join-Path $loadedHivePath $policyRelativePath) `
|
||||||
|
-Name $policyValueName -Value 1
|
||||||
|
return [pscustomobject]@{
|
||||||
|
UserName = $userName
|
||||||
|
Sid = [string]$Profile.SID
|
||||||
|
LocalPath = $profilePath
|
||||||
|
Status = 'UpdatedLoadedHive'
|
||||||
|
DisableLockWorkstation = $true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$regHive = "HKU\$HiveName"
|
||||||
|
& reg.exe load $regHive $ntUserDat | Out-Null
|
||||||
|
if ($LASTEXITCODE -ne 0) {
|
||||||
|
throw "Unable to load the local profile hive for '$userName' (exit code $LASTEXITCODE)."
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
Set-SguRegHiveDword -Hive $regHive -Name $policyValueName -Value 1
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
& reg.exe unload $regHive | Out-Null
|
||||||
|
if ($LASTEXITCODE -ne 0) {
|
||||||
|
throw "Unable to unload the local profile hive for '$userName' (exit code $LASTEXITCODE)."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[pscustomobject]@{
|
||||||
|
UserName = $userName
|
||||||
|
Sid = [string]$Profile.SID
|
||||||
|
LocalPath = $profilePath
|
||||||
|
Status = 'UpdatedUnloadedHive'
|
||||||
|
DisableLockWorkstation = $true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Invoke-SguDefaultProfilePolicy {
|
||||||
|
$defaultProfile = Join-Path $env:SystemDrive 'Users\Default\NTUSER.DAT'
|
||||||
|
if (-not (Test-Path -LiteralPath $defaultProfile -PathType Leaf)) {
|
||||||
|
throw "The default user hive was not found at $defaultProfile."
|
||||||
|
}
|
||||||
|
|
||||||
|
$hiveName = 'SGU-DefaultProfile-' + [guid]::NewGuid().ToString('N')
|
||||||
|
$regHive = "HKU\$hiveName"
|
||||||
|
& reg.exe load $regHive $defaultProfile | Out-Null
|
||||||
|
if ($LASTEXITCODE -ne 0) {
|
||||||
|
throw "Unable to load the default user hive (exit code $LASTEXITCODE)."
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
Set-SguRegHiveDword -Hive $regHive -Name $policyValueName -Value 1
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
& reg.exe unload $regHive | Out-Null
|
||||||
|
if ($LASTEXITCODE -ne 0) {
|
||||||
|
throw "Unable to unload the default user hive (exit code $LASTEXITCODE)."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Invoke-SguSystemWorker {
|
||||||
|
param(
|
||||||
|
[Parameter(Mandatory)][string]$ScriptPath,
|
||||||
|
[Parameter(Mandatory)][string]$ResultPath
|
||||||
|
)
|
||||||
|
|
||||||
|
$taskName = 'SGU-ApplyLocalProfileSecurity-' + [guid]::NewGuid().ToString('N')
|
||||||
|
$powerShellPath = Join-Path $env:SystemRoot 'System32\WindowsPowerShell\v1.0\powershell.exe'
|
||||||
|
$escapedScriptPath = $ScriptPath.Replace("'", "''")
|
||||||
|
$escapedResultPath = $ResultPath.Replace("'", "''")
|
||||||
|
# Task Scheduler does not apply PowerShell quoting rules to a -File command
|
||||||
|
# line consistently. An encoded command makes the SYSTEM hand-off reliable
|
||||||
|
# even when the enrollment directory contains spaces.
|
||||||
|
$workerCommand = "& '$escapedScriptPath' -RunAsSystem -StatePath '$escapedResultPath'"
|
||||||
|
$encodedWorkerCommand = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($workerCommand))
|
||||||
|
$arguments = "-NoLogo -NoProfile -NonInteractive -ExecutionPolicy Bypass -EncodedCommand $encodedWorkerCommand"
|
||||||
|
$action = New-ScheduledTaskAction -Execute $powerShellPath -Argument $arguments
|
||||||
|
$principal = New-ScheduledTaskPrincipal -UserId 'SYSTEM' -LogonType ServiceAccount -RunLevel Highest
|
||||||
|
|
||||||
|
try {
|
||||||
|
Register-ScheduledTask -TaskName $taskName -Action $action -Principal $principal -Force | Out-Null
|
||||||
|
Start-ScheduledTask -TaskName $taskName
|
||||||
|
$deadline = (Get-Date).AddMinutes(2)
|
||||||
|
do {
|
||||||
|
Start-Sleep -Milliseconds 400
|
||||||
|
$task = Get-ScheduledTask -TaskName $taskName -ErrorAction Stop
|
||||||
|
} while ($task.State -eq 'Running' -and (Get-Date) -lt $deadline)
|
||||||
|
|
||||||
|
$taskInfo = Get-ScheduledTaskInfo -TaskName $taskName -ErrorAction Stop
|
||||||
|
if ($task.State -eq 'Running') {
|
||||||
|
throw 'The temporary SYSTEM policy worker did not finish within two minutes.'
|
||||||
|
}
|
||||||
|
if (-not (Test-Path -LiteralPath $ResultPath -PathType Leaf)) {
|
||||||
|
if ($taskInfo.LastTaskResult -ne 0) {
|
||||||
|
throw "The temporary SYSTEM policy worker failed with exit code $($taskInfo.LastTaskResult) and did not write its verification state."
|
||||||
|
}
|
||||||
|
throw 'The SYSTEM policy worker completed without writing its verification state.'
|
||||||
|
}
|
||||||
|
$result = Get-Content -LiteralPath $ResultPath -Raw | ConvertFrom-Json
|
||||||
|
if ($taskInfo.LastTaskResult -ne 0) {
|
||||||
|
$failureDetail = if ($result.Error) { ": $($result.Error)" } else { '' }
|
||||||
|
throw "The temporary SYSTEM policy worker failed with exit code $($taskInfo.LastTaskResult)$failureDetail"
|
||||||
|
}
|
||||||
|
if (-not $result.IsValid) {
|
||||||
|
throw 'The SYSTEM policy worker did not verify every local user profile.'
|
||||||
|
}
|
||||||
|
return $result
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$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 session.'
|
||||||
|
}
|
||||||
|
if ($RunAsSystem -and -not (Test-SguRunningAsSystem)) {
|
||||||
|
throw '-RunAsSystem is reserved for the temporary SYSTEM policy worker.'
|
||||||
|
}
|
||||||
|
|
||||||
|
$stateDirectory = Split-Path -Path $StatePath -Parent
|
||||||
|
if (-not $RunAsSystem) {
|
||||||
|
if (-not $PSCmdlet.ShouldProcess($env:COMPUTERNAME, 'Apply DisableLockWorkstation to every local user profile')) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
New-Item -ItemType Directory -Path $stateDirectory -Force | Out-Null
|
||||||
|
$workerResult = Invoke-SguSystemWorker -ScriptPath $PSCommandPath -ResultPath $StatePath
|
||||||
|
return [pscustomobject]$workerResult
|
||||||
|
}
|
||||||
|
|
||||||
|
New-Item -ItemType Directory -Path $stateDirectory -Force | Out-Null
|
||||||
|
$profileResults = [Collections.Generic.List[object]]::new()
|
||||||
|
$defaultProfileConfigured = $false
|
||||||
|
$failure = $null
|
||||||
|
try {
|
||||||
|
$localSids = @(Get-LocalUser | ForEach-Object { $_.SID.Value })
|
||||||
|
$localProfiles = @(Get-CimInstance Win32_UserProfile | Where-Object {
|
||||||
|
-not $_.Special -and $localSids -contains $_.SID
|
||||||
|
})
|
||||||
|
$counter = 0
|
||||||
|
foreach ($profile in $localProfiles) {
|
||||||
|
$counter++
|
||||||
|
$hiveName = 'SGU-LocalProfile-{0}-{1}' -f $counter, [guid]::NewGuid().ToString('N')
|
||||||
|
$profileResults.Add((Invoke-SguProfileHivePolicy -Profile $profile -HiveName $hiveName))
|
||||||
|
}
|
||||||
|
Invoke-SguDefaultProfilePolicy
|
||||||
|
$defaultProfileConfigured = $true
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
$failure = $_.Exception.Message
|
||||||
|
}
|
||||||
|
|
||||||
|
$failedProfiles = @($profileResults | Where-Object { -not $_.DisableLockWorkstation })
|
||||||
|
$result = [pscustomobject]@{
|
||||||
|
ComputerName = $env:COMPUTERNAME
|
||||||
|
GeneratedAt = (Get-Date).ToString('o')
|
||||||
|
IsValid = ([string]::IsNullOrWhiteSpace($failure) -and $defaultProfileConfigured -and $failedProfiles.Count -eq 0)
|
||||||
|
PolicyName = $policyValueName
|
||||||
|
PolicyValue = 1
|
||||||
|
LocalProfiles = @($profileResults)
|
||||||
|
DefaultProfileConfigured = $defaultProfileConfigured
|
||||||
|
Error = $failure
|
||||||
|
}
|
||||||
|
$result | ConvertTo-Json -Depth 5 | Set-Content -LiteralPath $StatePath -Encoding UTF8
|
||||||
|
if (-not $result.IsValid) {
|
||||||
|
$failureMessage = if ($failure) {
|
||||||
|
$failure
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
'DisableLockWorkstation could not be applied to every local user profile.'
|
||||||
|
}
|
||||||
|
throw $failureMessage
|
||||||
|
}
|
||||||
|
[pscustomobject]$result
|
||||||
@@ -124,10 +124,21 @@ if (-not $verifiedPasswordNeverExpires) {
|
|||||||
throw "The local account '$userName' password is not configured to never expire."
|
throw "The local account '$userName' password is not configured to never expire."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$localProfilePolicyScript = Join-Path $PSScriptRoot 'Set-SguLocalProfileSecurityPolicies.ps1'
|
||||||
|
if (-not (Test-Path -LiteralPath $localProfilePolicyScript -PathType Leaf)) {
|
||||||
|
throw 'Set-SguLocalProfileSecurityPolicies.ps1 must be beside Set-SguStandardLocalUser.ps1.'
|
||||||
|
}
|
||||||
|
$localProfilePolicy = & $localProfilePolicyScript
|
||||||
|
if (-not $localProfilePolicy.IsValid) {
|
||||||
|
throw 'The local profile security policy did not reach every local user profile.'
|
||||||
|
}
|
||||||
|
|
||||||
[pscustomobject]@{
|
[pscustomobject]@{
|
||||||
UserName = $verifiedUser.Name
|
UserName = $verifiedUser.Name
|
||||||
Enabled = $verifiedUser.Enabled
|
Enabled = $verifiedUser.Enabled
|
||||||
IsAdministrator = $false
|
IsAdministrator = $false
|
||||||
IsStandardUser = $true
|
IsStandardUser = $true
|
||||||
PasswordNeverExpires = $verifiedPasswordNeverExpires
|
PasswordNeverExpires = $verifiedPasswordNeverExpires
|
||||||
|
DisableLockWorkstationForAllLocalProfiles = [bool]$localProfilePolicy.IsValid
|
||||||
|
LocalProfilesSecured = @($localProfilePolicy.LocalProfiles).Count
|
||||||
}
|
}
|
||||||
@@ -18,6 +18,7 @@ $classRegistryPath = "HKLM:\SOFTWARE\Classes\CLSID\$providerClassId\InprocServer
|
|||||||
$defaultProviderPolicyPath = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\System'
|
$defaultProviderPolicyPath = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\System'
|
||||||
$interactiveLogonPolicyPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System'
|
$interactiveLogonPolicyPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System'
|
||||||
$settingsPath = Join-Path $env:ProgramData 'SGU\CredentialProvider\settings.json'
|
$settingsPath = Join-Path $env:ProgramData 'SGU\CredentialProvider\settings.json'
|
||||||
|
$localProfilePolicyStatePath = Join-Path $env:ProgramData 'SGU\Enrollment\local-profile-security-policy.json'
|
||||||
$issues = [Collections.Generic.List[string]]::new()
|
$issues = [Collections.Generic.List[string]]::new()
|
||||||
$standardLocalUserName = 'alumno'
|
$standardLocalUserName = 'alumno'
|
||||||
$passwordNeverExpiresFlag = 0x10000
|
$passwordNeverExpiresFlag = 0x10000
|
||||||
@@ -120,6 +121,20 @@ if (-not $localUserEnumerationDisabled) {
|
|||||||
$issues.Add('Local user enumeration is not explicitly disabled for the domain client.')
|
$issues.Add('Local user enumeration is not explicitly disabled for the domain client.')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$localProfileLockingConfigured = $false
|
||||||
|
try {
|
||||||
|
$localProfilePolicyState = Get-Content -LiteralPath $localProfilePolicyStatePath -Raw | ConvertFrom-Json
|
||||||
|
$localProfileLockingConfigured = [bool]$localProfilePolicyState.IsValid -and
|
||||||
|
[bool]$localProfilePolicyState.DefaultProfileConfigured -and
|
||||||
|
@($localProfilePolicyState.LocalProfiles | Where-Object { -not $_.DisableLockWorkstation }).Count -eq 0
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
# The enrollment report below identifies the absent system-worker verification state.
|
||||||
|
}
|
||||||
|
if (-not $localProfileLockingConfigured) {
|
||||||
|
$issues.Add('DisableLockWorkstation is not configured for every local user profile and the default profile.')
|
||||||
|
}
|
||||||
|
|
||||||
$passwordProviderPreserved = Test-Path -LiteralPath $passwordProviderRegistryPath
|
$passwordProviderPreserved = Test-Path -LiteralPath $passwordProviderRegistryPath
|
||||||
if (-not $passwordProviderPreserved) {
|
if (-not $passwordProviderPreserved) {
|
||||||
$issues.Add('The built-in Microsoft password provider registration is missing.')
|
$issues.Add('The built-in Microsoft password provider registration is missing.')
|
||||||
@@ -295,6 +310,7 @@ $result = [pscustomobject]@{
|
|||||||
LastSignedInUserHidden = $lastSignedInUserHidden
|
LastSignedInUserHidden = $lastSignedInUserHidden
|
||||||
FastUserSwitchingHidden = $fastUserSwitchingHidden
|
FastUserSwitchingHidden = $fastUserSwitchingHidden
|
||||||
LocalUserEnumerationDisabled = $localUserEnumerationDisabled
|
LocalUserEnumerationDisabled = $localUserEnumerationDisabled
|
||||||
|
LocalProfileLockingConfigured = $localProfileLockingConfigured
|
||||||
PasswordProviderPreserved = $passwordProviderPreserved
|
PasswordProviderPreserved = $passwordProviderPreserved
|
||||||
StandardLocalUserPresent = $standardLocalUserPresent
|
StandardLocalUserPresent = $standardLocalUserPresent
|
||||||
StandardLocalUserEnabled = $standardLocalUserEnabled
|
StandardLocalUserEnabled = $standardLocalUserEnabled
|
||||||
|
|||||||
@@ -13,7 +13,8 @@ public sealed record InstitutionalProfile(
|
|||||||
string? City = null,
|
string? City = null,
|
||||||
string? State = null,
|
string? State = null,
|
||||||
string? PostalCode = null,
|
string? PostalCode = null,
|
||||||
InstitutionalGender? Gender = null)
|
InstitutionalGender? Gender = null,
|
||||||
|
byte[]? ThumbnailPhoto = null)
|
||||||
{
|
{
|
||||||
public bool HasValues =>
|
public bool HasValues =>
|
||||||
EmployeeNumber is not null ||
|
EmployeeNumber is not null ||
|
||||||
@@ -28,7 +29,8 @@ public sealed record InstitutionalProfile(
|
|||||||
City is not null ||
|
City is not null ||
|
||||||
State is not null ||
|
State is not null ||
|
||||||
PostalCode is not null ||
|
PostalCode is not null ||
|
||||||
Gender is not null;
|
Gender is not null ||
|
||||||
|
ThumbnailPhoto is not null;
|
||||||
|
|
||||||
public InstitutionalProfile Overlay(InstitutionalProfile? values) =>
|
public InstitutionalProfile Overlay(InstitutionalProfile? values) =>
|
||||||
values is null
|
values is null
|
||||||
@@ -47,6 +49,7 @@ public sealed record InstitutionalProfile(
|
|||||||
City = values.City ?? City,
|
City = values.City ?? City,
|
||||||
State = values.State ?? State,
|
State = values.State ?? State,
|
||||||
PostalCode = values.PostalCode ?? PostalCode,
|
PostalCode = values.PostalCode ?? PostalCode,
|
||||||
Gender = values.Gender ?? Gender
|
Gender = values.Gender ?? Gender,
|
||||||
|
ThumbnailPhoto = values.ThumbnailPhoto ?? ThumbnailPhoto
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -17,10 +17,13 @@ internal static class BrokerEventIds
|
|||||||
internal static readonly EventId ProfileEnrichmentTimeout = new(1202, nameof(ProfileEnrichmentTimeout));
|
internal static readonly EventId ProfileEnrichmentTimeout = new(1202, nameof(ProfileEnrichmentTimeout));
|
||||||
internal static readonly EventId ProfileEnrichmentFailure = new(1203, nameof(ProfileEnrichmentFailure));
|
internal static readonly EventId ProfileEnrichmentFailure = new(1203, nameof(ProfileEnrichmentFailure));
|
||||||
internal static readonly EventId ProfilePageUnavailable = new(1204, nameof(ProfilePageUnavailable));
|
internal static readonly EventId ProfilePageUnavailable = new(1204, nameof(ProfilePageUnavailable));
|
||||||
|
internal static readonly EventId ProfilePhotoUnavailable = new(1205, nameof(ProfilePhotoUnavailable));
|
||||||
|
internal static readonly EventId ProfilePhotoInvalid = new(1206, nameof(ProfilePhotoInvalid));
|
||||||
|
|
||||||
internal static readonly EventId DirectorySynchronizationFailure = new(1300, nameof(DirectorySynchronizationFailure));
|
internal static readonly EventId DirectorySynchronizationFailure = new(1300, nameof(DirectorySynchronizationFailure));
|
||||||
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));
|
internal static readonly EventId DirectoryPasswordChangeDenied = new(1304, nameof(DirectoryPasswordChangeDenied));
|
||||||
|
internal static readonly EventId DirectoryPhotoFailure = new(1305, nameof(DirectoryPhotoFailure));
|
||||||
}
|
}
|
||||||
@@ -161,7 +161,7 @@ app.MapPost("/v1/authenticate", async (
|
|||||||
AuthenticationFlowOutcome.InvalidCredentials => Results.Json(
|
AuthenticationFlowOutcome.InvalidCredentials => Results.Json(
|
||||||
new ErrorResponse(
|
new ErrorResponse(
|
||||||
result.ErrorCode ?? "INVALID_INSTITUTIONAL_CREDENTIALS",
|
result.ErrorCode ?? "INVALID_INSTITUTIONAL_CREDENTIALS",
|
||||||
"Credenciales institucionales inválidas."),
|
"Usuario o contraseña incorrectos."),
|
||||||
statusCode: StatusCodes.Status401Unauthorized),
|
statusCode: StatusCodes.Status401Unauthorized),
|
||||||
|
|
||||||
_ => Unavailable(context, result.ErrorCode)
|
_ => Unavailable(context, result.ErrorCode)
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
<ProjectReference Include="..\SGU.AuthBroker.Core\SGU.AuthBroker.Core.csproj" />
|
<ProjectReference Include="..\SGU.AuthBroker.Core\SGU.AuthBroker.Core.csproj" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.11" />
|
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.11" />
|
||||||
<PackageReference Include="System.DirectoryServices" Version="10.0.11" />
|
<PackageReference Include="System.DirectoryServices" Version="10.0.11" />
|
||||||
|
<PackageReference Include="System.Drawing.Common" Version="10.0.11" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -142,6 +142,7 @@ public sealed class ActiveDirectorySynchronizer(
|
|||||||
user.CommitChanges();
|
user.CommitChanges();
|
||||||
|
|
||||||
TryApplyProfile(user, identity, profile, options.DefaultCompany, logger);
|
TryApplyProfile(user, identity, profile, options.DefaultCompany, logger);
|
||||||
|
TryApplyPhoto(user, identity.UserName, profile?.ThumbnailPhoto);
|
||||||
TryEnsureRemoteDesktopGroupMembership(user, identity.UserName);
|
TryEnsureRemoteDesktopGroupMembership(user, identity.UserName);
|
||||||
|
|
||||||
return new DirectorySyncResult(
|
return new DirectorySyncResult(
|
||||||
@@ -264,6 +265,42 @@ public sealed class ActiveDirectorySynchronizer(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void TryApplyPhoto(DirectoryEntry user, string institutionalUser, byte[]? photo)
|
||||||
|
{
|
||||||
|
if (photo is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (user.Properties["thumbnailPhoto"].Value is byte[] existing &&
|
||||||
|
existing.AsSpan().SequenceEqual(photo))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
user.Properties["thumbnailPhoto"].Value = photo;
|
||||||
|
user.CommitChanges();
|
||||||
|
}
|
||||||
|
catch (Exception exception)
|
||||||
|
{
|
||||||
|
logger.LogWarning(
|
||||||
|
BrokerEventIds.DirectoryPhotoFailure,
|
||||||
|
exception,
|
||||||
|
"Optional Active Directory thumbnailPhoto could not be committed for {InstitutionalUser}; account synchronization remains completed.",
|
||||||
|
institutionalUser);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
user.RefreshCache();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Photo metadata must not change the successful authentication result.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static void SetGenderMetadata(
|
private static void SetGenderMetadata(
|
||||||
DirectoryEntry entry,
|
DirectoryEntry entry,
|
||||||
InstitutionalGender? gender,
|
InstitutionalGender? gender,
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Drawing.Imaging;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
@@ -11,6 +13,9 @@ namespace SGU.AuthBroker.Services;
|
|||||||
|
|
||||||
public sealed class NtlmCredentialValidator : INtlmCredentialValidator
|
public sealed class NtlmCredentialValidator : INtlmCredentialValidator
|
||||||
{
|
{
|
||||||
|
private const int MaximumPhotoBytes = 100 * 1024;
|
||||||
|
private const int MinimumPhotoBytes = 128;
|
||||||
|
private static readonly TimeSpan PhotoTimeout = TimeSpan.FromSeconds(3);
|
||||||
private readonly NtlmOptions options;
|
private readonly NtlmOptions options;
|
||||||
private readonly ILogger<NtlmCredentialValidator> logger;
|
private readonly ILogger<NtlmCredentialValidator> logger;
|
||||||
private readonly Func<CredentialCache, CookieContainer, HttpMessageHandler> handlerFactory;
|
private readonly Func<CredentialCache, CookieContainer, HttpMessageHandler> handlerFactory;
|
||||||
@@ -353,6 +358,20 @@ public sealed class NtlmCredentialValidator : INtlmCredentialValidator
|
|||||||
elapsed).ConfigureAwait(false);
|
elapsed).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (string.Equals(profile?.EmployeeNumber, identity.NumericId, StringComparison.Ordinal))
|
||||||
|
{
|
||||||
|
byte[]? photo = await TryFetchPhotoAsync(
|
||||||
|
client,
|
||||||
|
identity,
|
||||||
|
allowedHosts,
|
||||||
|
timeout.Token,
|
||||||
|
cancellationToken).ConfigureAwait(false);
|
||||||
|
if (photo is not null)
|
||||||
|
{
|
||||||
|
profile = profile! with { ThumbnailPhoto = photo };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (profile is null)
|
if (profile is null)
|
||||||
{
|
{
|
||||||
logger.LogWarning(
|
logger.LogWarning(
|
||||||
@@ -680,6 +699,135 @@ public sealed class NtlmCredentialValidator : INtlmCredentialValidator
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task<byte[]?> TryFetchPhotoAsync(
|
||||||
|
HttpClient client,
|
||||||
|
UserIdentity identity,
|
||||||
|
HashSet<string> allowedHosts,
|
||||||
|
CancellationToken profileTimeoutToken,
|
||||||
|
CancellationToken requestCancellationToken)
|
||||||
|
{
|
||||||
|
// Only a number verified against the authenticated profile is used.
|
||||||
|
// Never follow an image URL supplied by SGU HTML to an arbitrary host.
|
||||||
|
int photoType = identity.Role == InstitutionalRole.Student ? 1 : 2;
|
||||||
|
Uri photoUri = GetProfileUri(
|
||||||
|
$"/psulsa/gadmon/admonPersonal/ashx/Fotografia.ashx?id={identity.NumericId}&tp={photoType}");
|
||||||
|
if (!IsAllowedHttpsUri(photoUri, allowedHosts))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
using CancellationTokenSource timeout = CancellationTokenSource.CreateLinkedTokenSource(profileTimeoutToken);
|
||||||
|
timeout.CancelAfter(PhotoTimeout);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using HttpRequestMessage request = new(HttpMethod.Get, photoUri);
|
||||||
|
using HttpResponseMessage response = await client.SendAsync(
|
||||||
|
request,
|
||||||
|
HttpCompletionOption.ResponseHeadersRead,
|
||||||
|
timeout.Token).ConfigureAwait(false);
|
||||||
|
if (response.StatusCode != HttpStatusCode.OK)
|
||||||
|
{
|
||||||
|
logger.LogWarning(
|
||||||
|
BrokerEventIds.ProfilePhotoUnavailable,
|
||||||
|
"SGU photo for role {Role} returned HTTP {StatusCode}; preserving existing Active Directory photo.",
|
||||||
|
identity.Role,
|
||||||
|
(int)response.StatusCode);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.Equals(
|
||||||
|
response.Content.Headers.ContentType?.MediaType,
|
||||||
|
"image/jpeg",
|
||||||
|
StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
response.Content.Headers.ContentLength is > MaximumPhotoBytes)
|
||||||
|
{
|
||||||
|
logger.LogWarning(
|
||||||
|
BrokerEventIds.ProfilePhotoInvalid,
|
||||||
|
"SGU photo for role {Role} had an unsupported media type or size; preserving existing Active Directory photo.",
|
||||||
|
identity.Role);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
await using Stream stream = await response.Content.ReadAsStreamAsync(timeout.Token)
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
using MemoryStream buffer = new();
|
||||||
|
byte[] chunk = new byte[8192];
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
int read = await stream.ReadAsync(chunk.AsMemory(), timeout.Token).ConfigureAwait(false);
|
||||||
|
if (read == 0)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (buffer.Length + read > MaximumPhotoBytes)
|
||||||
|
{
|
||||||
|
logger.LogWarning(
|
||||||
|
BrokerEventIds.ProfilePhotoInvalid,
|
||||||
|
"SGU photo for role {Role} exceeded the size limit; preserving existing Active Directory photo.",
|
||||||
|
identity.Role);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
buffer.Write(chunk, 0, read);
|
||||||
|
}
|
||||||
|
|
||||||
|
byte[] photo = buffer.ToArray();
|
||||||
|
if (photo.Length < MinimumPhotoBytes ||
|
||||||
|
photo[0] != 0xFF || photo[1] != 0xD8 || photo[2] != 0xFF ||
|
||||||
|
photo[^2] != 0xFF || photo[^1] != 0xD9 ||
|
||||||
|
!IsDecodableJpeg(photo))
|
||||||
|
{
|
||||||
|
logger.LogWarning(
|
||||||
|
BrokerEventIds.ProfilePhotoInvalid,
|
||||||
|
"SGU photo for role {Role} was not a valid JPEG payload; preserving existing Active Directory photo.",
|
||||||
|
identity.Role);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return photo;
|
||||||
|
}
|
||||||
|
catch (OperationCanceledException) when (requestCancellationToken.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
catch (OperationCanceledException)
|
||||||
|
{
|
||||||
|
logger.LogWarning(
|
||||||
|
BrokerEventIds.ProfilePhotoUnavailable,
|
||||||
|
"SGU photo request for role {Role} timed out; preserving existing Active Directory photo.",
|
||||||
|
identity.Role);
|
||||||
|
}
|
||||||
|
catch (Exception exception)
|
||||||
|
{
|
||||||
|
logger.LogWarning(
|
||||||
|
BrokerEventIds.ProfilePhotoUnavailable,
|
||||||
|
exception,
|
||||||
|
"SGU photo request for role {Role} failed; preserving existing Active Directory photo.",
|
||||||
|
identity.Role);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsDecodableJpeg(byte[] photo)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using MemoryStream input = new(photo, writable: false);
|
||||||
|
using Image image = Image.FromStream(input, useEmbeddedColorManagement: false, validateImageData: true);
|
||||||
|
return image.RawFormat.Guid == ImageFormat.Jpeg.Guid &&
|
||||||
|
image.Width is >= 1 and <= 4096 &&
|
||||||
|
image.Height is >= 1 and <= 4096;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
// Image decoding is optional metadata validation; malformed input
|
||||||
|
// from the portal must never interrupt account provisioning.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async Task<string?> TryPostProfilePageMethodAsync(
|
private async Task<string?> TryPostProfilePageMethodAsync(
|
||||||
HttpClient client,
|
HttpClient client,
|
||||||
Uri requestedUri,
|
Uri requestedUri,
|
||||||
|
|||||||
@@ -16,12 +16,12 @@ public sealed class SguCredentialProvider : CredentialProviderBase
|
|||||||
{
|
{
|
||||||
yield return new CredentialProviderLabelControl(
|
yield return new CredentialProviderLabelControl(
|
||||||
ControlKeys.ProviderLabel,
|
ControlKeys.ProviderLabel,
|
||||||
"La Salle · Acceso SGU");
|
"Acceso Institucional");
|
||||||
yield return new CredentialProviderLogoControl(
|
yield return new CredentialProviderLogoControl(
|
||||||
ControlKeys.ProviderLogo,
|
ControlKeys.ProviderLogo,
|
||||||
"Acceso institucional SGU",
|
"Acceso Institucional",
|
||||||
ProviderTileIcon.Create());
|
ProviderTileIcon.Create());
|
||||||
yield return new LargeLabelControl(ControlKeys.Heading, "Acceso institucional SGU")
|
yield return new LargeLabelControl(ControlKeys.Heading, "Iniciar sesión")
|
||||||
{
|
{
|
||||||
// Isolate the CPFT_LARGE_TEXT heading from the compact provider tile
|
// Isolate the CPFT_LARGE_TEXT heading from the compact provider tile
|
||||||
// for the selected-layout variant. LogonUI still owns the typography.
|
// for the selected-layout variant. LogonUI still owns the typography.
|
||||||
@@ -29,8 +29,8 @@ public sealed class SguCredentialProvider : CredentialProviderBase
|
|||||||
};
|
};
|
||||||
yield return new SmallLabelControl(
|
yield return new SmallLabelControl(
|
||||||
ControlKeys.InformationLabel,
|
ControlKeys.InformationLabel,
|
||||||
"Usa tu clave institucional (DO, AL o AD + 6 dígitos) y contraseña.");
|
"Escribe tu usuario institucional o de dominio y contraseña.");
|
||||||
yield return new TextboxControl(ControlKeys.UserName, "Clave institucional");
|
yield return new TextboxControl(ControlKeys.UserName, "Usuario");
|
||||||
SecurePasswordTextboxControl password = new(ControlKeys.Password, "Contraseña");
|
SecurePasswordTextboxControl password = new(ControlKeys.Password, "Contraseña");
|
||||||
yield return password;
|
yield return password;
|
||||||
yield return new SubmitButtonControl(ControlKeys.Submit, "Iniciar sesión", password);
|
yield return new SubmitButtonControl(ControlKeys.Submit, "Iniciar sesión", password);
|
||||||
@@ -43,7 +43,12 @@ public sealed class SguCredentialProvider : CredentialProviderBase
|
|||||||
|
|
||||||
public override bool ShouldIncludeGenericTile() => true;
|
public override bool ShouldIncludeGenericTile() => true;
|
||||||
|
|
||||||
public override CredentialTile CreateGenericTile() => new SguCredentialTile(this);
|
public override CredentialTile CreateGenericTile()
|
||||||
|
{
|
||||||
|
SguCredentialTile tile = new(this);
|
||||||
|
DefaultTile = tile;
|
||||||
|
return tile;
|
||||||
|
}
|
||||||
|
|
||||||
public override CredentialTile2 CreateUserTile(CredentialProviderUser user) =>
|
public override CredentialTile2 CreateUserTile(CredentialProviderUser user) =>
|
||||||
new SguCredentialTile(this, user);
|
new SguCredentialTile(this, user);
|
||||||
|
|||||||
@@ -34,9 +34,14 @@ internal sealed class SguCredentialTile : CredentialTile3
|
|||||||
|
|
||||||
protected override CredentialResponseBase GetCredentials()
|
protected override CredentialResponseBase GetCredentials()
|
||||||
{
|
{
|
||||||
if (!UserIdentityClassifier.TryParse(userNameControl.Text, out UserIdentity? identity) || identity is null)
|
ProviderSettings settings = TryLoadDomainOnlySettings();
|
||||||
|
if (!TryGetWindowsLogonName(
|
||||||
|
userNameControl.Text,
|
||||||
|
settings.DomainNetbios,
|
||||||
|
out string domain,
|
||||||
|
out string userName))
|
||||||
{
|
{
|
||||||
return Failure("La clave debe usar DO, AL o AD seguido de seis dígitos.");
|
return Failure("Escribe un usuario válido.");
|
||||||
}
|
}
|
||||||
|
|
||||||
SecureString securePassword = passwordControl.Password;
|
SecureString securePassword = passwordControl.Password;
|
||||||
@@ -45,10 +50,16 @@ internal sealed class SguCredentialTile : CredentialTile3
|
|||||||
return Failure("La contraseña es requerida.");
|
return Failure("La contraseña es requerida.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ordinary Active Directory accounts go straight to Windows. Only an
|
||||||
|
// institutional key needs SGU validation and the account UPSERT.
|
||||||
|
if (!UserIdentityClassifier.TryParse(userNameControl.Text, out UserIdentity? identity) || identity is null)
|
||||||
|
{
|
||||||
|
return DomainCredential(domain, userName, securePassword);
|
||||||
|
}
|
||||||
|
|
||||||
string plainTextPassword = CopyToManagedString(securePassword);
|
string plainTextPassword = CopyToManagedString(securePassword);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ProviderSettings settings;
|
|
||||||
BrokerDecision decision;
|
BrokerDecision decision;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -61,33 +72,25 @@ internal sealed class SguCredentialTile : CredentialTile3
|
|||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
settings = TryLoadDomainOnlySettings();
|
|
||||||
decision = BrokerDecision.Unavailable("LOCAL_CONFIGURATION_OR_TLS_ERROR");
|
decision = BrokerDecision.Unavailable("LOCAL_CONFIGURATION_OR_TLS_ERROR");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (decision.Kind == BrokerDecisionKind.InvalidCredentials)
|
if (decision.Kind == BrokerDecisionKind.Authorized)
|
||||||
{
|
{
|
||||||
return Failure("Credenciales institucionales inválidas.");
|
return DomainCredential(decision.Domain!, decision.UserName!, securePassword);
|
||||||
}
|
}
|
||||||
|
|
||||||
string domain = decision.Kind == BrokerDecisionKind.Authorized
|
// An SGU rejection does not create an account. Pass the unchanged
|
||||||
? decision.Domain!
|
// credential to Windows so an existing AD account with the same
|
||||||
: settings.DomainNetbios;
|
// name can still authenticate. A non-existent account is rejected
|
||||||
string userName = decision.Kind == BrokerDecisionKind.Authorized
|
// by the domain controller.
|
||||||
? decision.UserName!
|
return DomainCredential(
|
||||||
: identity.UserName;
|
domain,
|
||||||
|
userName,
|
||||||
return new CredentialResponseSecure
|
securePassword,
|
||||||
{
|
decision.Kind == BrokerDecisionKind.Unavailable
|
||||||
IsSuccess = true,
|
? "El servicio institucional no está disponible; Windows validará la contraseña guardada en el dominio."
|
||||||
StatusIcon = decision.Kind == BrokerDecisionKind.Unavailable ? StatusIcon.Warning : StatusIcon.None,
|
: null);
|
||||||
StatusText = decision.Kind == BrokerDecisionKind.Unavailable
|
|
||||||
? "Servicio institucional no disponible; Windows validará la última contraseña de dominio registrada."
|
|
||||||
: null,
|
|
||||||
Domain = domain,
|
|
||||||
Username = userName,
|
|
||||||
Password = securePassword
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
@@ -111,6 +114,51 @@ internal sealed class SguCredentialTile : CredentialTile3
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool TryGetWindowsLogonName(
|
||||||
|
string? enteredName,
|
||||||
|
string defaultDomain,
|
||||||
|
out string domain,
|
||||||
|
out string userName)
|
||||||
|
{
|
||||||
|
domain = string.Empty;
|
||||||
|
userName = enteredName?.Trim() ?? string.Empty;
|
||||||
|
if (userName.Length is 0 or > 256 || userName.Any(char.IsControl))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
int slash = userName.LastIndexOf('\\');
|
||||||
|
if (slash >= 0)
|
||||||
|
{
|
||||||
|
domain = userName[..slash];
|
||||||
|
userName = userName[(slash + 1)..];
|
||||||
|
if (domain.Length is 0 or > 256 || domain.Contains('\\') || userName.Length == 0)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (!userName.Contains('@'))
|
||||||
|
{
|
||||||
|
domain = defaultDomain;
|
||||||
|
}
|
||||||
|
|
||||||
|
return userName.Length > 0 && domain.Length <= 256 && !domain.Any(char.IsControl);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static CredentialResponseSecure DomainCredential(
|
||||||
|
string domain,
|
||||||
|
string userName,
|
||||||
|
SecureString password,
|
||||||
|
string? statusText = null) => new()
|
||||||
|
{
|
||||||
|
IsSuccess = true,
|
||||||
|
StatusIcon = statusText is null ? StatusIcon.None : StatusIcon.Warning,
|
||||||
|
StatusText = statusText,
|
||||||
|
Domain = domain,
|
||||||
|
Username = userName,
|
||||||
|
Password = password
|
||||||
|
};
|
||||||
|
|
||||||
private static CredentialResponseSecure Failure(string message) => new()
|
private static CredentialResponseSecure Failure(string message) => new()
|
||||||
{
|
{
|
||||||
IsSuccess = false,
|
IsSuccess = false,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
$repositoryRoot = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
|
$repositoryRoot = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
|
||||||
$localUserScriptPath = Join-Path $repositoryRoot 'scripts\Set-SguStandardLocalUser.ps1'
|
$localUserScriptPath = Join-Path $repositoryRoot 'scripts\Set-SguStandardLocalUser.ps1'
|
||||||
|
$localProfilePolicyScriptPath = Join-Path $repositoryRoot 'scripts\Set-SguLocalProfileSecurityPolicies.ps1'
|
||||||
$enrollmentTestScriptPath = Join-Path $repositoryRoot 'scripts\Test-SguClientEnrollment.ps1'
|
$enrollmentTestScriptPath = Join-Path $repositoryRoot 'scripts\Test-SguClientEnrollment.ps1'
|
||||||
$packageScriptPath = Join-Path $repositoryRoot 'scripts\New-SguBootstrapPackages.ps1'
|
$packageScriptPath = Join-Path $repositoryRoot 'scripts\New-SguBootstrapPackages.ps1'
|
||||||
$releaseScriptPath = Join-Path $repositoryRoot 'scripts\Publish-GiteaRelease.ps1'
|
$releaseScriptPath = Join-Path $repositoryRoot 'scripts\Publish-GiteaRelease.ps1'
|
||||||
@@ -17,6 +18,16 @@ if ($parseErrors.Count -gt 0) {
|
|||||||
throw ($parseErrors -join [Environment]::NewLine)
|
throw ($parseErrors -join [Environment]::NewLine)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$localProfilePolicyTokens = $null
|
||||||
|
$localProfilePolicyParseErrors = $null
|
||||||
|
[void][Management.Automation.Language.Parser]::ParseFile(
|
||||||
|
$localProfilePolicyScriptPath,
|
||||||
|
[ref]$localProfilePolicyTokens,
|
||||||
|
[ref]$localProfilePolicyParseErrors)
|
||||||
|
if ($localProfilePolicyParseErrors.Count -gt 0) {
|
||||||
|
throw ($localProfilePolicyParseErrors -join [Environment]::NewLine)
|
||||||
|
}
|
||||||
|
|
||||||
$descriptionAssignment = $scriptAst.Find({
|
$descriptionAssignment = $scriptAst.Find({
|
||||||
param($node)
|
param($node)
|
||||||
$node -is [Management.Automation.Language.AssignmentStatementAst] -and
|
$node -is [Management.Automation.Language.AssignmentStatementAst] -and
|
||||||
@@ -55,6 +66,23 @@ Describe 'SGU Windows client enrollment scripts' {
|
|||||||
}).Count | Should Be 0
|
}).Count | Should Be 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
It 'applies DisableLockWorkstation to existing and future local users during enrollment' {
|
||||||
|
$localUserSource = Get-Content -LiteralPath $localUserScriptPath -Raw
|
||||||
|
$profilePolicySource = Get-Content -LiteralPath $localProfilePolicyScriptPath -Raw
|
||||||
|
$enrollmentSource = Get-Content -LiteralPath (Join-Path $repositoryRoot 'scripts\Enroll-SguDomainClient.ps1') -Raw
|
||||||
|
$packageSource = Get-Content -LiteralPath $packageScriptPath -Raw
|
||||||
|
|
||||||
|
$localUserSource | Should Match 'Set-SguLocalProfileSecurityPolicies\.ps1'
|
||||||
|
$profilePolicySource | Should Match "\$policyValueName = 'DisableLockWorkstation'"
|
||||||
|
$profilePolicySource | Should Match 'Get-LocalUser'
|
||||||
|
$profilePolicySource | Should Match 'NTUSER\.DAT'
|
||||||
|
$profilePolicySource | Should Match "-UserId 'SYSTEM'"
|
||||||
|
$profilePolicySource | Should Match 'Unregister-ScheduledTask'
|
||||||
|
$profilePolicySource | Should Match 'DefaultProfileConfigured'
|
||||||
|
$enrollmentSource | Should Match "'Set-SguLocalProfileSecurityPolicies\.ps1'"
|
||||||
|
$packageSource | Should Match "'Set-SguLocalProfileSecurityPolicies\.ps1'"
|
||||||
|
}
|
||||||
|
|
||||||
It 'publishes one Windows artifact with automatic compatibility' {
|
It 'publishes one Windows artifact with automatic compatibility' {
|
||||||
$packageSource = Get-Content -LiteralPath $packageScriptPath -Raw
|
$packageSource = Get-Content -LiteralPath $packageScriptPath -Raw
|
||||||
$releaseSource = Get-Content -LiteralPath $releaseScriptPath -Raw
|
$releaseSource = Get-Content -LiteralPath $releaseScriptPath -Raw
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
$repositoryRoot = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
|
||||||
|
$installerPath = Join-Path $repositoryRoot 'scripts\Install-SguCredentialProviderUpdatePolicy.ps1'
|
||||||
|
|
||||||
|
Describe 'Credential Provider startup policy' {
|
||||||
|
It 'generates a complete LastLoggedOnProvider command' {
|
||||||
|
$Version = '0.6.16'
|
||||||
|
$ClientPackageUri = 'https://example.invalid/client.zip'
|
||||||
|
$ClientPackageSha256 = 'A' * 64
|
||||||
|
$source = Get-Content -LiteralPath $installerPath -Raw
|
||||||
|
$template = [regex]::Match($source, '(?ms)^\$startupScript = @"\r?\n.*?^"@')
|
||||||
|
$template.Success | Should Be $true
|
||||||
|
Invoke-Expression $template.Value
|
||||||
|
|
||||||
|
$tokens = $null
|
||||||
|
$errors = $null
|
||||||
|
$ast = [Management.Automation.Language.Parser]::ParseInput(
|
||||||
|
$startupScript, [ref]$tokens, [ref]$errors)
|
||||||
|
$errors.Count | Should Be 0
|
||||||
|
|
||||||
|
$commands = @($ast.FindAll({
|
||||||
|
param($node)
|
||||||
|
$node -is [Management.Automation.Language.CommandAst] -and
|
||||||
|
$node.GetCommandName() -eq 'Set-ItemProperty'
|
||||||
|
}, $true))
|
||||||
|
$commands.Count | Should Be 1
|
||||||
|
@($commands[0].CommandElements | Where-Object {
|
||||||
|
$_ -is [Management.Automation.Language.CommandParameterAst] -and
|
||||||
|
$_.ParameterName -eq 'Value'
|
||||||
|
}).Count | Should Be 1
|
||||||
|
$startupScript | Should Not Match '(?m)^\s+-Value\s'
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -28,6 +28,14 @@ Describe 'Laboratorio wallpaper policy packaging and scope' {
|
|||||||
$policySource | Should Match 'local accounts such as \.\\ing'
|
$policySource | Should Match 'local accounts such as \.\\ing'
|
||||||
$policySource | Should Match 'DisableLockWorkstationForAllUsers = \$true'
|
$policySource | Should Match 'DisableLockWorkstationForAllUsers = \$true'
|
||||||
}
|
}
|
||||||
|
It 'runs the local-profile lock restriction as LocalSystem at computer startup' {
|
||||||
|
$policySource | Should Match 'Set-SguLocalProfileSecurityPolicies\.ps1'
|
||||||
|
$policySource | Should Match 'Join-Path \$scriptsRoot ''scripts\.ini'''
|
||||||
|
$policySource | Should Match 'Start-SguLocalProfileSecurityPolicies\.cmd'
|
||||||
|
$policySource | Should Match '-ExecutionPolicy Bypass'
|
||||||
|
$policySource | Should Match "RunsAs = 'LocalSystem'"
|
||||||
|
$policySource | Should Match 'gPCMachineExtensionNames'
|
||||||
|
}
|
||||||
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))
|
||||||
|
|||||||
@@ -69,6 +69,29 @@ public sealed class AuthenticationWorkflowTests
|
|||||||
Assert.Null(directory.Password);
|
Assert.Null(directory.Password);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task EverySuccessfulSignInSynchronizesTheLatestPassword()
|
||||||
|
{
|
||||||
|
CapturingDirectorySynchronizer directory = new();
|
||||||
|
AuthenticationWorkflow workflow = new(
|
||||||
|
new CapturingNtlmValidator(NtlmValidationResult.Valid()),
|
||||||
|
directory);
|
||||||
|
|
||||||
|
_ = await workflow.AuthenticateAsync(
|
||||||
|
"AL123456",
|
||||||
|
"Contraseña-anterior-27!",
|
||||||
|
TestContext.Current.CancellationToken);
|
||||||
|
AuthenticationFlowResult result = await workflow.AuthenticateAsync(
|
||||||
|
"AL123456",
|
||||||
|
"Contraseña-nueva-28!",
|
||||||
|
TestContext.Current.CancellationToken);
|
||||||
|
|
||||||
|
Assert.Equal(AuthenticationFlowOutcome.Authorized, result.Outcome);
|
||||||
|
Assert.Equal(
|
||||||
|
["Contraseña-anterior-27!", "Contraseña-nueva-28!"],
|
||||||
|
directory.Passwords);
|
||||||
|
}
|
||||||
|
|
||||||
private sealed class CapturingNtlmValidator(NtlmValidationResult result) : INtlmCredentialValidator
|
private sealed class CapturingNtlmValidator(NtlmValidationResult result) : INtlmCredentialValidator
|
||||||
{
|
{
|
||||||
public UserIdentity? Identity { get; private set; }
|
public UserIdentity? Identity { get; private set; }
|
||||||
@@ -92,6 +115,8 @@ public sealed class AuthenticationWorkflowTests
|
|||||||
|
|
||||||
public string? Password { get; private set; }
|
public string? Password { get; private set; }
|
||||||
|
|
||||||
|
public List<string> Passwords { get; } = [];
|
||||||
|
|
||||||
public InstitutionalProfile? Profile { get; private set; }
|
public InstitutionalProfile? Profile { get; private set; }
|
||||||
|
|
||||||
public Task<DirectorySyncResult> SynchronizeAsync(
|
public Task<DirectorySyncResult> SynchronizeAsync(
|
||||||
@@ -103,6 +128,7 @@ public sealed class AuthenticationWorkflowTests
|
|||||||
Identity = identity;
|
Identity = identity;
|
||||||
Profile = profile;
|
Profile = profile;
|
||||||
Password = password;
|
Password = password;
|
||||||
|
Passwords.Add(password);
|
||||||
return Task.FromResult(new DirectorySyncResult(
|
return Task.FromResult(new DirectorySyncResult(
|
||||||
"LCI",
|
"LCI",
|
||||||
identity.UserName,
|
identity.UserName,
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Net.Http.Headers;
|
using System.Net.Http.Headers;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Drawing.Imaging;
|
||||||
using Microsoft.Extensions.Logging.Abstractions;
|
using Microsoft.Extensions.Logging.Abstractions;
|
||||||
using SGU.AuthBroker.Core.Authentication;
|
using SGU.AuthBroker.Core.Authentication;
|
||||||
using SGU.AuthBroker.Core.Identity;
|
using SGU.AuthBroker.Core.Identity;
|
||||||
@@ -163,7 +165,8 @@ public sealed class NtlmCredentialValidatorTests
|
|||||||
"""),
|
"""),
|
||||||
JsonResponse("""
|
JsonResponse("""
|
||||||
{"d":[{"p_IdCP":"090001","p_Nombre":"FLORIDA","p_Cp":"01000"}]}
|
{"d":[{"p_IdCP":"090001","p_Nombre":"FLORIDA","p_Cp":"01000"}]}
|
||||||
"""));
|
"""),
|
||||||
|
PhotoResponse(TestJpeg()));
|
||||||
NtlmCredentialValidator validator = CreateValidator(handler);
|
NtlmCredentialValidator validator = CreateValidator(handler);
|
||||||
|
|
||||||
NtlmValidationResult result = await validator.ValidateAsync(
|
NtlmValidationResult result = await validator.ValidateAsync(
|
||||||
@@ -184,6 +187,7 @@ public sealed class NtlmCredentialValidatorTests
|
|||||||
Assert.Equal("Ciudad de México", result.Profile.State);
|
Assert.Equal("Ciudad de México", result.Profile.State);
|
||||||
Assert.Equal("01000", result.Profile.PostalCode);
|
Assert.Equal("01000", result.Profile.PostalCode);
|
||||||
Assert.Equal(InstitutionalGender.Female, result.Profile.Gender);
|
Assert.Equal(InstitutionalGender.Female, result.Profile.Gender);
|
||||||
|
Assert.Equal(TestJpeg(), result.Profile.ThumbnailPhoto);
|
||||||
Assert.Equal(
|
Assert.Equal(
|
||||||
[
|
[
|
||||||
"/psulsa/",
|
"/psulsa/",
|
||||||
@@ -193,7 +197,8 @@ public sealed class NtlmCredentialValidatorTests
|
|||||||
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx",
|
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx",
|
||||||
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetDireccion",
|
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetDireccion",
|
||||||
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetLocalidadListado",
|
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetLocalidadListado",
|
||||||
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetColoniasListado"
|
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetColoniasListado",
|
||||||
|
"/psulsa/gadmon/admonPersonal/ashx/Fotografia.ashx"
|
||||||
],
|
],
|
||||||
handler.RequestPaths);
|
handler.RequestPaths);
|
||||||
Assert.Equal("{\"CodigoPostal\":\"01000\"}", handler.RequestBodies[5]);
|
Assert.Equal("{\"CodigoPostal\":\"01000\"}", handler.RequestBodies[5]);
|
||||||
@@ -201,6 +206,9 @@ public sealed class NtlmCredentialValidatorTests
|
|||||||
Assert.Equal(
|
Assert.Equal(
|
||||||
"{\"pIdEstado\":\"\",\"pLocalidad\":\"\",\"CodigoPostal\":\"01000\"}",
|
"{\"pIdEstado\":\"\",\"pLocalidad\":\"\",\"CodigoPostal\":\"01000\"}",
|
||||||
handler.RequestBodies[7]);
|
handler.RequestBodies[7]);
|
||||||
|
Assert.Equal(
|
||||||
|
"https://sgu.example/psulsa/gadmon/admonPersonal/ashx/Fotografia.ashx?id=017045&tp=2",
|
||||||
|
handler.RequestUris[8]);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
@@ -278,7 +286,8 @@ public sealed class NtlmCredentialValidatorTests
|
|||||||
"""),
|
"""),
|
||||||
JsonResponse("""
|
JsonResponse("""
|
||||||
{"d":[{"p_IdCP":"090001","p_Nombre":"FLORIDA","p_Cp":"01000"}]}
|
{"d":[{"p_IdCP":"090001","p_Nombre":"FLORIDA","p_Cp":"01000"}]}
|
||||||
"""));
|
"""),
|
||||||
|
Response(HttpStatusCode.NotFound));
|
||||||
NtlmCredentialValidator validator = CreateValidator(handler);
|
NtlmCredentialValidator validator = CreateValidator(handler);
|
||||||
|
|
||||||
NtlmValidationResult result = await validator.ValidateAsync(
|
NtlmValidationResult result = await validator.ValidateAsync(
|
||||||
@@ -311,9 +320,13 @@ public sealed class NtlmCredentialValidatorTests
|
|||||||
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx",
|
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx",
|
||||||
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetDireccion",
|
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetDireccion",
|
||||||
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetLocalidadListado",
|
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetLocalidadListado",
|
||||||
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetColoniasListado"
|
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetColoniasListado",
|
||||||
|
"/psulsa/gadmon/admonPersonal/ashx/Fotografia.ashx"
|
||||||
],
|
],
|
||||||
handler.RequestPaths);
|
handler.RequestPaths);
|
||||||
|
Assert.Equal(
|
||||||
|
"https://sgu.example/psulsa/gadmon/admonPersonal/ashx/Fotografia.ashx?id=123456&tp=2",
|
||||||
|
handler.RequestUris[9]);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
@@ -347,6 +360,109 @@ public sealed class NtlmCredentialValidatorTests
|
|||||||
handler.RequestPaths[3]);
|
handler.RequestPaths[3]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task VerifiedStudentReceivesPhotoFromAuthenticatedSguSession()
|
||||||
|
{
|
||||||
|
byte[] jpeg = TestJpeg();
|
||||||
|
SequenceHandler handler = new(
|
||||||
|
Challenge(),
|
||||||
|
Response(HttpStatusCode.OK),
|
||||||
|
Response(HttpStatusCode.OK,
|
||||||
|
"<span id=\"ctl00_contenedor_HistorialAlumno1_lblClaveAlumnoHP\">123456</span>"),
|
||||||
|
PhotoResponse(jpeg));
|
||||||
|
NtlmValidationResult result = await CreateValidator(handler).ValidateAsync(
|
||||||
|
Student,
|
||||||
|
"test-password",
|
||||||
|
TestContext.Current.CancellationToken);
|
||||||
|
|
||||||
|
Assert.Equal(NtlmValidationStatus.Valid, result.Status);
|
||||||
|
Assert.Equal(jpeg, result.Profile?.ThumbnailPhoto);
|
||||||
|
Assert.Equal(
|
||||||
|
"https://sgu.example/psulsa/gadmon/admonPersonal/ashx/Fotografia.ashx?id=123456&tp=1",
|
||||||
|
handler.RequestUris[3]);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("text/html")]
|
||||||
|
[InlineData("image/jpeg")]
|
||||||
|
public async Task InvalidStudentPhotoDoesNotBlockAuthentication(string mediaType)
|
||||||
|
{
|
||||||
|
byte[] invalid = new byte[150];
|
||||||
|
invalid[0] = 0xFF;
|
||||||
|
invalid[1] = 0xD8;
|
||||||
|
invalid[2] = 0xFF;
|
||||||
|
invalid[^2] = 0xFF;
|
||||||
|
invalid[^1] = 0xD9;
|
||||||
|
SequenceHandler handler = new(
|
||||||
|
Challenge(),
|
||||||
|
Response(HttpStatusCode.OK),
|
||||||
|
Response(HttpStatusCode.OK,
|
||||||
|
"<span id=\"ctl00_contenedor_HistorialAlumno1_lblClaveAlumnoHP\">123456</span>"),
|
||||||
|
PhotoResponse(invalid, mediaType));
|
||||||
|
NtlmValidationResult result = await CreateValidator(handler).ValidateAsync(
|
||||||
|
Student,
|
||||||
|
"test-password",
|
||||||
|
TestContext.Current.CancellationToken);
|
||||||
|
|
||||||
|
Assert.Equal(NtlmValidationStatus.Valid, result.Status);
|
||||||
|
Assert.Equal("123456", result.Profile?.EmployeeNumber);
|
||||||
|
Assert.Null(result.Profile?.ThumbnailPhoto);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task OversizedStudentPhotoDoesNotBlockAuthentication()
|
||||||
|
{
|
||||||
|
SequenceHandler handler = new(
|
||||||
|
Challenge(),
|
||||||
|
Response(HttpStatusCode.OK),
|
||||||
|
Response(HttpStatusCode.OK,
|
||||||
|
"<span id=\"ctl00_contenedor_HistorialAlumno1_lblClaveAlumnoHP\">123456</span>"),
|
||||||
|
PhotoResponse(new byte[100 * 1024 + 1]));
|
||||||
|
NtlmValidationResult result = await CreateValidator(handler).ValidateAsync(
|
||||||
|
Student,
|
||||||
|
"test-password",
|
||||||
|
TestContext.Current.CancellationToken);
|
||||||
|
|
||||||
|
Assert.Equal(NtlmValidationStatus.Valid, result.Status);
|
||||||
|
Assert.Equal("123456", result.Profile?.EmployeeNumber);
|
||||||
|
Assert.Null(result.Profile?.ThumbnailPhoto);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task UnverifiedStudentNumberNeverFetchesPhoto()
|
||||||
|
{
|
||||||
|
SequenceHandler handler = new(
|
||||||
|
Challenge(),
|
||||||
|
Response(HttpStatusCode.OK),
|
||||||
|
Response(HttpStatusCode.OK,
|
||||||
|
"<span id=\"ctl00_contenedor_HistorialAlumno1_lblClaveAlumnoHP\">654321</span>"));
|
||||||
|
NtlmValidationResult result = await CreateValidator(handler).ValidateAsync(
|
||||||
|
Student,
|
||||||
|
"test-password",
|
||||||
|
TestContext.Current.CancellationToken);
|
||||||
|
|
||||||
|
Assert.Equal(NtlmValidationStatus.Valid, result.Status);
|
||||||
|
Assert.Null(result.Profile);
|
||||||
|
Assert.Equal(3, handler.RequestUris.Count);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] TestJpeg()
|
||||||
|
{
|
||||||
|
using Bitmap bitmap = new(16, 16);
|
||||||
|
using MemoryStream output = new();
|
||||||
|
bitmap.Save(output, ImageFormat.Jpeg);
|
||||||
|
return output.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static HttpResponseMessage PhotoResponse(byte[] bytes, string mediaType = "image/jpeg") =>
|
||||||
|
new(HttpStatusCode.OK)
|
||||||
|
{
|
||||||
|
Content = new ByteArrayContent(bytes)
|
||||||
|
{
|
||||||
|
Headers = { ContentType = new MediaTypeHeaderValue(mediaType) }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
private static NtlmCredentialValidator CreateValidator(SequenceHandler handler)
|
private static NtlmCredentialValidator CreateValidator(SequenceHandler handler)
|
||||||
{
|
{
|
||||||
BrokerOptions options = new()
|
BrokerOptions options = new()
|
||||||
@@ -406,6 +522,8 @@ public sealed class NtlmCredentialValidatorTests
|
|||||||
|
|
||||||
public List<string> RequestPaths { get; } = [];
|
public List<string> RequestPaths { get; } = [];
|
||||||
|
|
||||||
|
public List<string> RequestUris { get; } = [];
|
||||||
|
|
||||||
public List<string?> RequestBodies { get; } = [];
|
public List<string?> RequestBodies { get; } = [];
|
||||||
|
|
||||||
protected override Task<HttpResponseMessage> SendAsync(
|
protected override Task<HttpResponseMessage> SendAsync(
|
||||||
@@ -414,6 +532,7 @@ public sealed class NtlmCredentialValidatorTests
|
|||||||
{
|
{
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
RequestPaths.Add(request.RequestUri!.AbsolutePath);
|
RequestPaths.Add(request.RequestUri!.AbsolutePath);
|
||||||
|
RequestUris.Add(request.RequestUri.AbsoluteUri);
|
||||||
RequestBodies.Add(request.Content is null
|
RequestBodies.Add(request.Content is null
|
||||||
? null
|
? null
|
||||||
: request.Content.ReadAsStringAsync(cancellationToken).GetAwaiter().GetResult());
|
: request.Content.ReadAsStringAsync(cancellationToken).GetAwaiter().GetResult());
|
||||||
|
|||||||
@@ -14,11 +14,11 @@ internal static class Program
|
|||||||
|
|
||||||
private static readonly string[] ExpectedLabels =
|
private static readonly string[] ExpectedLabels =
|
||||||
[
|
[
|
||||||
"La Salle · Acceso SGU",
|
"Acceso Institucional",
|
||||||
"Acceso institucional SGU",
|
"Acceso Institucional",
|
||||||
"Acceso institucional SGU",
|
"Iniciar sesión",
|
||||||
"Usa tu clave institucional (DO, AL o AD + 6 dígitos) y contraseña.",
|
"Escribe tu usuario institucional o de dominio y contraseña.",
|
||||||
"Clave institucional",
|
"Usuario",
|
||||||
"Contraseña",
|
"Contraseña",
|
||||||
"Iniciar sesión"
|
"Iniciar sesión"
|
||||||
];
|
];
|
||||||
@@ -89,6 +89,8 @@ internal static class Program
|
|||||||
|
|
||||||
bool passed = fieldCount == ExpectedLabels.Length &&
|
bool passed = fieldCount == ExpectedLabels.Length &&
|
||||||
credentialCount == 1 &&
|
credentialCount == 1 &&
|
||||||
|
defaultIndex == 0 &&
|
||||||
|
autoLogon == 0 &&
|
||||||
credential != IntPtr.Zero &&
|
credential != IntPtr.Zero &&
|
||||||
providerLogoPresent &&
|
providerLogoPresent &&
|
||||||
!userTilePresent &&
|
!userTilePresent &&
|
||||||
@@ -146,7 +148,7 @@ internal static class Program
|
|||||||
private static int RunSerializationProbe(string mode, IntPtr credential, IReadOnlyList<string> labels)
|
private static int RunSerializationProbe(string mode, IntPtr credential, IReadOnlyList<string> labels)
|
||||||
{
|
{
|
||||||
string[] labelArray = labels.ToArray();
|
string[] labelArray = labels.ToArray();
|
||||||
uint userNameFieldId = checked((uint)Array.IndexOf(labelArray, "Clave institucional"));
|
uint userNameFieldId = checked((uint)Array.IndexOf(labelArray, "Usuario"));
|
||||||
uint passwordFieldId = checked((uint)Array.IndexOf(labelArray, "Contraseña"));
|
uint passwordFieldId = checked((uint)Array.IndexOf(labelArray, "Contraseña"));
|
||||||
string userName = mode == "online-success"
|
string userName = mode == "online-success"
|
||||||
? Environment.GetEnvironmentVariable("SGU_TEST_USERNAME")
|
? Environment.GetEnvironmentVariable("SGU_TEST_USERNAME")
|
||||||
@@ -184,7 +186,7 @@ internal static class Program
|
|||||||
bool rejectionPassed = response == (int)SerializationResponse.NoCredentialNotFinished &&
|
bool rejectionPassed = response == (int)SerializationResponse.NoCredentialNotFinished &&
|
||||||
serialization.SerializationData == IntPtr.Zero &&
|
serialization.SerializationData == IntPtr.Zero &&
|
||||||
statusIcon == (int)StatusIcon.Error &&
|
statusIcon == (int)StatusIcon.Error &&
|
||||||
statusText == "Credenciales institucionales inválidas.";
|
statusText == "Usuario o contraseña incorrectos.";
|
||||||
Console.WriteLine(JsonSerializer.Serialize(new
|
Console.WriteLine(JsonSerializer.Serialize(new
|
||||||
{
|
{
|
||||||
passed = rejectionPassed,
|
passed = rejectionPassed,
|
||||||
@@ -216,7 +218,7 @@ internal static class Program
|
|||||||
? serializedCredentialPassed && statusIcon == (int)StatusIcon.None && string.IsNullOrEmpty(statusText)
|
? serializedCredentialPassed && statusIcon == (int)StatusIcon.None && string.IsNullOrEmpty(statusText)
|
||||||
: serializedCredentialPassed &&
|
: serializedCredentialPassed &&
|
||||||
statusIcon == (int)StatusIcon.Warning &&
|
statusIcon == (int)StatusIcon.Warning &&
|
||||||
statusText == "Servicio institucional no disponible; Windows validará la última contraseña de dominio registrada.";
|
statusText == "El servicio de autenticación no está disponible; Windows validará la última contraseña de dominio registrada.";
|
||||||
Console.WriteLine(JsonSerializer.Serialize(new
|
Console.WriteLine(JsonSerializer.Serialize(new
|
||||||
{
|
{
|
||||||
passed,
|
passed,
|
||||||
|
|||||||
@@ -55,8 +55,8 @@ public sealed class ProviderTileIconTests
|
|||||||
LargeLabelControl heading = Assert.Single(controls.OfType<LargeLabelControl>());
|
LargeLabelControl heading = Assert.Single(controls.OfType<LargeLabelControl>());
|
||||||
SguCredentialTile tile = Assert.IsType<SguCredentialTile>(provider.CreateGenericTile());
|
SguCredentialTile tile = Assert.IsType<SguCredentialTile>(provider.CreateGenericTile());
|
||||||
|
|
||||||
Assert.Equal("La Salle · Acceso SGU", providerLabel.Label);
|
Assert.Equal("Acceso Institucional", providerLabel.Label);
|
||||||
Assert.Equal("Acceso institucional SGU", heading.Label);
|
Assert.Equal("Iniciar sesión", heading.Label);
|
||||||
Assert.Equal(FieldState.DisplayInSelectedTile, heading.State);
|
Assert.Equal(FieldState.DisplayInSelectedTile, heading.State);
|
||||||
Assert.Equal(GenericTileDisplayMode.DisplayAsDedicatedTile, tile.GenericTileDisplayMode);
|
Assert.Equal(GenericTileDisplayMode.DisplayAsDedicatedTile, tile.GenericTileDisplayMode);
|
||||||
Assert.IsAssignableFrom<CredentialTile3>(tile);
|
Assert.IsAssignableFrom<CredentialTile3>(tile);
|
||||||
|
|||||||
Reference in new issue
Block a user