Add role-specific welcome wallpapers
This commit is contained in:
1 parent
c7c0f941d4
commit
fd051dee80
17 files changed
+345
-35
No files matched your search
@@ -370,11 +370,14 @@ install_welcome_wallpaper() {
|
||||
local source_directory="${SCRIPT_DIRECTORY}/welcome-wallpaper"
|
||||
local source_script="${source_directory}/Set-SguWelcomeWallpaper.sh"
|
||||
local source_image="${source_directory}/darkblue.jpg"
|
||||
local source_administrative_image="${source_directory}/darkgray-administrative.png"
|
||||
local source_professor_image="${source_directory}/darkred-professor.png"
|
||||
local install_directory='/usr/local/lib/sgu-welcome-wallpaper'
|
||||
local configuration_directory='/etc/sgu'
|
||||
local autostart_directory='/etc/xdg/autostart'
|
||||
|
||||
if [[ ! -r $source_script || ! -r $source_image ]]; then
|
||||
if [[ ! -r $source_script || ! -r $source_image ||
|
||||
! -r $source_administrative_image || ! -r $source_professor_image ]]; then
|
||||
printf 'WARNING: Welcome wallpaper assets are absent; domain enrollment will continue without desktop branding.\n' >&2
|
||||
return 0
|
||||
fi
|
||||
@@ -396,6 +399,8 @@ install_welcome_wallpaper() {
|
||||
install -d -o root -g root -m 755 "$install_directory" "$configuration_directory" "$autostart_directory"
|
||||
install -o root -g root -m 755 "$source_script" "${install_directory}/Set-SguWelcomeWallpaper.sh"
|
||||
install -o root -g root -m 644 "$source_image" "${install_directory}/darkblue.jpg"
|
||||
install -o root -g root -m 644 "$source_administrative_image" "${install_directory}/darkgray-administrative.png"
|
||||
install -o root -g root -m 644 "$source_professor_image" "${install_directory}/darkred-professor.png"
|
||||
if compgen -G "${source_directory}/fonts/*.[ot]tf" >/dev/null; then
|
||||
install -d -o root -g root -m 755 "${install_directory}/fonts"
|
||||
install -o root -g root -m 644 "${source_directory}"/fonts/*.[ot]tf "${install_directory}/fonts/"
|
||||
|
||||
@@ -38,6 +38,8 @@ $interactiveLogonPolicyPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\P
|
||||
$accountPictureSourcePath = Join-Path $PublishPath 'branding\user.png'
|
||||
$accountPictureDirectory = Join-Path $env:ProgramData 'Microsoft\User Account Pictures'
|
||||
$welcomeWallpaperSourcePath = Join-Path $PublishPath 'branding\darkblue.jpg'
|
||||
$welcomeAdministrativeWallpaperSourcePath = Join-Path $PublishPath 'branding\darkgray-administrative.png'
|
||||
$welcomeProfessorWallpaperSourcePath = Join-Path $PublishPath 'branding\darkred-professor.png'
|
||||
$welcomeLockScreenSourcePath = Join-Path $PublishPath 'branding\darkblue-lockscreen.jpg'
|
||||
$welcomeWallpaperScriptSourcePath = Join-Path $PublishPath 'branding\Set-SguWelcomeWallpaper.ps1'
|
||||
$welcomeFontsSourcePath = Join-Path $PublishPath 'branding\fonts'
|
||||
@@ -129,6 +131,8 @@ function Install-DefaultAccountPicture {
|
||||
|
||||
function Install-WelcomeWallpaperAssets {
|
||||
if (-not (Test-Path -LiteralPath $welcomeWallpaperSourcePath -PathType Leaf) -or
|
||||
-not (Test-Path -LiteralPath $welcomeAdministrativeWallpaperSourcePath -PathType Leaf) -or
|
||||
-not (Test-Path -LiteralPath $welcomeProfessorWallpaperSourcePath -PathType Leaf) -or
|
||||
-not (Test-Path -LiteralPath $welcomeLockScreenSourcePath -PathType Leaf) -or
|
||||
-not (Test-Path -LiteralPath $welcomeWallpaperScriptSourcePath -PathType Leaf)) {
|
||||
return $false
|
||||
@@ -137,6 +141,10 @@ function Install-WelcomeWallpaperAssets {
|
||||
New-Item -ItemType Directory -Path $welcomeWallpaperDirectory -Force | Out-Null
|
||||
Copy-Item -LiteralPath $welcomeWallpaperSourcePath `
|
||||
-Destination (Join-Path $welcomeWallpaperDirectory 'darkblue.jpg') -Force
|
||||
Copy-Item -LiteralPath $welcomeAdministrativeWallpaperSourcePath `
|
||||
-Destination (Join-Path $welcomeWallpaperDirectory 'darkgray-administrative.png') -Force
|
||||
Copy-Item -LiteralPath $welcomeProfessorWallpaperSourcePath `
|
||||
-Destination (Join-Path $welcomeWallpaperDirectory 'darkred-professor.png') -Force
|
||||
Copy-Item -LiteralPath $welcomeLockScreenSourcePath `
|
||||
-Destination (Join-Path $welcomeWallpaperDirectory 'darkblue-lockscreen.jpg') -Force
|
||||
Copy-Item -LiteralPath $welcomeWallpaperScriptSourcePath `
|
||||
@@ -362,6 +370,8 @@ catch {
|
||||
SystemPasswordProviderPreserved = $true
|
||||
WelcomeWallpaperAssetsInstalled =
|
||||
(Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'darkblue.jpg') -PathType Leaf) -and
|
||||
(Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'darkgray-administrative.png') -PathType Leaf) -and
|
||||
(Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'darkred-professor.png') -PathType Leaf) -and
|
||||
(Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'darkblue-lockscreen.jpg') -PathType Leaf) -and
|
||||
(Test-Path -LiteralPath (Join-Path $welcomeWallpaperDirectory 'Set-SguWelcomeWallpaper.ps1') -PathType Leaf)
|
||||
}
|
||||
@@ -143,6 +143,10 @@ Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\lasalle-ma
|
||||
-Destination (Join-Path $clientRoot 'payload\credential-provider\branding\user.png')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') `
|
||||
-Destination (Join-Path $clientRoot 'payload\credential-provider\branding\darkblue.jpg')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkgray-administrative.png') `
|
||||
-Destination (Join-Path $clientRoot 'payload\credential-provider\branding\darkgray-administrative.png')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkred-professor.png') `
|
||||
-Destination (Join-Path $clientRoot 'payload\credential-provider\branding\darkred-professor.png')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue-lockscreen.jpg') `
|
||||
-Destination (Join-Path $clientRoot 'payload\credential-provider\branding\darkblue-lockscreen.jpg')
|
||||
Copy-RequiredFile -Source (Join-Path $PSScriptRoot 'Set-SguWelcomeWallpaper.ps1') `
|
||||
@@ -182,6 +186,10 @@ Copy-RequiredFile -Source (Join-Path $PSScriptRoot 'Set-SguWelcomeWallpaper.sh')
|
||||
-Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\Set-SguWelcomeWallpaper.sh')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') `
|
||||
-Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\darkblue.jpg')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkgray-administrative.png') `
|
||||
-Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\darkgray-administrative.png')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkred-professor.png') `
|
||||
-Destination (Join-Path $linuxClientRoot 'welcome-wallpaper\darkred-professor.png')
|
||||
foreach ($fontName in $welcomeFontNames) {
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot "assets\branding\fonts\$fontName") `
|
||||
-Destination (Join-Path $linuxClientRoot "welcome-wallpaper\fonts\$fontName")
|
||||
@@ -240,6 +248,10 @@ Copy-RequiredFile -Source (Join-Path $PSScriptRoot 'Set-SguWelcomeWallpaper.ps1'
|
||||
-Destination (Join-Path $serverContentTarget 'welcome-wallpaper\Set-SguWelcomeWallpaper.ps1')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue.jpg') `
|
||||
-Destination (Join-Path $serverContentTarget 'welcome-wallpaper\darkblue.jpg')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkgray-administrative.png') `
|
||||
-Destination (Join-Path $serverContentTarget 'welcome-wallpaper\darkgray-administrative.png')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkred-professor.png') `
|
||||
-Destination (Join-Path $serverContentTarget 'welcome-wallpaper\darkred-professor.png')
|
||||
Copy-RequiredFile -Source (Join-Path $repositoryRoot 'assets\branding\darkblue-lockscreen.jpg') `
|
||||
-Destination (Join-Path $serverContentTarget 'welcome-wallpaper\darkblue-lockscreen.jpg')
|
||||
foreach ($fontName in $welcomeFontNames) {
|
||||
|
||||
@@ -6,6 +6,8 @@ param(
|
||||
[string]$EventCollectorFqdn,
|
||||
[string]$WelcomeWallpaperScriptPath = 'C:\ProgramData\SGU\Branding\Set-SguWelcomeWallpaper.ps1',
|
||||
[string]$WelcomeWallpaperBasePath = 'C:\ProgramData\SGU\Branding\darkblue.jpg',
|
||||
[string]$WelcomeAdministrativeWallpaperBasePath = 'C:\ProgramData\SGU\Branding\darkgray-administrative.png',
|
||||
[string]$WelcomeProfessorWallpaperBasePath = 'C:\ProgramData\SGU\Branding\darkred-professor.png',
|
||||
[string]$WelcomeLockScreenBasePath = 'C:\ProgramData\SGU\Branding\darkblue-lockscreen.jpg'
|
||||
)
|
||||
|
||||
@@ -83,9 +85,11 @@ $personalizationPolicyKey = 'HKLM\Software\Policies\Microsoft\Windows\Personaliz
|
||||
$personalizationCspKey = 'HKLM\Software\Microsoft\Windows\CurrentVersion\PersonalizationCSP'
|
||||
$cloudContentPolicyKey = 'HKLM\Software\Policies\Microsoft\Windows\CloudContent'
|
||||
$edgePolicyKey = 'HKLM\Software\Policies\Microsoft\Edge'
|
||||
$workstationUserPolicyKey = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'
|
||||
$desktopUserPolicyKey = 'HKCU\Software\Policies\Microsoft\Windows\Control Panel\Desktop'
|
||||
$providerClassId = '{D789CFD8-5AD4-489F-9B83-7EB5D9D09335}'
|
||||
$welcomeWallpaperCommand = 'powershell.exe -NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File "{0}" -BaseImagePath "{1}"' -f `
|
||||
$WelcomeWallpaperScriptPath,$WelcomeWallpaperBasePath
|
||||
$welcomeWallpaperCommand = 'powershell.exe -NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File "{0}" -BaseImagePath "{1}" -AdministrativeBaseImagePath "{2}" -ProfessorBaseImagePath "{3}"' -f `
|
||||
$WelcomeWallpaperScriptPath,$WelcomeWallpaperBasePath,$WelcomeAdministrativeWallpaperBasePath,$WelcomeProfessorWallpaperBasePath
|
||||
$policies = @(
|
||||
@{ Key = $dataCollectionKey; Name = 'AllowTelemetry'; Type = 'DWord'; Value = 0 },
|
||||
@{ Key = $dataCollectionKey; Name = 'DisableTelemetryOptInSettingsUx'; Type = 'DWord'; Value = 1 },
|
||||
@@ -131,7 +135,14 @@ $policies = @(
|
||||
# personal browser profiles, or Microsoft cloud synchronization.
|
||||
@{ Key = $edgePolicyKey; Name = 'HideFirstRunExperience'; Type = 'DWord'; Value = 1 },
|
||||
@{ Key = $edgePolicyKey; Name = 'BrowserSignin'; Type = 'DWord'; Value = 0 },
|
||||
@{ Key = $edgePolicyKey; Name = 'SyncDisabled'; Type = 'DWord'; Value = 1 }
|
||||
@{ Key = $edgePolicyKey; Name = 'SyncDisabled'; Type = 'DWord'; Value = 1 },
|
||||
|
||||
# User policy is evaluated through the computer-scoped loopback policy in
|
||||
# Set-SguLaboratorioWallpaperPolicy.ps1. Keep this authoritative copy in
|
||||
# the primary client GPO as well so every managed lab workstation has the
|
||||
# same intent during recovery or when the wallpaper GPO is rebuilt.
|
||||
@{ Key = $workstationUserPolicyKey; Name = 'DisableLockWorkstation'; Type = 'DWord'; Value = 1 },
|
||||
@{ Key = $desktopUserPolicyKey; Name = 'ScreenSaveActive'; Type = 'String'; Value = '0' }
|
||||
)
|
||||
|
||||
$powerSettingIds = @(
|
||||
@@ -184,6 +195,8 @@ $linkEnabled = $link -and (
|
||||
PolicyCount = $configuredPolicies.Count
|
||||
EventCollector = $EventCollectorFqdn
|
||||
WelcomeWallpaperCommand = $welcomeWallpaperCommand
|
||||
WelcomeAdministrativeWallpaper = $WelcomeAdministrativeWallpaperBasePath
|
||||
WelcomeProfessorWallpaper = $WelcomeProfessorWallpaperBasePath
|
||||
LockScreenImage = $WelcomeLockScreenBasePath
|
||||
Policies = [pscustomobject]$configuredPolicies
|
||||
}
|
||||
@@ -25,14 +25,17 @@ if ($gpo) {
|
||||
}
|
||||
else {
|
||||
$gpo = New-GPO -Name $GpoName -Domain $domainName -Server $DomainController `
|
||||
-Comment 'Protects the SGU desktop wallpaper on Laboratorio computers and child OUs; loopback Merge preserves existing user policies.'
|
||||
-Comment 'Protects the SGU desktop wallpaper and prevents workstation locking for every user on Laboratorio computers and child OUs; loopback Merge preserves existing user policies.'
|
||||
}
|
||||
|
||||
# These are user policies scoped by the computer OU, not by the user OU.
|
||||
# These are user policies scoped by the computer OU, not by the user OU. The
|
||||
# enforced loopback GPO therefore applies to local accounts such as .\ing as
|
||||
# well as domain accounts that log on to a managed laboratory machine.
|
||||
# Match the per-user/per-computer output of Set-SguWelcomeWallpaper.ps1.
|
||||
$settings = @(
|
||||
@{ Key = 'HKLM\Software\Policies\Microsoft\Windows\System'; Name = 'UserPolicyMode'; Type = 'DWord'; Value = 1 },
|
||||
@{ Key = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\ActiveDesktop'; Name = 'NoChangingWallPaper'; Type = 'DWord'; Value = 1 },
|
||||
@{ Key = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'; Name = 'DisableLockWorkstation'; Type = 'DWord'; Value = 1 },
|
||||
@{ Key = 'HKCU\Software\Policies\Microsoft\Windows\Control Panel\Desktop'; Name = 'ScreenSaveActive'; Type = 'String'; Value = '0' },
|
||||
@{ Key = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'; Name = 'Wallpaper'; Type = 'ExpandString'; Value = $WallpaperPath },
|
||||
@{ Key = 'HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\System'; Name = 'WallpaperStyle'; Type = 'String'; Value = '10' }
|
||||
)
|
||||
@@ -70,6 +73,7 @@ foreach ($setting in $settings) {
|
||||
TargetOuDn = $TargetOuDn
|
||||
WallpaperPath = $WallpaperPath
|
||||
Loopback = 'Merge'
|
||||
DisableLockWorkstationForAllUsers = $true
|
||||
Enforced = $true
|
||||
BackupPath = $backupPath
|
||||
}
|
||||
@@ -2,6 +2,8 @@
|
||||
[CmdletBinding()]
|
||||
param(
|
||||
[string]$BaseImagePath = (Join-Path $env:ProgramData 'SGU\Branding\darkblue.jpg'),
|
||||
[string]$AdministrativeBaseImagePath = (Join-Path $env:ProgramData 'SGU\Branding\darkgray-administrative.png'),
|
||||
[string]$ProfessorBaseImagePath = (Join-Path $env:ProgramData 'SGU\Branding\darkred-professor.png'),
|
||||
[string]$FontsPath = (Join-Path $env:ProgramData 'SGU\Branding\fonts'),
|
||||
[string]$OutputPath,
|
||||
[string]$DisplayName,
|
||||
@@ -10,6 +12,8 @@ param(
|
||||
[string]$OrganizationalUnit,
|
||||
[ValidateSet('Male', 'Female')]
|
||||
[string]$Gender,
|
||||
[ValidateSet('Administrative', 'Professor')]
|
||||
[string]$InstitutionalRole,
|
||||
[ValidateRange(640, 16384)]
|
||||
[int]$CanvasWidth,
|
||||
[ValidateRange(480, 16384)]
|
||||
@@ -249,6 +253,92 @@ function Get-WelcomeHeading {
|
||||
}
|
||||
}
|
||||
|
||||
function Get-SguSessionInstitutionalRole {
|
||||
# The role comes from the logon token rather than a directory query. That
|
||||
# keeps the correct institutional base available when a domain controller
|
||||
# is temporarily unavailable after an interactive sign-in.
|
||||
try {
|
||||
$identity = [Security.Principal.WindowsIdentity]::GetCurrent()
|
||||
$roles = @()
|
||||
foreach ($groupSid in @($identity.Groups)) {
|
||||
try {
|
||||
$accountName = [string]$groupSid.Translate([Security.Principal.NTAccount]).Value
|
||||
$groupName = ($accountName -split '\\')[-1]
|
||||
if ([string]::Equals($groupName, 'SGU-Administrativos', [StringComparison]::OrdinalIgnoreCase)) {
|
||||
$roles += 'Administrative'
|
||||
}
|
||||
elseif ([string]::Equals($groupName, 'SGU-Docentes', [StringComparison]::OrdinalIgnoreCase)) {
|
||||
$roles += 'Professor'
|
||||
}
|
||||
}
|
||||
catch {
|
||||
# A stale or unresolved SID must not prevent desktop startup.
|
||||
}
|
||||
}
|
||||
$roles = @($roles | Select-Object -Unique)
|
||||
if ($roles.Count -eq 1) {
|
||||
return [string]$roles[0]
|
||||
}
|
||||
if ($roles.Count -gt 1) {
|
||||
Write-WelcomeLog -Message 'WARN Multiple SGU role groups were present; using the neutral desktop base.'
|
||||
}
|
||||
}
|
||||
catch {
|
||||
Write-WelcomeLog -Message ('WARN SGU role lookup was unavailable: ' + $_.Exception.Message)
|
||||
}
|
||||
return $null
|
||||
}
|
||||
|
||||
function Resolve-SguWelcomeBaseImage {
|
||||
param(
|
||||
[Parameter(Mandatory)][string]$DefaultPath,
|
||||
[string]$AdministrativePath,
|
||||
[string]$ProfessorPath,
|
||||
[string]$Role
|
||||
)
|
||||
|
||||
$rolePath = switch ($Role) {
|
||||
'Administrative' { $AdministrativePath; break }
|
||||
'Professor' { $ProfessorPath; break }
|
||||
default { $null }
|
||||
}
|
||||
if ($rolePath -and (Test-Path -LiteralPath $rolePath -PathType Leaf)) {
|
||||
return $rolePath
|
||||
}
|
||||
if ($rolePath) {
|
||||
Write-WelcomeLog -Message ("WARN The {0} wallpaper base is missing; using the neutral base." -f $Role)
|
||||
}
|
||||
return $DefaultPath
|
||||
}
|
||||
|
||||
function Get-SguWelcomePalette {
|
||||
param([string]$Role)
|
||||
|
||||
switch ($Role) {
|
||||
'Professor' {
|
||||
return [pscustomobject]@{
|
||||
Panel = [Drawing.Color]::FromArgb(82, 45, 0, 9)
|
||||
Accent = [Drawing.Color]::FromArgb(255, 255, 226, 232)
|
||||
Line = [Drawing.Color]::FromArgb(160, 255, 226, 232)
|
||||
}
|
||||
}
|
||||
'Administrative' {
|
||||
return [pscustomobject]@{
|
||||
Panel = [Drawing.Color]::FromArgb(82, 8, 8, 8)
|
||||
Accent = [Drawing.Color]::FromArgb(255, 238, 238, 238)
|
||||
Line = [Drawing.Color]::FromArgb(160, 238, 238, 238)
|
||||
}
|
||||
}
|
||||
default {
|
||||
return [pscustomobject]@{
|
||||
Panel = [Drawing.Color]::FromArgb(72, 0, 13, 58)
|
||||
Accent = [Drawing.Color]::FromArgb(255, 211, 226, 255)
|
||||
Line = [Drawing.Color]::FromArgb(155, 211, 226, 255)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function Get-AvailableFontFamily {
|
||||
param(
|
||||
[Parameter(Mandatory)][string[]]$Candidates,
|
||||
@@ -311,10 +401,6 @@ trap {
|
||||
throw
|
||||
}
|
||||
|
||||
if (-not (Test-Path -LiteralPath $BaseImagePath -PathType Leaf)) {
|
||||
throw "The welcome wallpaper base image does not exist: $BaseImagePath"
|
||||
}
|
||||
|
||||
$userName = [Environment]::UserName
|
||||
$metadata = $null
|
||||
$machineLocation = [Environment]::GetEnvironmentVariable('SGU_WELCOME_LOCATION', 'Machine')
|
||||
@@ -340,6 +426,22 @@ if (-not $PSBoundParameters.ContainsKey('DisplayName')) {
|
||||
if (-not $DisplayName) {
|
||||
$DisplayName = $userName
|
||||
}
|
||||
if (-not $PSBoundParameters.ContainsKey('InstitutionalRole')) {
|
||||
$detectedInstitutionalRole = Get-SguSessionInstitutionalRole
|
||||
# Like Gender, InstitutionalRole is ValidateSet-bound. Do not assign a
|
||||
# missing token role because PowerShell validates even an explicit $null.
|
||||
if ($detectedInstitutionalRole -in @('Administrative', 'Professor')) {
|
||||
$InstitutionalRole = $detectedInstitutionalRole
|
||||
}
|
||||
}
|
||||
$selectedBaseImagePath = Resolve-SguWelcomeBaseImage `
|
||||
-DefaultPath $BaseImagePath `
|
||||
-AdministrativePath $AdministrativeBaseImagePath `
|
||||
-ProfessorPath $ProfessorBaseImagePath `
|
||||
-Role $InstitutionalRole
|
||||
if (-not (Test-Path -LiteralPath $selectedBaseImagePath -PathType Leaf)) {
|
||||
throw "The welcome wallpaper base image does not exist: $selectedBaseImagePath"
|
||||
}
|
||||
if (-not $PSBoundParameters.ContainsKey('Location')) {
|
||||
$Location = if ($machineLocation) { $machineLocation } elseif ($metadata) { $metadata.Location } else { $null }
|
||||
}
|
||||
@@ -386,7 +488,7 @@ if (-not $OutputPath) {
|
||||
}
|
||||
New-Item -ItemType Directory -Path (Split-Path $OutputPath -Parent) -Force | Out-Null
|
||||
|
||||
$source = [Drawing.Image]::FromFile($BaseImagePath)
|
||||
$source = [Drawing.Image]::FromFile($selectedBaseImagePath)
|
||||
$canvas = [Drawing.Bitmap]::new($CanvasWidth, $CanvasHeight, [Drawing.Imaging.PixelFormat]::Format24bppRgb)
|
||||
try {
|
||||
$graphics = [Drawing.Graphics]::FromImage($canvas)
|
||||
@@ -424,10 +526,11 @@ try {
|
||||
$panelHeight = [single](310 * $scale)
|
||||
$panelX = [single](($CanvasWidth - $panelWidth) / 2)
|
||||
$panelY = [single]($CanvasHeight * 0.50 - ($panelHeight / 2))
|
||||
$panelBrush = [Drawing.SolidBrush]::new([Drawing.Color]::FromArgb(72, 0, 13, 58))
|
||||
$palette = Get-SguWelcomePalette -Role $InstitutionalRole
|
||||
$panelBrush = [Drawing.SolidBrush]::new($palette.Panel)
|
||||
$whiteBrush = [Drawing.SolidBrush]::new([Drawing.Color]::White)
|
||||
$accentBrush = [Drawing.SolidBrush]::new([Drawing.Color]::FromArgb(255, 211, 226, 255))
|
||||
$linePen = [Drawing.Pen]::new([Drawing.Color]::FromArgb(155, 211, 226, 255), [single](2 * $scale))
|
||||
$accentBrush = [Drawing.SolidBrush]::new($palette.Accent)
|
||||
$linePen = [Drawing.Pen]::new($palette.Line, [single](2 * $scale))
|
||||
$privateFonts = [Drawing.Text.PrivateFontCollection]::new()
|
||||
if (Test-Path -LiteralPath $FontsPath -PathType Container) {
|
||||
foreach ($fontFile in Get-ChildItem -LiteralPath $FontsPath -File |
|
||||
@@ -536,13 +639,16 @@ namespace Sgu {
|
||||
}
|
||||
|
||||
$genderLogValue = if ($Gender) { $Gender } else { 'Neutral' }
|
||||
Write-WelcomeLog -Message ("OK computer={0}; gender={1}; location={2}; ou={3}; output={4}" -f $ComputerName,$genderLogValue,[bool]$Location,[bool]$OrganizationalUnit,$OutputPath)
|
||||
$roleLogValue = if ($InstitutionalRole) { $InstitutionalRole } else { 'Neutral' }
|
||||
Write-WelcomeLog -Message ("OK computer={0}; gender={1}; role={2}; location={3}; ou={4}; output={5}" -f $ComputerName,$genderLogValue,$roleLogValue,[bool]$Location,[bool]$OrganizationalUnit,$OutputPath)
|
||||
[pscustomobject]@{
|
||||
DisplayName = $DisplayName
|
||||
ComputerName = $ComputerName
|
||||
Location = $Location
|
||||
OrganizationalUnit = $OrganizationalUnit
|
||||
Gender = $Gender
|
||||
InstitutionalRole = $InstitutionalRole
|
||||
BaseImagePath = $selectedBaseImagePath
|
||||
WelcomeHeading = $welcomeHeading
|
||||
LocationText = $locationText
|
||||
LocationPrimaryText = $locationPrimaryText
|
||||
|
||||
@@ -8,6 +8,8 @@ set -uo pipefail
|
||||
CONFIG_PATH=${SGU_WELCOME_CONFIG:-/etc/sgu/welcome-wallpaper.conf}
|
||||
INSTALL_ROOT=${SGU_WELCOME_ROOT:-/usr/local/lib/sgu-welcome-wallpaper}
|
||||
BASE_IMAGE=${SGU_WELCOME_BASE_IMAGE:-${INSTALL_ROOT}/darkblue.jpg}
|
||||
ADMINISTRATIVE_BASE_IMAGE=${SGU_WELCOME_ADMINISTRATIVE_BASE_IMAGE:-${INSTALL_ROOT}/darkgray-administrative.png}
|
||||
PROFESSOR_BASE_IMAGE=${SGU_WELCOME_PROFESSOR_BASE_IMAGE:-${INSTALL_ROOT}/darkred-professor.png}
|
||||
|
||||
if [[ -r $CONFIG_PATH ]]; then
|
||||
# The root-owned file contains only deployment metadata, never credentials.
|
||||
@@ -32,8 +34,6 @@ fail_softly() {
|
||||
exit 0
|
||||
}
|
||||
|
||||
[[ -r $BASE_IMAGE ]] || fail_softly "Missing base image: $BASE_IMAGE"
|
||||
|
||||
if command -v magick >/dev/null 2>&1; then
|
||||
image_command=(magick)
|
||||
elif command -v convert >/dev/null 2>&1; then
|
||||
@@ -48,6 +48,40 @@ account_name=${account_name##*\\}
|
||||
display_name=$(getent passwd "$raw_user" 2>/dev/null | awk -F: 'NR == 1 { split($5,a,","); print a[1] }')
|
||||
[[ -n $display_name ]] || display_name=$account_name
|
||||
|
||||
# The SSSD/PAM token carries the institutional role at logon. Select the
|
||||
# branded base without a second directory request; AL and unknown accounts
|
||||
# intentionally retain the standard blue image.
|
||||
institutional_role=''
|
||||
session_groups=$(id -nG "$raw_user" 2>/dev/null || id -nG 2>/dev/null || true)
|
||||
administrative_group=false
|
||||
professor_group=false
|
||||
for group in $session_groups; do
|
||||
group=${group##*\\}
|
||||
group=${group%@*}
|
||||
case "${group,,}" in
|
||||
sgu-administrativos) administrative_group=true ;;
|
||||
sgu-docentes) professor_group=true ;;
|
||||
esac
|
||||
done
|
||||
if [[ $administrative_group == true && $professor_group == false ]]; then
|
||||
institutional_role='Administrative'
|
||||
if [[ -r $ADMINISTRATIVE_BASE_IMAGE ]]; then
|
||||
BASE_IMAGE=$ADMINISTRATIVE_BASE_IMAGE
|
||||
else
|
||||
log_message 'WARN Administrative wallpaper base is missing; using the neutral base.'
|
||||
fi
|
||||
elif [[ $professor_group == true && $administrative_group == false ]]; then
|
||||
institutional_role='Professor'
|
||||
if [[ -r $PROFESSOR_BASE_IMAGE ]]; then
|
||||
BASE_IMAGE=$PROFESSOR_BASE_IMAGE
|
||||
else
|
||||
log_message 'WARN Professor wallpaper base is missing; using the neutral base.'
|
||||
fi
|
||||
elif [[ $administrative_group == true || $professor_group == true ]]; then
|
||||
log_message 'WARN Multiple SGU role groups were present; using the neutral desktop base.'
|
||||
fi
|
||||
[[ -r $BASE_IMAGE ]] || fail_softly "Missing base image: $BASE_IMAGE"
|
||||
|
||||
computer_name=$(hostname -s 2>/dev/null || true)
|
||||
computer_name=${computer_name^^}
|
||||
location=''
|
||||
@@ -264,23 +298,35 @@ if [[ $serif_font == DejaVu-Serif ]] && command -v fc-list >/dev/null 2>&1; then
|
||||
fi
|
||||
fi
|
||||
|
||||
panel_fill='rgba(0,13,58,0.30)'
|
||||
accent_color='#D3E2FF'
|
||||
case "$institutional_role" in
|
||||
Professor)
|
||||
panel_fill='rgba(45,0,9,0.38)'
|
||||
accent_color='#FFE2E8'
|
||||
;;
|
||||
Administrative)
|
||||
panel_fill='rgba(8,8,8,0.38)'
|
||||
accent_color='#EEEEEE'
|
||||
;;
|
||||
esac
|
||||
location_annotations=(
|
||||
-font "$sans_font" -weight 400 -style Normal -pointsize "$location_size"
|
||||
-fill '#D3E2FF' -stroke none -annotate "+0+$(( 76 * scale / 100 ))" "$location_primary"
|
||||
-fill "$accent_color" -stroke none -annotate "+0+$(( 76 * scale / 100 ))" "$location_primary"
|
||||
)
|
||||
if [[ -n $location_secondary ]]; then
|
||||
location_annotations+=(
|
||||
-font "$sans_font" -weight 400 -style Normal -pointsize "$location_secondary_size"
|
||||
-fill '#D3E2FF' -stroke none -annotate "+0+$(( 116 * scale / 100 ))" "$location_secondary"
|
||||
-fill "$accent_color" -stroke none -annotate "+0+$(( 116 * scale / 100 ))" "$location_secondary"
|
||||
)
|
||||
fi
|
||||
|
||||
if ! "${image_command[@]}" "$BASE_IMAGE" \
|
||||
-resize "${width}x${height}^" -gravity center -extent "${width}x${height}" \
|
||||
-fill 'rgba(0,13,58,0.30)' -draw "rectangle ${panel_x1},${panel_y1} ${panel_x2},${panel_y2}" \
|
||||
-fill "$panel_fill" -draw "rectangle ${panel_x1},${panel_y1} ${panel_x2},${panel_y2}" \
|
||||
-gravity center \
|
||||
-font "$sans_font" -weight 700 -style Normal -pointsize "$welcome_size" \
|
||||
-fill '#D3E2FF' -stroke 'rgba(0,0,0,0.48)' -strokewidth 1 \
|
||||
-fill "$accent_color" -stroke 'rgba(0,0,0,0.48)' -strokewidth 1 \
|
||||
-annotate "+0-$(( 92 * scale / 100 ))" "$welcome_text" \
|
||||
-font "$serif_font" -weight 700 -style Italic -pointsize "$name_size" \
|
||||
-fill white -annotate "+0-$(( 22 * scale / 100 ))" "$display_name" \
|
||||
@@ -312,7 +358,7 @@ if [[ $applied == false ]] && command -v xfconf-query >/dev/null 2>&1; then
|
||||
fi
|
||||
|
||||
if [[ $applied == true ]]; then
|
||||
log_message "OK computer=${computer_name}; gender=${gender:-Neutral}; location=$([[ -n $location ]] && printf true || printf false); ou=$([[ -n $organizational_unit ]] && printf true || printf false); output=${output_path}"
|
||||
log_message "OK computer=${computer_name}; gender=${gender:-Neutral}; role=${institutional_role:-Neutral}; location=$([[ -n $location ]] && printf true || printf false); ou=$([[ -n $organizational_unit ]] && printf true || printf false); output=${output_path}"
|
||||
else
|
||||
log_message 'WARN Wallpaper rendered, but no supported desktop background API was found.'
|
||||
fi
|
||||
|
||||
Reference in new issue
Block a user