Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
80baae1b54 | ||
|
|
843a1956d6 | ||
|
|
738df9ceea | ||
|
|
77091c023d | ||
|
|
21890047e2 | ||
|
|
db35d86df1 | ||
|
|
63fbaf65dc | ||
|
|
6fb703b015 |
No files matched your search
+13
-3
@@ -67,9 +67,19 @@ moves it to the mapped OU when required, sets `userPrincipalName`, and passes
|
|||||||
that same password directly to ADSI `SetPassword`. This is an idempotent UPSERT
|
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
|
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
|
password change updates AD before Windows validates the interactive logon. If
|
||||||
SGU rejects the credential or is unavailable, the unchanged credentials go to
|
SGU explicitly rejects the credential, the provider stops without trying AD.
|
||||||
Windows; only an existing AD account can then authenticate. A matching username
|
If SGU accepts it but AD synchronization fails, the provider reports that
|
||||||
pattern alone never provisions an account.
|
failure without trying a stale AD verifier. Only a genuine broker/SGU outage
|
||||||
|
uses the documented Windows cached-domain-credential fallback, for an existing
|
||||||
|
account. A matching username pattern alone never provisions an account.
|
||||||
|
|
||||||
|
The domain bootstrap creates a fine-grained password policy for the three SGU
|
||||||
|
role security groups. It allows the broker to record the exact password SGU
|
||||||
|
accepted, including reversible storage, even when the normal domain complexity
|
||||||
|
policy would reject it. The domain default remains unchanged; per-user reversible
|
||||||
|
storage is enabled only for members of those three groups. AD rewrites an existing
|
||||||
|
password in reversible form only when the broker sets it after a successful SGU
|
||||||
|
sign-in. Do not apply the setting to unrelated domain accounts.
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
+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,19 @@
|
|||||||
|
# v0.6.19 — SGU password authority
|
||||||
|
|
||||||
|
- Add a fine-grained Active Directory password policy scoped to the three
|
||||||
|
`SGU-*` role groups. A password accepted by SGU is stored unchanged in AD,
|
||||||
|
including short passwords that the default domain complexity policy rejects.
|
||||||
|
Other domain accounts keep their existing policy.
|
||||||
|
- Apply and verify this policy during server bootstrap. Existing SGU accounts
|
||||||
|
receive it through their role-group membership.
|
||||||
|
- Stop institutional login immediately when SGU explicitly rejects a password.
|
||||||
|
When SGU accepts it but AD synchronization fails, show a distinct error
|
||||||
|
instead of trying an older AD password.
|
||||||
|
- Preserve the documented cached-domain fallback only while the broker or SGU
|
||||||
|
is genuinely unavailable.
|
||||||
|
|
||||||
|
Operational validation: on the domain controller, disposable users in each of
|
||||||
|
`SGU-Alumnos`, `SGU-Administrativos`, and `SGU-Docentes` accepted a three-character
|
||||||
|
password and were removed after the test. The three originally reported
|
||||||
|
accounts still require a real SGU sign-in to finish AD provisioning; no student
|
||||||
|
password was requested or stored for testing.
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
# v0.6.20 — SGU-scoped reversible password storage
|
||||||
|
|
||||||
|
- Enable reversible password storage only for members of the three SGU role
|
||||||
|
groups (`SGU-Alumnos`, `SGU-Administrativos`, and `SGU-Docentes`). The
|
||||||
|
domain-wide default password policy remains unchanged.
|
||||||
|
- Before synchronizing a valid Acceso SGU login, the broker enables the
|
||||||
|
per-account AD flag and then writes the exact SGU-accepted password. Existing
|
||||||
|
role-group members are repaired by server bootstrap and the password-policy
|
||||||
|
deployment script.
|
||||||
|
- Add structured broker event 1306 when the per-account setting is enabled.
|
||||||
|
- Document that reversible storage allows a privileged directory-data reader to
|
||||||
|
recover the original password, and that existing passwords are rewritten only
|
||||||
|
after their next successful SGU password synchronization.
|
||||||
|
- Correct references that called the institutional system “SGO”; the product is
|
||||||
|
SGU.
|
||||||
|
|
||||||
|
The setting is intentionally limited to the SGU-managed role groups. Do not
|
||||||
|
apply it to unrelated domain users. Existing SGU accounts need a successful
|
||||||
|
Acceso SGU sign-in (or another authorized password reset) before their currently
|
||||||
|
stored password is rewritten using reversible encryption.
|
||||||
+33
-5
@@ -18,6 +18,22 @@ the same source list. RDP uses a separate allowlist. See
|
|||||||
`Marshal.ZeroFreeGlobalAllocUnicode`; managed references are released as soon
|
`Marshal.ZeroFreeGlobalAllocUnicode`; managed references are released as soon
|
||||||
as each request completes.
|
as each request completes.
|
||||||
- The broker uses the exact received value for both NTLM and AD `SetPassword`.
|
- The broker uses the exact received value for both NTLM and AD `SetPassword`.
|
||||||
|
- The `SGU - Institutional password authority` fine-grained AD password policy
|
||||||
|
applies only to the global security groups `SGU-Alumnos`,
|
||||||
|
`SGU-Administrativos`, and `SGU-Docentes`. It disables AD complexity,
|
||||||
|
history, and password age requirements, permits passwords from one character
|
||||||
|
onward, and enables reversible password storage so passwords accepted by SGU
|
||||||
|
can be recorded unchanged by AD. The default domain password policy remains
|
||||||
|
unchanged for non-SGU accounts. The broker sets the per-user reversible-storage
|
||||||
|
flag before each `SetPassword`; bootstrap repairs existing role-group members
|
||||||
|
and reapplies the policy via `Set-SguInstitutionalPasswordPolicy.ps1`.
|
||||||
|
- Reversible password storage is a significant security reduction: a domain
|
||||||
|
controller stores a decryptable password representation. A privileged attacker
|
||||||
|
or administrator who obtains the relevant directory data can recover the
|
||||||
|
original password. This is limited to accounts in the three SGU role groups;
|
||||||
|
existing password values are converted only when SGU next resets them (normally
|
||||||
|
on a successful Acceso SGU sign-in). Do not enable this for unrelated domain
|
||||||
|
accounts.
|
||||||
- Managed `Usuarios-SGU` accounts deny the SELF and Everyone `Change Password`
|
- Managed `Usuarios-SGU` accounts deny the SELF and Everyone `Change Password`
|
||||||
extended right. Only an administrator or the broker through the separate
|
extended right. Only an administrator or the broker through the separate
|
||||||
`Reset Password` right can replace the AD password.
|
`Reset Password` right can replace the AD password.
|
||||||
@@ -89,13 +105,25 @@ Use an enterprise CA with revocation checking in production.
|
|||||||
|
|
||||||
The provider distinguishes an SGU rejection from unavailable infrastructure:
|
The provider distinguishes an SGU rejection from unavailable infrastructure:
|
||||||
|
|
||||||
- `400`/`401`: do not create or update the account; submit the unchanged
|
- `400`/`401`: do not create or update the account and do not submit a Windows
|
||||||
credential to Windows so an existing AD account can authenticate.
|
credential. An explicit SGU rejection is authoritative, including when an
|
||||||
|
older AD password still exists.
|
||||||
|
- `DIRECTORY_SYNCHRONIZATION_FAILED`: SGU accepted the password but AD did not
|
||||||
|
record it. Show a specific error and do not attempt Windows logon against a
|
||||||
|
potentially stale AD verifier.
|
||||||
- timeout, TLS/connectivity error, `429`, or `5xx`: submit the unchanged
|
- timeout, TLS/connectivity error, `429`, or `5xx`: submit the unchanged
|
||||||
credential to Windows. Windows must still validate it against AD or its cached
|
credential to Windows only for a genuine broker/SGU outage. Windows must still
|
||||||
domain verifier, so this does not grant access without a domain credential.
|
validate it against AD or its cached domain verifier, so this does not grant
|
||||||
|
access without a domain credential. This continuity path can accept a
|
||||||
|
last-known AD password while SGU is unreachable; decide explicitly whether
|
||||||
|
that availability trade-off is appropriate for each deployment.
|
||||||
- usernames that do not match the institutional key format go directly to
|
- usernames that do not match the institutional key format go directly to
|
||||||
Windows and are never sent to SGU or provisioned by the broker.
|
Windows and are never sent to SGU or provisioned by the broker.
|
||||||
|
|
||||||
|
Allowing an SGU-accepted three-character password also allows that short
|
||||||
|
password at the native AD logon surface. Broker rate limiting does not protect
|
||||||
|
direct AD authentication; domain network exposure and monitoring therefore
|
||||||
|
remain essential. The policy cannot make a weak upstream password strong.
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
# Administradores de las estaciones Windows
|
||||||
|
|
||||||
|
El grupo `LCI\Administrators` ubicado en `CN=Builtin` administra Active
|
||||||
|
Directory y los controladores de dominio. No convierte por sí solo a sus
|
||||||
|
miembros en administradores locales de las estaciones Windows. `Domain Admins`
|
||||||
|
sí suele estar en el grupo local `Administrators` de cada equipo unido al
|
||||||
|
dominio, pero agregar una cuenta a `Domain Admins` le daría mucho más alcance.
|
||||||
|
|
||||||
|
La GPO **SGU - Windows client experience**, vinculada a `OU=Laboratorio`,
|
||||||
|
ejecuta `Enable-SguWorkstationAdministrators.ps1` al inicio de cada equipo
|
||||||
|
Windows. El script consulta por LDAP a los usuarios (incluidos miembros
|
||||||
|
anidados) de `CN=Administrators,CN=Builtin,DC=lci,DC=lasalle,DC=mx` y agrega
|
||||||
|
sus SID de dominio al grupo `Administrators` local. No se aplica a los
|
||||||
|
controladores de dominio ni a los equipos Linux. Si el DC no responde, no
|
||||||
|
cambia la pertenencia local y lo reintenta en el siguiente arranque.
|
||||||
|
|
||||||
|
En siguientes arranques elimina solo los SID que esta política había agregado
|
||||||
|
y que ya no pertenecen al grupo de AD. Conserva los administradores locales
|
||||||
|
y los grupos agregados por otras políticas. Los cambios de membresía de AD
|
||||||
|
requieren reiniciar la estación y volver a iniciar sesión para obtener un
|
||||||
|
token de acceso nuevo; no se elevan las sesiones ya abiertas.
|
||||||
|
|
||||||
|
Comprobación en un cliente Windows, desde una consola elevada:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
gpresult /scope computer /r
|
||||||
|
Get-LocalGroupMember -SID 'S-1-5-32-544'
|
||||||
|
whoami /groups
|
||||||
|
```
|
||||||
|
|
||||||
|
Para actualizar la política en un equipo encendido, ejecute
|
||||||
|
`gpupdate /target:computer /force`, reinicie e inicie sesión nuevamente. La
|
||||||
|
concesión se limita a los equipos Windows que heredan la GPO del laboratorio.
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# 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.
|
||||||
|
|
||||||
|
La misma GPO ejecuta un segundo script de inicio para conceder administración
|
||||||
|
local a los miembros del grupo `Administrators` de Active Directory; véase
|
||||||
|
[Administradores de las estaciones Windows](workstation-administrators.md).
|
||||||
|
|
||||||
|
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.
|
||||||
@@ -202,15 +202,33 @@ if ($RemoteDesktopGroupDn) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$managedUsersPasswordChangeCorrected = 0
|
$managedUsersPasswordChangeCorrected = 0
|
||||||
|
$managedUsersReversibleEncryptionCorrected = 0
|
||||||
|
$sguRoleGroupDns = @($ProfessorGroupDn, $StudentGroupDn, $AdministrativeGroupDn)
|
||||||
|
$sguRoleUserDns = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase)
|
||||||
|
foreach ($roleGroupDn in $sguRoleGroupDns) {
|
||||||
|
foreach ($member in Get-ADGroupMember -Identity $roleGroupDn -Recursive `
|
||||||
|
-Server $LdapHost -ErrorAction Stop) {
|
||||||
|
if ($member.objectClass -eq 'user') {
|
||||||
|
[void]$sguRoleUserDns.Add($member.DistinguishedName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if ($PSCmdlet.ShouldProcess($usersOuDn, 'Deny direct password changes for every managed SGU user')) {
|
if ($PSCmdlet.ShouldProcess($usersOuDn, 'Deny direct password changes for every managed SGU user')) {
|
||||||
$managedUsers = @(Get-ADUser -Filter * -SearchBase $usersOuDn -SearchScope Subtree `
|
$managedUsers = @(Get-ADUser -Filter * -SearchBase $usersOuDn -SearchScope Subtree `
|
||||||
-Properties CannotChangePassword -Server $LdapHost -ErrorAction Stop)
|
-Properties CannotChangePassword,AllowReversiblePasswordEncryption `
|
||||||
|
-Server $LdapHost -ErrorAction Stop)
|
||||||
foreach ($managedUser in $managedUsers) {
|
foreach ($managedUser in $managedUsers) {
|
||||||
if (-not $managedUser.CannotChangePassword) {
|
if (-not $managedUser.CannotChangePassword) {
|
||||||
Set-ADAccountControl -Identity $managedUser.DistinguishedName `
|
Set-ADAccountControl -Identity $managedUser.DistinguishedName `
|
||||||
-CannotChangePassword $true -Server $LdapHost -Confirm:$false
|
-CannotChangePassword $true -Server $LdapHost -Confirm:$false
|
||||||
$managedUsersPasswordChangeCorrected++
|
$managedUsersPasswordChangeCorrected++
|
||||||
}
|
}
|
||||||
|
if ($sguRoleUserDns.Contains($managedUser.DistinguishedName) -and
|
||||||
|
-not $managedUser.AllowReversiblePasswordEncryption) {
|
||||||
|
Set-ADAccountControl -Identity $managedUser.DistinguishedName `
|
||||||
|
-AllowReversiblePasswordEncryption $true -Server $LdapHost -Confirm:$false
|
||||||
|
$managedUsersReversibleEncryptionCorrected++
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -370,4 +388,5 @@ if ($PSCmdlet.ShouldProcess($installPath, 'Install the SGU Authentication Broker
|
|||||||
|
|
||||||
Get-Service -Name $serviceName | Select-Object Name, Status, StartType,
|
Get-Service -Name $serviceName | Select-Object Name, Status, StartType,
|
||||||
@{ Name = 'EventLog'; Expression = { $brokerEventLogName } },
|
@{ Name = 'EventLog'; Expression = { $brokerEventLogName } },
|
||||||
@{ Name = 'ExistingUsersPasswordChangeDenied'; Expression = { $managedUsersPasswordChangeCorrected } }
|
@{ Name = 'ExistingUsersPasswordChangeDenied'; Expression = { $managedUsersPasswordChangeCorrected } },
|
||||||
|
@{ Name = 'ExistingSguRoleUsersReversibleEncryptionEnabled'; Expression = { $managedUsersReversibleEncryptionCorrected } }
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
[CmdletBinding()]
|
||||||
|
param()
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$computer = Get-CimInstance Win32_ComputerSystem
|
||||||
|
if (-not $computer.PartOfDomain -or $computer.DomainRole -ge 4) { return }
|
||||||
|
|
||||||
|
# The domain's Builtin\Administrators group is not the local Administrators
|
||||||
|
# group on a member workstation, even though both have SID S-1-5-32-544.
|
||||||
|
# Resolve its *users* through LDAP, then grant their domain SIDs locally.
|
||||||
|
# The directory lookup must succeed before any local membership is changed.
|
||||||
|
$domainDn = 'DC=' + (($computer.Domain -split '\.') -join ',DC=')
|
||||||
|
$domainAdministratorsDn = "CN=Administrators,CN=Builtin,$domainDn"
|
||||||
|
$directoryRoot = [DirectoryServices.DirectoryEntry]::new("LDAP://$domainDn")
|
||||||
|
$searcher = [DirectoryServices.DirectorySearcher]::new($directoryRoot)
|
||||||
|
$searcher.Filter = "(&(objectCategory=person)(objectClass=user)(memberOf:1.2.840.113556.1.4.1941:=$domainAdministratorsDn))"
|
||||||
|
$searcher.PageSize = 500
|
||||||
|
$searcher.ClientTimeout = [TimeSpan]::FromSeconds(5)
|
||||||
|
$searcher.ServerTimeLimit = [TimeSpan]::FromSeconds(5)
|
||||||
|
[void]$searcher.PropertiesToLoad.Add('objectSid')
|
||||||
|
|
||||||
|
try {
|
||||||
|
$results = $searcher.FindAll()
|
||||||
|
try {
|
||||||
|
$desiredSids = @(
|
||||||
|
foreach ($result in $results) {
|
||||||
|
$sidBytes = [byte[]]$result.Properties['objectsid'][0]
|
||||||
|
if ($sidBytes.Length -gt 0) {
|
||||||
|
[Security.Principal.SecurityIdentifier]::new($sidBytes, 0).Value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
) | Sort-Object -Unique
|
||||||
|
}
|
||||||
|
finally { $results.Dispose() }
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
Write-Warning "Cannot read domain Administrators; local membership was left unchanged: $($_.Exception.Message)"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
$searcher.Dispose()
|
||||||
|
$directoryRoot.Dispose()
|
||||||
|
}
|
||||||
|
|
||||||
|
$localAdministratorsSid = [Security.Principal.SecurityIdentifier]::new('S-1-5-32-544')
|
||||||
|
$localAdministrators = Get-LocalGroup -SID $localAdministratorsSid
|
||||||
|
$group = [ADSI]("WinNT://$env:COMPUTERNAME/$($localAdministrators.Name),group")
|
||||||
|
function Get-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 { }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
$statePath = 'HKLM:\SOFTWARE\SGU\WorkstationAdministrators'
|
||||||
|
$managedSids = if (Test-Path -LiteralPath $statePath) {
|
||||||
|
@((Get-ItemProperty -LiteralPath $statePath -Name ManagedSids -ErrorAction SilentlyContinue).ManagedSids)
|
||||||
|
} else { @() }
|
||||||
|
$managedSids = @($managedSids | Where-Object { $_ -match '^S-1-5-21-' } | Sort-Object -Unique)
|
||||||
|
$presentSids = @(Get-MemberSids)
|
||||||
|
|
||||||
|
foreach ($sid in $desiredSids) {
|
||||||
|
if ($presentSids -notcontains $sid) {
|
||||||
|
Add-LocalGroupMember -Group $localAdministrators.Name -Member $sid
|
||||||
|
$presentSids += $sid
|
||||||
|
$managedSids += $sid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Remove only entries previously added by this policy. Other local or domain
|
||||||
|
# administrators remain untouched if they have a separate authorization path.
|
||||||
|
foreach ($sid in @($managedSids | Where-Object { $desiredSids -notcontains $_ })) {
|
||||||
|
if ($presentSids -contains $sid) {
|
||||||
|
Remove-LocalGroupMember -Group $localAdministrators.Name -Member $sid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
New-Item -Path $statePath -Force | Out-Null
|
||||||
|
$remainingManagedSids = @($managedSids |
|
||||||
|
Where-Object { $desiredSids -contains $_ } | Sort-Object -Unique)
|
||||||
|
if ($remainingManagedSids.Count -gt 0) {
|
||||||
|
$state = @{
|
||||||
|
Path = $statePath
|
||||||
|
Name = 'ManagedSids'
|
||||||
|
PropertyType = 'MultiString'
|
||||||
|
Value = $remainingManagedSids
|
||||||
|
Force = $true
|
||||||
|
}
|
||||||
|
New-ItemProperty @state | Out-Null
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Remove-ItemProperty -Path $statePath -Name ManagedSids -ErrorAction SilentlyContinue
|
||||||
|
}
|
||||||
|
|
||||||
|
$verifiedSids = @(Get-MemberSids)
|
||||||
|
$missingSids = @($desiredSids | Where-Object { $verifiedSids -notcontains $_ })
|
||||||
|
if ($missingSids.Count -gt 0) {
|
||||||
|
throw "Domain Administrators were not added to local Administrators: $($missingSids -join ', ')"
|
||||||
|
}
|
||||||
@@ -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)"
|
||||||
|
}
|
||||||
@@ -29,10 +29,15 @@ $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'
|
||||||
|
1306 = 'DirectoryReversiblePasswordEncryptionEnabled'
|
||||||
}
|
}
|
||||||
|
|
||||||
# Keep these reads unfiltered. Besides making archived and current logs behave
|
# Keep these reads unfiltered. Besides making archived and current logs behave
|
||||||
|
|||||||
@@ -518,7 +518,11 @@ foreach ($requiredPath in @(
|
|||||||
(Join-Path $scriptsRoot 'Deploy-AuthBroker.ps1'),
|
(Join-Path $scriptsRoot 'Deploy-AuthBroker.ps1'),
|
||||||
(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-SguInstitutionalPasswordPolicy.ps1'),
|
||||||
(Join-Path $scriptsRoot 'Set-SguDomainComputerPolicies.ps1'),
|
(Join-Path $scriptsRoot 'Set-SguDomainComputerPolicies.ps1'),
|
||||||
|
(Join-Path $scriptsRoot 'Enable-SguWorkstationRemoteAccess.ps1'),
|
||||||
|
(Join-Path $scriptsRoot 'Enable-SguWorkstationAdministrators.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'),
|
||||||
@@ -771,6 +775,9 @@ if (Test-Path -LiteralPath $brokerConfigurationPath -PathType Leaf) {
|
|||||||
-CreateMissingOus `
|
-CreateMissingOus `
|
||||||
-DisableCertificateRevocationCheckForLab | Out-Null
|
-DisableCertificateRevocationCheckForLab | Out-Null
|
||||||
|
|
||||||
|
& (Join-Path $scriptsRoot 'Set-SguInstitutionalPasswordPolicy.ps1') `
|
||||||
|
-BaseDn $baseDn -DomainController $adServer | Out-Null
|
||||||
|
|
||||||
# Remove stale A records registered by any non-domain/NAT adapter before its
|
# Remove stale A records registered by any non-domain/NAT adapter before its
|
||||||
# dynamic DNS registration was disabled.
|
# dynamic DNS registration was disabled.
|
||||||
$hostRecords = @(Get-DnsServerResourceRecord -ZoneName $DomainName `
|
$hostRecords = @(Get-DnsServerResourceRecord -ZoneName $DomainName `
|
||||||
@@ -820,6 +827,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 `
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
[CmdletBinding(SupportsShouldProcess)]
|
[CmdletBinding(SupportsShouldProcess)]
|
||||||
param(
|
param(
|
||||||
[string]$Version = '0.6.15',
|
[string]$Version = '0.6.20',
|
||||||
|
|
||||||
[ValidatePattern('^https://')]
|
[ValidatePattern('^https://')]
|
||||||
[string]$ClientPackageUri = 'https://gitea.lci.ulsa.mx/alexrg/SGU-CredentialProvider/releases/download/v0.6.15/sgu-windows-client-bootstrap-0.6.15.zip',
|
[string]$ClientPackageUri = 'https://gitea.lci.ulsa.mx/alexrg/SGU-CredentialProvider/releases/download/v0.6.20/sgu-windows-client-bootstrap-0.6.20.zip',
|
||||||
|
|
||||||
[ValidatePattern('^[0-9A-Fa-f]{64}$')]
|
[ValidatePattern('^[0-9A-Fa-f]{64}$')]
|
||||||
[string]$ClientPackageSha256 = 'A5684FD1C196672F005517EB8E21D345BB0707091B59E203627995FF88001A11',
|
[string]$ClientPackageSha256 = '6F5FE0467446C695218BEDD02E7BE9E08E1437CE7287C09DE0FC4BE7C596FB60',
|
||||||
|
|
||||||
[string]$GpoName = 'SGU - Credential Provider update',
|
[string]$GpoName = 'SGU - Credential Provider update',
|
||||||
|
|
||||||
@@ -60,7 +60,8 @@ if ($PSCmdlet.ShouldProcess($GpoName, 'Make the computer startup script synchron
|
|||||||
$scriptName = "Update-SguCredentialProvider-$Version.ps1"
|
$scriptName = "Update-SguCredentialProvider-$Version.ps1"
|
||||||
$gpoScriptsPath = Join-Path $env:WINDIR "SYSVOL\domain\Policies\{$($gpo.Id)}\Machine\Scripts"
|
$gpoScriptsPath = Join-Path $env:WINDIR "SYSVOL\domain\Policies\{$($gpo.Id)}\Machine\Scripts"
|
||||||
$startupPath = Join-Path $gpoScriptsPath 'Startup'
|
$startupPath = Join-Path $gpoScriptsPath 'Startup'
|
||||||
$powershellScriptsIniPath = Join-Path $gpoScriptsPath 'psscripts.ini'
|
$scriptsIniPath = Join-Path $gpoScriptsPath 'scripts.ini'
|
||||||
|
$legacyPowerShellScriptsIniPath = Join-Path $gpoScriptsPath 'psscripts.ini'
|
||||||
$scriptPath = Join-Path $startupPath $scriptName
|
$scriptPath = Join-Path $startupPath $scriptName
|
||||||
|
|
||||||
$startupScript = @"
|
$startupScript = @"
|
||||||
@@ -74,6 +75,12 @@ if (-not `$computerSystem.PartOfDomain -or `$computerSystem.DomainRole -ge 4) {
|
|||||||
exit 0
|
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"
|
`$updateRoot = Join-Path `$env:ProgramData "SGU\CredentialProviderUpdates\`$version"
|
||||||
`$markerPath = Join-Path `$updateRoot 'complete.marker'
|
`$markerPath = Join-Path `$updateRoot 'complete.marker'
|
||||||
if (Test-Path -LiteralPath `$markerPath -PathType Leaf) {
|
if (Test-Path -LiteralPath `$markerPath -PathType Leaf) {
|
||||||
@@ -99,7 +106,9 @@ if (-not (Test-Path -LiteralPath `$installScript -PathType Leaf)) {
|
|||||||
if (Test-Path -LiteralPath `$stagePath -PathType Container) {
|
if (Test-Path -LiteralPath `$stagePath -PathType Container) {
|
||||||
Remove-Item -LiteralPath `$stagePath -Recurse -Force
|
Remove-Item -LiteralPath `$stagePath -Recurse -Force
|
||||||
}
|
}
|
||||||
Expand-Archive -LiteralPath `$archivePath -DestinationPath `$stagePath -Force
|
New-Item -ItemType Directory -Path `$stagePath -Force | Out-Null
|
||||||
|
Add-Type -AssemblyName System.IO.Compression.FileSystem
|
||||||
|
[IO.Compression.ZipFile]::ExtractToDirectory(`$archivePath, `$stagePath)
|
||||||
}
|
}
|
||||||
if (-not (Test-Path -LiteralPath `$installScript -PathType Leaf)) {
|
if (-not (Test-Path -LiteralPath `$installScript -PathType Leaf)) {
|
||||||
throw 'The verified update package did not contain Install-CredentialProvider.ps1.'
|
throw 'The verified update package did not contain Install-CredentialProvider.ps1.'
|
||||||
@@ -115,8 +124,9 @@ if (-not (Test-Path -LiteralPath `$installScript -PathType Leaf)) {
|
|||||||
DomainNetbios = [string]`$settings.DomainNetbios
|
DomainNetbios = [string]`$settings.DomainNetbios
|
||||||
TimeoutSeconds = [int]`$settings.TimeoutSeconds
|
TimeoutSeconds = [int]`$settings.TimeoutSeconds
|
||||||
}
|
}
|
||||||
`$dotnet = Get-Command dotnet -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Source -ErrorAction SilentlyContinue
|
`$dotnet = Join-Path `$env:ProgramFiles 'dotnet\dotnet.exe'
|
||||||
`$runtimeInstalled = `$dotnet -and (& `$dotnet --list-runtimes | Select-String '^Microsoft\.NETCore\.App 10\.')
|
`$runtimeInstalled = (Test-Path -LiteralPath `$dotnet -PathType Leaf) -and
|
||||||
|
(& `$dotnet --list-runtimes | Select-String '^Microsoft\.NETCore\.App 10\.')
|
||||||
if (-not `$runtimeInstalled) {
|
if (-not `$runtimeInstalled) {
|
||||||
`$runtimeInstaller = Get-ChildItem -LiteralPath (Join-Path `$stagePath 'payload\prerequisites') -Filter '*x64*.exe' -File |
|
`$runtimeInstaller = Get-ChildItem -LiteralPath (Join-Path `$stagePath 'payload\prerequisites') -Filter '*x64*.exe' -File |
|
||||||
Select-Object -First 1
|
Select-Object -First 1
|
||||||
@@ -134,9 +144,15 @@ if (-not `$runtimeInstalled) {
|
|||||||
if ($PSCmdlet.ShouldProcess($startupPath, "Install '$scriptName' as a computer startup script")) {
|
if ($PSCmdlet.ShouldProcess($startupPath, "Install '$scriptName' as a computer startup script")) {
|
||||||
New-Item -ItemType Directory -Path $startupPath -Force | Out-Null
|
New-Item -ItemType Directory -Path $startupPath -Force | Out-Null
|
||||||
[IO.File]::WriteAllText($scriptPath, $startupScript, [Text.UTF8Encoding]::new($false))
|
[IO.File]::WriteAllText($scriptPath, $startupScript, [Text.UTF8Encoding]::new($false))
|
||||||
$scriptsIni = "[Startup]`r`n0CmdLine=$scriptName`r`n0Parameters=`r`n"
|
$scriptUncPath = "\\$domainDnsRoot\SYSVOL\$domainDnsRoot\Policies\{$($gpo.Id)}\Machine\Scripts\Startup\$scriptName"
|
||||||
# Windows' Scripts CSE requires UTF-16LE with a BOM for psscripts.ini.
|
$scriptsIni = "[Startup]`r`n0CmdLine=powershell.exe`r`n0Parameters=-NoProfile -NonInteractive -ExecutionPolicy Bypass -File `"$scriptUncPath`"`r`n"
|
||||||
[IO.File]::WriteAllText($powershellScriptsIniPath, $scriptsIni, [Text.Encoding]::Unicode)
|
# 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
|
# Writing SYSVOL directly does not register the Scripts CSE in the GPO's
|
||||||
# Active Directory object. Without it, gpresult lists the GPO but the
|
# Active Directory object. Without it, gpresult lists the GPO but the
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
[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. These startup
|
||||||
|
# scripts are a native Group Policy extension, not scheduled client tasks.
|
||||||
|
$scriptNames = @(
|
||||||
|
'Enable-SguWorkstationRemoteAccess.ps1',
|
||||||
|
'Enable-SguWorkstationAdministrators.ps1'
|
||||||
|
)
|
||||||
|
$startupRoot = Join-Path $env:WINDIR "SYSVOL\domain\Policies\{$($gpo.Id)}\Machine\Scripts"
|
||||||
|
$scriptsIniPath = Join-Path $startupRoot 'scripts.ini'
|
||||||
|
$startupScripts = @(
|
||||||
|
foreach ($scriptName in $scriptNames) {
|
||||||
|
$sourcePath = Join-Path $PSScriptRoot $scriptName
|
||||||
|
$startupPath = Join-Path $startupRoot "Startup\$scriptName"
|
||||||
|
$source = [IO.File]::ReadAllText($sourcePath)
|
||||||
|
[pscustomobject]@{
|
||||||
|
Name = $scriptName
|
||||||
|
Path = $startupPath
|
||||||
|
Source = $source
|
||||||
|
Changed = -not (Test-Path -LiteralPath $startupPath) -or
|
||||||
|
[IO.File]::ReadAllText($startupPath) -cne $source
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
$iniLines = @('[Startup]')
|
||||||
|
for ($index = 0; $index -lt $scriptNames.Count; $index++) {
|
||||||
|
$unc = "\\$domainName\SYSVOL\$domainName\Policies\{$($gpo.Id)}\Machine\Scripts\Startup\$($scriptNames[$index])"
|
||||||
|
$iniLines += "${index}CmdLine=powershell.exe"
|
||||||
|
$iniLines += "${index}Parameters=-NoProfile -NonInteractive -ExecutionPolicy Bypass -File `"$unc`""
|
||||||
|
}
|
||||||
|
$ini = ($iniLines -join "`r`n") + "`r`n"
|
||||||
|
$scriptChanged = @($startupScripts | Where-Object Changed).Count -gt 0
|
||||||
|
$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 (Join-Path $startupRoot 'Startup') -Force | Out-Null
|
||||||
|
foreach ($startupScript in $startupScripts) {
|
||||||
|
if ($startupScript.Changed) {
|
||||||
|
[IO.File]::WriteAllText($startupScript.Path, $startupScript.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
|
||||||
|
StartupScripts = @($startupScripts.Path)
|
||||||
|
Changed = $scriptChanged -or $iniChanged
|
||||||
|
}
|
||||||
@@ -210,9 +210,12 @@ $serverScripts = @(
|
|||||||
'Disable-SguAzureUserRoaming.ps1',
|
'Disable-SguAzureUserRoaming.ps1',
|
||||||
'Enable-SguAzureUserRoaming.ps1',
|
'Enable-SguAzureUserRoaming.ps1',
|
||||||
'Enable-SguServerRemoteManagement.ps1',
|
'Enable-SguServerRemoteManagement.ps1',
|
||||||
|
'Enable-SguWorkstationRemoteAccess.ps1',
|
||||||
|
'Enable-SguWorkstationAdministrators.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',
|
||||||
@@ -224,6 +227,7 @@ $serverScripts = @(
|
|||||||
'Register-SguClientCertificate.ps1',
|
'Register-SguClientCertificate.ps1',
|
||||||
'Register-SguRustDeskDevice.ps1',
|
'Register-SguRustDeskDevice.ps1',
|
||||||
'Set-LabBrokerDns.ps1',
|
'Set-LabBrokerDns.ps1',
|
||||||
|
'Set-SguInstitutionalPasswordPolicy.ps1',
|
||||||
'Set-SguDomainComputerPolicies.ps1',
|
'Set-SguDomainComputerPolicies.ps1',
|
||||||
'Set-SguLaboratorioWallpaperPolicy.ps1',
|
'Set-SguLaboratorioWallpaperPolicy.ps1',
|
||||||
'Set-SguLocalProfileSecurityPolicies.ps1',
|
'Set-SguLocalProfileSecurityPolicies.ps1',
|
||||||
|
|||||||
@@ -0,0 +1,136 @@
|
|||||||
|
[CmdletBinding(SupportsShouldProcess)]
|
||||||
|
param(
|
||||||
|
[string]$DomainController = $env:COMPUTERNAME,
|
||||||
|
[string]$BaseDn = 'DC=lci,DC=lasalle,DC=mx',
|
||||||
|
[string]$PolicyName = 'SGU - Institutional password authority',
|
||||||
|
[int]$Precedence = 100
|
||||||
|
)
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
Import-Module ActiveDirectory -ErrorAction Stop
|
||||||
|
|
||||||
|
$domain = Get-ADDomain -Server $DomainController -ErrorAction Stop
|
||||||
|
if ($domain.DistinguishedName -ne $BaseDn) {
|
||||||
|
throw "BaseDn does not match the domain served by $DomainController."
|
||||||
|
}
|
||||||
|
if ($domain.DomainMode -lt 'Windows2012Domain') {
|
||||||
|
throw 'Fine-grained password policies require Windows Server 2012 domain functional level or newer.'
|
||||||
|
}
|
||||||
|
|
||||||
|
# AD's default password policy must remain intact for non-SGU accounts.
|
||||||
|
# The broker validates the exact password with SGU before resetting the AD
|
||||||
|
# verifier. These global security groups are assigned before SetPassword.
|
||||||
|
$groups = @(
|
||||||
|
"CN=SGU-Alumnos,OU=Alumnos,OU=Usuarios-SGU,$BaseDn",
|
||||||
|
"CN=SGU-Administrativos,OU=Administrativos,OU=Usuarios-SGU,$BaseDn",
|
||||||
|
"CN=SGU-Docentes,OU=Docentes,OU=Usuarios-SGU,$BaseDn"
|
||||||
|
)
|
||||||
|
foreach ($groupDn in $groups) {
|
||||||
|
$group = Get-ADGroup -Identity $groupDn -Server $DomainController -ErrorAction Stop
|
||||||
|
if ($group.GroupCategory -ne 'Security' -or $group.GroupScope -ne 'Global') {
|
||||||
|
throw "The password-policy subject must be a global security group: $groupDn"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$desired = @{
|
||||||
|
Precedence = $Precedence
|
||||||
|
ComplexityEnabled = $false
|
||||||
|
ReversibleEncryptionEnabled = $true
|
||||||
|
MinPasswordLength = 1
|
||||||
|
PasswordHistoryCount = 0
|
||||||
|
MinPasswordAge = [TimeSpan]::Zero
|
||||||
|
MaxPasswordAge = [TimeSpan]::Zero
|
||||||
|
LockoutThreshold = 0
|
||||||
|
LockoutDuration = [TimeSpan]::FromMinutes(10)
|
||||||
|
LockoutObservationWindow = [TimeSpan]::FromMinutes(10)
|
||||||
|
}
|
||||||
|
|
||||||
|
$policy = Get-ADFineGrainedPasswordPolicy -Filter * -Server $DomainController |
|
||||||
|
Where-Object { $_.Name -eq $PolicyName } |
|
||||||
|
Select-Object -First 1
|
||||||
|
if (-not $policy) {
|
||||||
|
if ($PSCmdlet.ShouldProcess($PolicyName, 'Create password policy limited to SGU role groups')) {
|
||||||
|
New-ADFineGrainedPasswordPolicy -Name $PolicyName @desired -Server $DomainController `
|
||||||
|
-Description 'SGU validates the exact institutional password; reversible storage is enabled only for SGU role groups, and AD must not reject its complexity, length, history, or age.' `
|
||||||
|
-ProtectedFromAccidentalDeletion $true | Out-Null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$different = @($desired.Keys | Where-Object { $policy.$_ -ne $desired[$_] })
|
||||||
|
if ($different.Count -gt 0 -and
|
||||||
|
$PSCmdlet.ShouldProcess($PolicyName, "Restore managed settings: $($different -join ', ')")) {
|
||||||
|
Set-ADFineGrainedPasswordPolicy -Identity $policy @desired -Server $DomainController | Out-Null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$policy = Get-ADFineGrainedPasswordPolicy -Filter * -Properties AppliesTo `
|
||||||
|
-Server $DomainController |
|
||||||
|
Where-Object { $_.Name -eq $PolicyName } |
|
||||||
|
Select-Object -First 1
|
||||||
|
if (-not $policy) {
|
||||||
|
if ($WhatIfPreference) { return }
|
||||||
|
throw "The fine-grained policy $PolicyName was not created."
|
||||||
|
}
|
||||||
|
foreach ($groupDn in $groups) {
|
||||||
|
if (@($policy.AppliesTo) -notcontains $groupDn) {
|
||||||
|
if ($PSCmdlet.ShouldProcess($groupDn, "Apply $PolicyName")) {
|
||||||
|
Add-ADFineGrainedPasswordPolicySubject -Identity $policy -Subjects $groupDn `
|
||||||
|
-Server $DomainController -ErrorAction Stop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Existing SGU group members also need the per-account UAC bit before the next
|
||||||
|
# broker SetPassword call. The default domain policy stays unchanged, and users
|
||||||
|
# outside these three SGU groups are deliberately excluded.
|
||||||
|
$reversibleAccountsEnabled = 0
|
||||||
|
$usersOuDn = "OU=Usuarios-SGU,$BaseDn"
|
||||||
|
$managedUserDns = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase)
|
||||||
|
foreach ($groupDn in $groups) {
|
||||||
|
foreach ($member in Get-ADGroupMember -Identity $groupDn -Recursive `
|
||||||
|
-Server $DomainController -ErrorAction Stop) {
|
||||||
|
if ($member.objectClass -eq 'user') {
|
||||||
|
[void]$managedUserDns.Add($member.DistinguishedName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
foreach ($userDn in $managedUserDns) {
|
||||||
|
$user = Get-ADUser -Identity $userDn -Properties AllowReversiblePasswordEncryption `
|
||||||
|
-Server $DomainController -ErrorAction Stop
|
||||||
|
if (-not $user.DistinguishedName.EndsWith(",$usersOuDn", [StringComparison]::OrdinalIgnoreCase)) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (-not $user.AllowReversiblePasswordEncryption -and
|
||||||
|
$PSCmdlet.ShouldProcess($user.SamAccountName, 'Allow reversible password storage for SGU account')) {
|
||||||
|
Set-ADAccountControl -Identity $user.DistinguishedName `
|
||||||
|
-AllowReversiblePasswordEncryption $true -Server $DomainController -Confirm:$false
|
||||||
|
$reversibleAccountsEnabled++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$policy = Get-ADFineGrainedPasswordPolicy -Identity $PolicyName -Properties AppliesTo `
|
||||||
|
-Server $DomainController -ErrorAction Stop
|
||||||
|
if (-not $WhatIfPreference) {
|
||||||
|
foreach ($key in $desired.Keys) {
|
||||||
|
if ($policy.$key -ne $desired[$key]) {
|
||||||
|
throw "Password policy setting $key did not match the expected value."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
foreach ($groupDn in $groups) {
|
||||||
|
if (@($policy.AppliesTo) -notcontains $groupDn) {
|
||||||
|
throw "Password policy is not applied to $groupDn."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[pscustomobject]@{
|
||||||
|
Name = $policy.Name
|
||||||
|
Precedence = $policy.Precedence
|
||||||
|
ComplexityEnabled = $policy.ComplexityEnabled
|
||||||
|
ReversibleEncryptionEnabled = $policy.ReversibleEncryptionEnabled
|
||||||
|
MinPasswordLength = $policy.MinPasswordLength
|
||||||
|
PasswordHistoryCount = $policy.PasswordHistoryCount
|
||||||
|
MaxPasswordAge = $policy.MaxPasswordAge
|
||||||
|
ExistingAccountFlagsEnabled = $reversibleAccountsEnabled
|
||||||
|
Subjects = @($policy.AppliesTo)
|
||||||
|
}
|
||||||
@@ -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,14 @@ 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));
|
||||||
|
internal static readonly EventId DirectoryReversiblePasswordEncryptionEnabled = new(1306, nameof(DirectoryReversiblePasswordEncryptionEnabled));
|
||||||
}
|
}
|
||||||
@@ -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>
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ public sealed class ActiveDirectorySynchronizer(
|
|||||||
private const int InfoAttributeMaximumLength = 1024;
|
private const int InfoAttributeMaximumLength = 1024;
|
||||||
private const int AccountDisabled = 0x0002;
|
private const int AccountDisabled = 0x0002;
|
||||||
private const int NormalAccount = 0x0200;
|
private const int NormalAccount = 0x0200;
|
||||||
|
private const int ReversiblePasswordEncryptionAllowed = 0x0080;
|
||||||
private static readonly Guid ChangePasswordExtendedRight =
|
private static readonly Guid ChangePasswordExtendedRight =
|
||||||
new("AB721A53-1E2F-11D0-9819-00AA0040529B");
|
new("AB721A53-1E2F-11D0-9819-00AA0040529B");
|
||||||
private static readonly SecurityIdentifier EveryoneSid =
|
private static readonly SecurityIdentifier EveryoneSid =
|
||||||
@@ -131,6 +132,11 @@ public sealed class ActiveDirectorySynchronizer(
|
|||||||
// which ADSI SetPassword uses for each successful authentication.
|
// which ADSI SetPassword uses for each successful authentication.
|
||||||
EnsureCannotChangePassword(user, identity.UserName);
|
EnsureCannotChangePassword(user, identity.UserName);
|
||||||
|
|
||||||
|
// Scope reversible storage to users provisioned through SGU. The
|
||||||
|
// group password policy requires it, and this account flag must be
|
||||||
|
// set before the password is written.
|
||||||
|
EnsureReversiblePasswordEncryption(user, identity.UserName);
|
||||||
|
|
||||||
// The exact institutional password received by the broker is passed to AD.
|
// The exact institutional password received by the broker is passed to AD.
|
||||||
// It is not derived, transformed, written to disk, or included in logs.
|
// It is not derived, transformed, written to disk, or included in logs.
|
||||||
user.Invoke("SetPassword", [password]);
|
user.Invoke("SetPassword", [password]);
|
||||||
@@ -142,6 +148,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(
|
||||||
@@ -174,6 +181,23 @@ public sealed class ActiveDirectorySynchronizer(
|
|||||||
institutionalUser);
|
institutionalUser);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void EnsureReversiblePasswordEncryption(DirectoryEntry user, string institutionalUser)
|
||||||
|
{
|
||||||
|
object? rawFlags = user.Properties["userAccountControl"].Value;
|
||||||
|
int flags = rawFlags is null ? NormalAccount : Convert.ToInt32(rawFlags);
|
||||||
|
if ((flags & ReversiblePasswordEncryptionAllowed) != 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
user.Properties["userAccountControl"].Value = flags | ReversiblePasswordEncryptionAllowed;
|
||||||
|
user.CommitChanges();
|
||||||
|
logger.LogInformation(
|
||||||
|
BrokerEventIds.DirectoryReversiblePasswordEncryptionEnabled,
|
||||||
|
"Enabled reversible password storage for SGU-managed Active Directory user {InstitutionalUser}.",
|
||||||
|
institutionalUser);
|
||||||
|
}
|
||||||
|
|
||||||
internal static bool EnsureCannotChangePassword(ActiveDirectorySecurity security)
|
internal static bool EnsureCannotChangePassword(ActiveDirectorySecurity security)
|
||||||
{
|
{
|
||||||
bool changed = false;
|
bool changed = false;
|
||||||
@@ -264,6 +288,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,
|
||||||
|
|||||||
@@ -67,7 +67,8 @@ internal sealed class BrokerClient : IDisposable
|
|||||||
return BrokerDecision.Authorized(authorized.Domain, authorized.UserName);
|
return BrokerDecision.Authorized(authorized.Domain, authorized.UserName);
|
||||||
}
|
}
|
||||||
|
|
||||||
return BrokerDecision.Unavailable($"BROKER_HTTP_{(int)response.StatusCode}");
|
ErrorBody? unavailable = await ReadJsonAsync<ErrorBody>(response, timeout.Token).ConfigureAwait(false);
|
||||||
|
return BrokerDecision.Unavailable(unavailable?.Code ?? $"BROKER_HTTP_{(int)response.StatusCode}");
|
||||||
}
|
}
|
||||||
catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
|
catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -80,17 +80,27 @@ internal sealed class SguCredentialTile : CredentialTile3
|
|||||||
return DomainCredential(decision.Domain!, decision.UserName!, securePassword);
|
return DomainCredential(decision.Domain!, decision.UserName!, securePassword);
|
||||||
}
|
}
|
||||||
|
|
||||||
// An SGU rejection does not create an account. Pass the unchanged
|
// An explicit SGU rejection is authoritative even when an older AD
|
||||||
// credential to Windows so an existing AD account with the same
|
// verifier for the same institutional key still exists.
|
||||||
// name can still authenticate. A non-existent account is rejected
|
if (decision.Kind == BrokerDecisionKind.InvalidCredentials)
|
||||||
// by the domain controller.
|
{
|
||||||
|
return Failure("Usuario o contraseña incorrectos.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// SGU accepted this password but AD could not record it. Windows
|
||||||
|
// must not attempt a logon against a stale AD password.
|
||||||
|
if (decision.ErrorCode == "DIRECTORY_SYNCHRONIZATION_FAILED")
|
||||||
|
{
|
||||||
|
return Failure("La contraseña institucional fue aceptada, pero no se pudo preparar la cuenta en Active Directory. Intenta nuevamente o contacta a soporte.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only a genuine broker/SGU outage permits the documented cached
|
||||||
|
// domain-credential path for an existing account.
|
||||||
return DomainCredential(
|
return DomainCredential(
|
||||||
domain,
|
domain,
|
||||||
userName,
|
userName,
|
||||||
securePassword,
|
securePassword,
|
||||||
decision.Kind == BrokerDecisionKind.Unavailable
|
"El servicio de autenticación no está disponible; Windows validará la última contraseña de dominio registrada.");
|
||||||
? "El servicio institucional no está disponible; Windows validará la contraseña guardada en el dominio."
|
|
||||||
: null);
|
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,9 +2,15 @@ $repositoryRoot = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
|
|||||||
$synchronizerPath = Join-Path $repositoryRoot 'src\SGU.AuthBroker\Services\ActiveDirectorySynchronizer.cs'
|
$synchronizerPath = Join-Path $repositoryRoot 'src\SGU.AuthBroker\Services\ActiveDirectorySynchronizer.cs'
|
||||||
$deployPath = Join-Path $repositoryRoot 'scripts\Deploy-AuthBroker.ps1'
|
$deployPath = Join-Path $repositoryRoot 'scripts\Deploy-AuthBroker.ps1'
|
||||||
$userPolicyPath = Join-Path $repositoryRoot 'scripts\Set-SguDomainUserPolicies.ps1'
|
$userPolicyPath = Join-Path $repositoryRoot 'scripts\Set-SguDomainUserPolicies.ps1'
|
||||||
|
$passwordPolicyPath = Join-Path $repositoryRoot 'scripts\Set-SguInstitutionalPasswordPolicy.ps1'
|
||||||
|
$bootstrapPath = Join-Path $repositoryRoot 'scripts\Initialize-SguDomainController.ps1'
|
||||||
|
$packagePath = Join-Path $repositoryRoot 'scripts\New-SguBootstrapPackages.ps1'
|
||||||
$synchronizer = Get-Content -LiteralPath $synchronizerPath -Raw
|
$synchronizer = Get-Content -LiteralPath $synchronizerPath -Raw
|
||||||
$deploy = Get-Content -LiteralPath $deployPath -Raw
|
$deploy = Get-Content -LiteralPath $deployPath -Raw
|
||||||
$userPolicy = Get-Content -LiteralPath $userPolicyPath -Raw
|
$userPolicy = Get-Content -LiteralPath $userPolicyPath -Raw
|
||||||
|
$passwordPolicy = Get-Content -LiteralPath $passwordPolicyPath -Raw
|
||||||
|
$bootstrap = Get-Content -LiteralPath $bootstrapPath -Raw
|
||||||
|
$package = Get-Content -LiteralPath $packagePath -Raw
|
||||||
|
|
||||||
Describe 'SGU Auth Broker password authority' {
|
Describe 'SGU Auth Broker password authority' {
|
||||||
It 'denies the Change Password extended right to SELF and Everyone before SetPassword' {
|
It 'denies the Change Password extended right to SELF and Everyone before SetPassword' {
|
||||||
@@ -25,4 +31,17 @@ Describe 'SGU Auth Broker password authority' {
|
|||||||
$userPolicy | Should Match "disableChangePasswordValueName = 'DisableChangePassword'"
|
$userPolicy | Should Match "disableChangePasswordValueName = 'DisableChangePassword'"
|
||||||
$userPolicy | Should Match '(?s)-ValueName \$disableChangePasswordValueName.*-Type DWord.*-Value 1'
|
$userPolicy | Should Match '(?s)-ValueName \$disableChangePasswordValueName.*-Type DWord.*-Value 1'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
It 'scopes exact SGU passwords to all three SGU role groups without changing the domain default' {
|
||||||
|
foreach ($role in @('Alumnos', 'Administrativos', 'Docentes')) {
|
||||||
|
$passwordPolicy | Should Match "CN=SGU-$role,OU=$role,OU=Usuarios-SGU"
|
||||||
|
}
|
||||||
|
$passwordPolicy | Should Match 'ComplexityEnabled = \$false'
|
||||||
|
$passwordPolicy | Should Match 'MinPasswordLength = 1'
|
||||||
|
$passwordPolicy | Should Match 'PasswordHistoryCount = 0'
|
||||||
|
$passwordPolicy | Should Match 'MaxPasswordAge = \[TimeSpan\]::Zero'
|
||||||
|
$passwordPolicy | Should Not Match 'Set-ADDefaultDomainPasswordPolicy'
|
||||||
|
$bootstrap | Should Match 'Set-SguInstitutionalPasswordPolicy\.ps1'
|
||||||
|
$package | Should Match "'Set-SguInstitutionalPasswordPolicy.ps1'"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -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'
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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());
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ public sealed class BrokerClientTests
|
|||||||
TestContext.Current.CancellationToken);
|
TestContext.Current.CancellationToken);
|
||||||
|
|
||||||
Assert.Equal(BrokerDecisionKind.InvalidCredentials, decision.Kind);
|
Assert.Equal(BrokerDecisionKind.InvalidCredentials, decision.Kind);
|
||||||
|
Assert.Equal("INVALID_INSTITUTIONAL_CREDENTIALS", decision.ErrorCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
@@ -61,6 +62,23 @@ public sealed class BrokerClientTests
|
|||||||
TestContext.Current.CancellationToken);
|
TestContext.Current.CancellationToken);
|
||||||
|
|
||||||
Assert.Equal(BrokerDecisionKind.Unavailable, decision.Kind);
|
Assert.Equal(BrokerDecisionKind.Unavailable, decision.Kind);
|
||||||
|
Assert.Equal("NTLM_UPSTREAM_ERROR", decision.ErrorCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task SynchronizationFailureRetainsItsSpecificErrorCode()
|
||||||
|
{
|
||||||
|
using BrokerClient client = new(
|
||||||
|
CreateSettings(),
|
||||||
|
new CapturingHandler(HttpStatusCode.ServiceUnavailable, "{\"code\":\"DIRECTORY_SYNCHRONIZATION_FAILED\"}"));
|
||||||
|
|
||||||
|
BrokerDecision decision = await client.AuthenticateAsync(
|
||||||
|
"AL250792",
|
||||||
|
"SGUAccepted",
|
||||||
|
TestContext.Current.CancellationToken);
|
||||||
|
|
||||||
|
Assert.Equal(BrokerDecisionKind.Unavailable, decision.Kind);
|
||||||
|
Assert.Equal("DIRECTORY_SYNCHRONIZATION_FAILED", decision.ErrorCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ProviderSettings CreateSettings() => new()
|
private static ProviderSettings CreateSettings() => new()
|
||||||
|
|||||||
Reference in new issue
Block a user