Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
77091c023d | ||
|
|
21890047e2 | ||
|
|
db35d86df1 |
No files matched your search
@@ -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
|
||||
segundos**: si SGU excede ese presupuesto, Windows continúa por el fallback
|
||||
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
|
||||
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
|
||||
|
||||
+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;
|
||||
- `1200` enriquecimiento completado y cantidad de campos; `1201` HTML sin los
|
||||
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;
|
||||
`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
|
||||
respuesta SGU.
|
||||
Los registros no almacenan HTML, contraseñas, hashes ni cuerpos de respuesta
|
||||
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
|
||||
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
# Acceso remoto administrado por el dominio
|
||||
|
||||
`Install-SguWorkstationRemoteAccessPolicy.ps1` registra un script de inicio de
|
||||
equipo en la GPO existente **SGU - Windows client experience**, vinculada a
|
||||
`OU=Laboratorio`. El bootstrap del controlador lo instala después de crear esa
|
||||
GPO. No crea una tarea programada en los clientes.
|
||||
|
||||
Al arrancar una estación Windows 10 u 11 unida al dominio, el script activa
|
||||
Escritorio remoto con NLA y PowerShell Remoting, inicia `TermService` y `WinRM`,
|
||||
y añade el grupo `LCI\SG-Laboratorio-Usuarios-RDP` a Usuarios de escritorio
|
||||
remoto. Sus reglas de firewall admiten los puertos TCP 3389 y 5985 y UDP 3389
|
||||
solo desde la subred local. En arranques siguientes comprueba el estado y solo
|
||||
corrige las diferencias.
|
||||
|
||||
Para aplicar una versión nueva a un cliente, ejecute PowerShell como
|
||||
administrador y después reinicie:
|
||||
|
||||
```powershell
|
||||
gpupdate /target:computer /force
|
||||
Restart-Computer
|
||||
```
|
||||
|
||||
La GPO de actualización del proveedor de credenciales también se ejecuta al
|
||||
inicio de equipo; `gpupdate` sin reiniciar no instala el proveedor nuevo.
|
||||
Compruebe la aplicación con `gpresult /scope computer /r`, `Test-WSMan` y una
|
||||
conexión RDP desde la misma subred. Si el equipo no puede autenticarse ante
|
||||
el controlador (`Test-ComputerSecureChannel` devuelve `False`), repare primero
|
||||
la relación de confianza desde el propio cliente con credenciales de dominio
|
||||
autorizadas; un equipo sin canal seguro no puede recibir de forma fiable sus
|
||||
políticas. No elimine ni vuelva a crear su objeto de AD para forzar una GPO.
|
||||
|
||||
Desde un equipo administrador no unido al dominio, PowerShell Remoting por
|
||||
HTTP requiere indicar `-Credential` y confiar explícitamente en el destino
|
||||
mediante `TrustedHosts`, o utilizar WinRM por HTTPS. `Test-WSMan` solo verifica
|
||||
el listener; no inicia sesión. Las reglas locales de la estación no abren
|
||||
puertos en Azure ni en el router del laboratorio.
|
||||
@@ -0,0 +1,78 @@
|
||||
[CmdletBinding()]
|
||||
param([string]$RemoteDesktopPrincipal = 'LCI\SG-Laboratorio-Usuarios-RDP')
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$computer = Get-CimInstance Win32_ComputerSystem
|
||||
if (-not $computer.PartOfDomain -or $computer.DomainRole -ge 4) { return }
|
||||
|
||||
$terminalKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Terminal Server'
|
||||
$rdpKey = Join-Path $terminalKey 'WinStations\RDP-Tcp'
|
||||
if ((Get-ItemPropertyValue -Path $terminalKey -Name fDenyTSConnections) -ne 0) {
|
||||
Set-ItemProperty -Path $terminalKey -Name fDenyTSConnections -Value 0
|
||||
}
|
||||
if ((Get-ItemPropertyValue -Path $rdpKey -Name UserAuthentication) -ne 1) {
|
||||
Set-ItemProperty -Path $rdpKey -Name UserAuthentication -Value 1
|
||||
}
|
||||
|
||||
foreach ($name in @('TermService', 'WinRM')) {
|
||||
$service = Get-Service -Name $name
|
||||
if ($service.StartType -ne 'Automatic') { Set-Service -Name $name -StartupType Automatic }
|
||||
if ($service.Status -ne 'Running') { Start-Service -Name $name }
|
||||
}
|
||||
|
||||
# Each domain refresh carries this script through SYSVOL. Apply only the
|
||||
# narrowly scoped inbound rules required by an administrator on the same LAN.
|
||||
$rules = @(
|
||||
@{ Name = 'SGU-Workstation-WinRM-HTTP'; Protocol = 'TCP'; Port = '5985' },
|
||||
@{ Name = 'SGU-Workstation-RDP-TCP'; Protocol = 'TCP'; Port = '3389' },
|
||||
@{ Name = 'SGU-Workstation-RDP-UDP'; Protocol = 'UDP'; Port = '3389' }
|
||||
)
|
||||
foreach ($rule in $rules) {
|
||||
$existing = Get-NetFirewallRule -Name $rule.Name -ErrorAction SilentlyContinue
|
||||
if ($existing) {
|
||||
$port = $existing | Get-NetFirewallPortFilter
|
||||
$address = $existing | Get-NetFirewallAddressFilter
|
||||
$valid = $existing.Enabled -eq 'True' -and $existing.Action -eq 'Allow' -and
|
||||
$existing.Direction -eq 'Inbound' -and $existing.Profile -eq 'Any' -and
|
||||
$port.Protocol -eq $rule.Protocol -and [string]$port.LocalPort -eq $rule.Port -and
|
||||
@($address.RemoteAddress).Count -eq 1 -and $address.RemoteAddress -eq 'LocalSubnet'
|
||||
if ($valid) { continue }
|
||||
$existing | Remove-NetFirewallRule
|
||||
}
|
||||
New-NetFirewallRule -Name $rule.Name -DisplayName $rule.Name -Enabled True `
|
||||
-Direction Inbound -Action Allow -Profile Any -Protocol $rule.Protocol `
|
||||
-LocalPort $rule.Port -RemoteAddress LocalSubnet | Out-Null
|
||||
}
|
||||
|
||||
# WinRM's administrative-template policy creates the listener. This also
|
||||
# restores the Windows PowerShell session endpoint when it was disabled.
|
||||
$listener = @(Get-ChildItem WSMan:\localhost\Listener -ErrorAction SilentlyContinue |
|
||||
Where-Object { $_.Keys -contains 'Transport=HTTP' })
|
||||
$endpoint = Get-PSSessionConfiguration -Name Microsoft.PowerShell -ErrorAction SilentlyContinue
|
||||
if (-not $listener -or -not $endpoint) {
|
||||
Enable-PSRemoting -Force -SkipNetworkProfileCheck | Out-Null
|
||||
}
|
||||
|
||||
# The built-in local group has a stable SID across Windows display languages.
|
||||
$groupSid = [Security.Principal.SecurityIdentifier]::new('S-1-5-32-555')
|
||||
$groupName = ($groupSid.Translate([Security.Principal.NTAccount]).Value -split '\\', 2)[1]
|
||||
try {
|
||||
$principalSid = ([Security.Principal.NTAccount]::new($RemoteDesktopPrincipal)).Translate(
|
||||
[Security.Principal.SecurityIdentifier]).Value
|
||||
$group = [ADSI]("WinNT://$env:COMPUTERNAME/$groupName,group")
|
||||
$memberSids = @($group.psbase.Invoke('Members') | ForEach-Object {
|
||||
try {
|
||||
$bytes = $_.GetType().InvokeMember('objectSid',
|
||||
[Reflection.BindingFlags]::GetProperty, $null, $_, $null)
|
||||
if ($bytes) { ([Security.Principal.SecurityIdentifier]::new([byte[]]$bytes, 0)).Value }
|
||||
}
|
||||
catch { }
|
||||
})
|
||||
if ($memberSids -notcontains $principalSid) {
|
||||
Add-LocalGroupMember -Group $groupName -Member $principalSid
|
||||
}
|
||||
}
|
||||
catch {
|
||||
# A temporarily unavailable DC must not prevent RDP and WinRM from starting.
|
||||
Write-Warning "Remote Desktop group membership could not be verified: $($_.Exception.Message)"
|
||||
}
|
||||
@@ -29,10 +29,14 @@ $eventNames = @{
|
||||
1202 = 'ProfileEnrichmentTimeout'
|
||||
1203 = 'ProfileEnrichmentFailure'
|
||||
1204 = 'ProfilePageUnavailable'
|
||||
1205 = 'ProfilePhotoUnavailable'
|
||||
1206 = 'ProfilePhotoInvalid'
|
||||
1300 = 'DirectorySynchronizationFailure'
|
||||
1301 = 'DirectoryOptionalMetadataFailure'
|
||||
1302 = 'DirectoryGroupMembershipFailure'
|
||||
1303 = 'DirectoryRoleGroupMembershipAdded'
|
||||
1304 = 'DirectoryPasswordChangeDenied'
|
||||
1305 = 'DirectoryPhotoFailure'
|
||||
}
|
||||
|
||||
# Keep these reads unfiltered. Besides making archived and current logs behave
|
||||
|
||||
@@ -519,6 +519,8 @@ foreach ($requiredPath in @(
|
||||
(Join-Path $scriptsRoot 'New-LabCertificate.ps1'),
|
||||
(Join-Path $scriptsRoot 'Set-LabBrokerDns.ps1'),
|
||||
(Join-Path $scriptsRoot 'Set-SguDomainComputerPolicies.ps1'),
|
||||
(Join-Path $scriptsRoot 'Enable-SguWorkstationRemoteAccess.ps1'),
|
||||
(Join-Path $scriptsRoot 'Install-SguWorkstationRemoteAccessPolicy.ps1'),
|
||||
(Join-Path $scriptsRoot 'Set-SguDomainUserPolicies.ps1'),
|
||||
(Join-Path $scriptsRoot 'Set-SguLaboratorioWallpaperPolicy.ps1'),
|
||||
(Join-Path $scriptsRoot 'Enable-SguServerRemoteManagement.ps1'),
|
||||
@@ -820,6 +822,10 @@ $collectorFqdn = "$env:COMPUTERNAME.$DomainName"
|
||||
-TargetOuDn $laboratoryOuDn `
|
||||
-DomainController $env:COMPUTERNAME `
|
||||
-EventCollectorFqdn $collectorFqdn | Out-Null
|
||||
|
||||
& (Join-Path $scriptsRoot 'Install-SguWorkstationRemoteAccessPolicy.ps1') `
|
||||
-TargetOuDn $laboratoryOuDn `
|
||||
-DomainController $env:COMPUTERNAME | Out-Null
|
||||
& (Join-Path $scriptsRoot 'Install-SguDomainMonitoring.ps1') `
|
||||
-CollectorFqdn $collectorFqdn `
|
||||
-ComputerOuDn $laboratoryOuDn `
|
||||
|
||||
@@ -79,8 +79,7 @@ if (-not `$computerSystem.PartOfDomain -or `$computerSystem.DomainRole -ge 4) {
|
||||
# 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}'
|
||||
Set-ItemProperty -Path `$logonUiPath -Name LastLoggedOnProvider -Value '{D789CFD8-5AD4-489F-9B83-7EB5D9D09335}'
|
||||
|
||||
`$updateRoot = Join-Path `$env:ProgramData "SGU\CredentialProviderUpdates\`$version"
|
||||
`$markerPath = Join-Path `$updateRoot 'complete.marker'
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
[CmdletBinding(SupportsShouldProcess)]
|
||||
param(
|
||||
[string]$TargetOuDn = 'OU=Laboratorio,DC=lci,DC=lasalle,DC=mx',
|
||||
[string]$GpoName = 'SGU - Windows client experience',
|
||||
[string]$DomainController = $env:COMPUTERNAME
|
||||
)
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$identity = [Security.Principal.WindowsIdentity]::GetCurrent()
|
||||
if (-not ([Security.Principal.WindowsPrincipal]::new($identity)).IsInRole(
|
||||
[Security.Principal.WindowsBuiltInRole]::Administrator)) {
|
||||
throw 'Run this script elevated on the domain controller.'
|
||||
}
|
||||
Import-Module ActiveDirectory -ErrorAction Stop
|
||||
Import-Module GroupPolicy -ErrorAction Stop
|
||||
|
||||
$targetOu = Get-ADOrganizationalUnit -Identity $TargetOuDn -Server $DomainController
|
||||
$domain = Get-ADDomain -Server $DomainController
|
||||
if (-not $targetOu.DistinguishedName.EndsWith($domain.DistinguishedName,
|
||||
[StringComparison]::OrdinalIgnoreCase)) {
|
||||
throw 'The target OU is outside the domain.'
|
||||
}
|
||||
$domainName = $domain.DNSRoot
|
||||
$gpo = Get-GPO -Name $GpoName -Domain $domainName -Server $DomainController -ErrorAction Stop
|
||||
$links = @(Get-GPInheritance -Target $TargetOuDn -Domain $domainName -Server $DomainController).GpoLinks
|
||||
if (-not @($links | Where-Object { $_.DisplayName -eq $GpoName -and
|
||||
[string]$_.Enabled -in @('True','Yes') }).Count) {
|
||||
throw "The existing GPO '$GpoName' must be linked and enabled on $TargetOuDn."
|
||||
}
|
||||
|
||||
# The existing machine GPO also manages the credential tile. The startup
|
||||
# script is a native Group Policy extension, not a scheduled client task.
|
||||
$scriptName = 'Enable-SguWorkstationRemoteAccess.ps1'
|
||||
$sourcePath = Join-Path $PSScriptRoot $scriptName
|
||||
$startupRoot = Join-Path $env:WINDIR "SYSVOL\domain\Policies\{$($gpo.Id)}\Machine\Scripts"
|
||||
$startupPath = Join-Path $startupRoot "Startup\$scriptName"
|
||||
$scriptsIniPath = Join-Path $startupRoot 'scripts.ini'
|
||||
$source = [IO.File]::ReadAllText($sourcePath)
|
||||
$unc = "\\$domainName\SYSVOL\$domainName\Policies\{$($gpo.Id)}\Machine\Scripts\Startup\$scriptName"
|
||||
$ini = "[Startup]`r`n0CmdLine=powershell.exe`r`n0Parameters=-NoProfile -NonInteractive -ExecutionPolicy Bypass -File `"$unc`"`r`n"
|
||||
$scriptChanged = -not (Test-Path -LiteralPath $startupPath) -or
|
||||
[IO.File]::ReadAllText($startupPath) -cne $source
|
||||
$iniChanged = -not (Test-Path -LiteralPath $scriptsIniPath) -or
|
||||
[IO.File]::ReadAllText($scriptsIniPath) -cne $ini
|
||||
|
||||
if (($scriptChanged -or $iniChanged) -and
|
||||
$PSCmdlet.ShouldProcess($startupRoot, 'Install computer startup script')) {
|
||||
New-Item -ItemType Directory -Path (Split-Path $startupPath) -Force | Out-Null
|
||||
[IO.File]::WriteAllText($startupPath, $source, [Text.UTF8Encoding]::new($false))
|
||||
[IO.File]::WriteAllText($scriptsIniPath, $ini, [Text.Encoding]::Unicode)
|
||||
$gpoDn = "CN={$($gpo.Id)},CN=Policies,CN=System,$($domain.DistinguishedName)"
|
||||
$adGpo = Get-ADObject -Identity $gpoDn -Server $DomainController `
|
||||
-Properties gPCMachineExtensionNames,versionNumber
|
||||
$extension = '[{42B5FAAE-6536-11D2-AE5A-0000F87571E3}{40B6664F-4972-11D1-A7CA-0000F87571E3}]'
|
||||
$names = [string]$adGpo.gPCMachineExtensionNames
|
||||
if ($names.IndexOf($extension, [StringComparison]::OrdinalIgnoreCase) -lt 0) {
|
||||
Set-ADObject -Identity $gpoDn -Server $DomainController `
|
||||
-Replace @{gPCMachineExtensionNames = "$names$extension"}
|
||||
}
|
||||
$gptPath = Join-Path (Split-Path (Split-Path $startupRoot -Parent) -Parent) 'GPT.ini'
|
||||
$gpt = [IO.File]::ReadAllText($gptPath)
|
||||
$gptVersion = [int]([regex]::Match($gpt, '(?m)^Version=(\d+)\r?$').Groups[1].Value)
|
||||
$baseVersion = [Math]::Max($gptVersion, [int]$adGpo.versionNumber)
|
||||
$nextVersion = ($baseVersion -band -65536) -bor (($baseVersion + 1) -band 65535)
|
||||
[IO.File]::WriteAllText($gptPath,
|
||||
[regex]::Replace($gpt, '(?m)^Version=\d+\r?$', "Version=$nextVersion"),
|
||||
[Text.Encoding]::ASCII)
|
||||
Set-ADObject -Identity $gpoDn -Server $DomainController -Replace @{versionNumber = $nextVersion}
|
||||
}
|
||||
|
||||
[pscustomobject]@{
|
||||
GpoName = $GpoName
|
||||
GpoId = $gpo.Id
|
||||
TargetOu = $TargetOuDn
|
||||
StartupScript = $startupPath
|
||||
Changed = $scriptChanged -or $iniChanged
|
||||
}
|
||||
@@ -210,9 +210,11 @@ $serverScripts = @(
|
||||
'Disable-SguAzureUserRoaming.ps1',
|
||||
'Enable-SguAzureUserRoaming.ps1',
|
||||
'Enable-SguServerRemoteManagement.ps1',
|
||||
'Enable-SguWorkstationRemoteAccess.ps1',
|
||||
'Get-SguUsageReport.ps1',
|
||||
'Get-SguBrokerLog.ps1',
|
||||
'Install-SguDomainMonitoring.ps1',
|
||||
'Install-SguWorkstationRemoteAccessPolicy.ps1',
|
||||
'Publish-SguFsLogixClientDeployment.ps1',
|
||||
'Install-SguRustDeskClient.ps1',
|
||||
'Install-SguRustDeskLinuxEnrollment.ps1',
|
||||
|
||||
@@ -13,7 +13,8 @@ public sealed record InstitutionalProfile(
|
||||
string? City = null,
|
||||
string? State = null,
|
||||
string? PostalCode = null,
|
||||
InstitutionalGender? Gender = null)
|
||||
InstitutionalGender? Gender = null,
|
||||
byte[]? ThumbnailPhoto = null)
|
||||
{
|
||||
public bool HasValues =>
|
||||
EmployeeNumber is not null ||
|
||||
@@ -28,7 +29,8 @@ public sealed record InstitutionalProfile(
|
||||
City is not null ||
|
||||
State is not null ||
|
||||
PostalCode is not null ||
|
||||
Gender is not null;
|
||||
Gender is not null ||
|
||||
ThumbnailPhoto is not null;
|
||||
|
||||
public InstitutionalProfile Overlay(InstitutionalProfile? values) =>
|
||||
values is null
|
||||
@@ -47,6 +49,7 @@ public sealed record InstitutionalProfile(
|
||||
City = values.City ?? City,
|
||||
State = values.State ?? State,
|
||||
PostalCode = values.PostalCode ?? PostalCode,
|
||||
Gender = values.Gender ?? Gender
|
||||
Gender = values.Gender ?? Gender,
|
||||
ThumbnailPhoto = values.ThumbnailPhoto ?? ThumbnailPhoto
|
||||
};
|
||||
}
|
||||
@@ -17,10 +17,13 @@ internal static class BrokerEventIds
|
||||
internal static readonly EventId ProfileEnrichmentTimeout = new(1202, nameof(ProfileEnrichmentTimeout));
|
||||
internal static readonly EventId ProfileEnrichmentFailure = new(1203, nameof(ProfileEnrichmentFailure));
|
||||
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 DirectoryOptionalMetadataFailure = new(1301, nameof(DirectoryOptionalMetadataFailure));
|
||||
internal static readonly EventId DirectoryGroupMembershipFailure = new(1302, nameof(DirectoryGroupMembershipFailure));
|
||||
internal static readonly EventId DirectoryRoleGroupMembershipAdded = new(1303, nameof(DirectoryRoleGroupMembershipAdded));
|
||||
internal static readonly EventId DirectoryPasswordChangeDenied = new(1304, nameof(DirectoryPasswordChangeDenied));
|
||||
internal static readonly EventId DirectoryPhotoFailure = new(1305, nameof(DirectoryPhotoFailure));
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
<ProjectReference Include="..\SGU.AuthBroker.Core\SGU.AuthBroker.Core.csproj" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.11" />
|
||||
<PackageReference Include="System.DirectoryServices" Version="10.0.11" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="10.0.11" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -142,6 +142,7 @@ public sealed class ActiveDirectorySynchronizer(
|
||||
user.CommitChanges();
|
||||
|
||||
TryApplyProfile(user, identity, profile, options.DefaultCompany, logger);
|
||||
TryApplyPhoto(user, identity.UserName, profile?.ThumbnailPhoto);
|
||||
TryEnsureRemoteDesktopGroupMembership(user, identity.UserName);
|
||||
|
||||
return new DirectorySyncResult(
|
||||
@@ -264,6 +265,42 @@ public sealed class ActiveDirectorySynchronizer(
|
||||
}
|
||||
}
|
||||
|
||||
private void TryApplyPhoto(DirectoryEntry user, string institutionalUser, byte[]? photo)
|
||||
{
|
||||
if (photo is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
if (user.Properties["thumbnailPhoto"].Value is byte[] existing &&
|
||||
existing.AsSpan().SequenceEqual(photo))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
user.Properties["thumbnailPhoto"].Value = photo;
|
||||
user.CommitChanges();
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
logger.LogWarning(
|
||||
BrokerEventIds.DirectoryPhotoFailure,
|
||||
exception,
|
||||
"Optional Active Directory thumbnailPhoto could not be committed for {InstitutionalUser}; account synchronization remains completed.",
|
||||
institutionalUser);
|
||||
try
|
||||
{
|
||||
user.RefreshCache();
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Photo metadata must not change the successful authentication result.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void SetGenderMetadata(
|
||||
DirectoryEntry entry,
|
||||
InstitutionalGender? gender,
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
using System.Diagnostics;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Imaging;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Text.Json;
|
||||
@@ -11,6 +13,9 @@ namespace SGU.AuthBroker.Services;
|
||||
|
||||
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 ILogger<NtlmCredentialValidator> logger;
|
||||
private readonly Func<CredentialCache, CookieContainer, HttpMessageHandler> handlerFactory;
|
||||
@@ -353,6 +358,20 @@ public sealed class NtlmCredentialValidator : INtlmCredentialValidator
|
||||
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)
|
||||
{
|
||||
logger.LogWarning(
|
||||
@@ -680,6 +699,135 @@ public sealed class NtlmCredentialValidator : INtlmCredentialValidator
|
||||
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(
|
||||
HttpClient client,
|
||||
Uri requestedUri,
|
||||
|
||||
@@ -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.Http.Headers;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Imaging;
|
||||
using Microsoft.Extensions.Logging.Abstractions;
|
||||
using SGU.AuthBroker.Core.Authentication;
|
||||
using SGU.AuthBroker.Core.Identity;
|
||||
@@ -163,7 +165,8 @@ public sealed class NtlmCredentialValidatorTests
|
||||
"""),
|
||||
JsonResponse("""
|
||||
{"d":[{"p_IdCP":"090001","p_Nombre":"FLORIDA","p_Cp":"01000"}]}
|
||||
"""));
|
||||
"""),
|
||||
PhotoResponse(TestJpeg()));
|
||||
NtlmCredentialValidator validator = CreateValidator(handler);
|
||||
|
||||
NtlmValidationResult result = await validator.ValidateAsync(
|
||||
@@ -184,6 +187,7 @@ public sealed class NtlmCredentialValidatorTests
|
||||
Assert.Equal("Ciudad de México", result.Profile.State);
|
||||
Assert.Equal("01000", result.Profile.PostalCode);
|
||||
Assert.Equal(InstitutionalGender.Female, result.Profile.Gender);
|
||||
Assert.Equal(TestJpeg(), result.Profile.ThumbnailPhoto);
|
||||
Assert.Equal(
|
||||
[
|
||||
"/psulsa/",
|
||||
@@ -193,7 +197,8 @@ public sealed class NtlmCredentialValidatorTests
|
||||
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx",
|
||||
"/psulsa/gadmon/capitalhumano/datos/ubicacion.aspx/GetDireccion",
|
||||
"/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);
|
||||
Assert.Equal("{\"CodigoPostal\":\"01000\"}", handler.RequestBodies[5]);
|
||||
@@ -201,6 +206,9 @@ public sealed class NtlmCredentialValidatorTests
|
||||
Assert.Equal(
|
||||
"{\"pIdEstado\":\"\",\"pLocalidad\":\"\",\"CodigoPostal\":\"01000\"}",
|
||||
handler.RequestBodies[7]);
|
||||
Assert.Equal(
|
||||
"https://sgu.example/psulsa/gadmon/admonPersonal/ashx/Fotografia.ashx?id=017045&tp=2",
|
||||
handler.RequestUris[8]);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -278,7 +286,8 @@ public sealed class NtlmCredentialValidatorTests
|
||||
"""),
|
||||
JsonResponse("""
|
||||
{"d":[{"p_IdCP":"090001","p_Nombre":"FLORIDA","p_Cp":"01000"}]}
|
||||
"""));
|
||||
"""),
|
||||
Response(HttpStatusCode.NotFound));
|
||||
NtlmCredentialValidator validator = CreateValidator(handler);
|
||||
|
||||
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/GetDireccion",
|
||||
"/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);
|
||||
Assert.Equal(
|
||||
"https://sgu.example/psulsa/gadmon/admonPersonal/ashx/Fotografia.ashx?id=123456&tp=2",
|
||||
handler.RequestUris[9]);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -347,6 +360,109 @@ public sealed class NtlmCredentialValidatorTests
|
||||
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)
|
||||
{
|
||||
BrokerOptions options = new()
|
||||
@@ -406,6 +522,8 @@ public sealed class NtlmCredentialValidatorTests
|
||||
|
||||
public List<string> RequestPaths { get; } = [];
|
||||
|
||||
public List<string> RequestUris { get; } = [];
|
||||
|
||||
public List<string?> RequestBodies { get; } = [];
|
||||
|
||||
protected override Task<HttpResponseMessage> SendAsync(
|
||||
@@ -414,6 +532,7 @@ public sealed class NtlmCredentialValidatorTests
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
RequestPaths.Add(request.RequestUri!.AbsolutePath);
|
||||
RequestUris.Add(request.RequestUri.AbsoluteUri);
|
||||
RequestBodies.Add(request.Content is null
|
||||
? null
|
||||
: request.Content.ReadAsStringAsync(cancellationToken).GetAwaiter().GetResult());
|
||||
|
||||
Reference in new issue
Block a user