Skip to content

Fix RDGW certificate deployment with proper key permissions #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpas45 merged 1 commit into from
Jul 9, 2026
Merged

Fix RDGW certificate deployment with proper key permissions #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 48 additions & 1 deletion windows/Update-RDGWCertificate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,37 @@ function Write-ToEventLog {
Write-Host "[$Type] $Message"
}

function Grant-RDGWKeyAccess {
# Import-PfxCertificate (его вызывает Set-RDGWCertificate) не выдаёт
# NETWORK SERVICE доступ к закрытому ключу — из-за этого служба TSGateway
# не может прочитать ключ нового сертификата и молча (или с "Отказано
# в доступе" при ручной привязке) не применяет его.
param(
[Parameter(Mandatory)][System.Security.Cryptography.X509Certificates.X509Certificate2]$Certificate,
[string]$Account = 'NT AUTHORITY\NETWORK SERVICE'
)

$rsaKey = [System.Security.Cryptography.X509Certificates.RSACertificateExtensions]::GetRSAPrivateKey($Certificate)
if (-not $rsaKey) {
throw "У сертификата $($Certificate.Thumbprint) не найден закрытый ключ в LocalMachine\My."
}

if ($rsaKey -is [System.Security.Cryptography.RSACng]) {
$keyPath = Join-Path $env:ProgramData "Microsoft\Crypto\Keys\$($rsaKey.Key.UniqueName)"
}
else {
$keyPath = Join-Path $env:ProgramData "Microsoft\Crypto\RSA\MachineKeys\$($rsaKey.CspKeyContainerInfo.UniqueKeyContainerName)"
}
if (-not (Test-Path $keyPath)) {
throw "Файл закрытого ключа не найден: $keyPath"
}

$acl = Get-Acl -Path $keyPath
$rule = New-Object System.Security.AccessControl.FileSystemAccessRule($Account, 'Read', 'Allow')
$acl.AddAccessRule($rule)
Set-Acl -Path $keyPath -AclObject $acl
}

try {
# --- Рабочий каталог ---
if (-not (Test-Path $poshAcmeHome)) {
Expand Down Expand Up @@ -101,9 +132,25 @@ try {
Write-ToEventLog "Сертификат успешно продлён."
}

# --- Импорт сертификата и права на закрытый ключ ---
$x509 = Get-Item "Cert:\LocalMachine\My\$($cert.Thumbprint)" -ErrorAction SilentlyContinue
if (-not $x509) {
Write-ToEventLog "Импортируем сертификат в LocalMachine\My"
$x509 = Import-PfxCertificate -FilePath $cert.PfxFile -CertStoreLocation Cert:\LocalMachine\My -Password $cert.PfxPass
}
Grant-RDGWKeyAccess -Certificate $x509

# --- Установка на RD Gateway ---
# Set-RDGWCertificate идемпотентен: если отпечаток не изменился — ничего не делает.
$cert | Set-RDGWCertificate -RemoveOldCert
# -ErrorAction Stop обязателен: функция сама перехватывает свои ошибки через
# trap {...; return} и превращает их в non-terminating Write-Error, которая
# без явного -ErrorAction Stop проходит мимо try/catch этого скрипта.
$cert | Set-RDGWCertificate -RemoveOldCert -ErrorAction Stop

$appliedThumb = (Get-Item RDS:\GatewayServer\SSLCertificate\Thumbprint).CurrentValue
if ($appliedThumb -ne $cert.Thumbprint) {
throw "Set-RDGWCertificate завершился без ошибки, но на шлюзе установлен отпечаток $appliedThumb вместо ожидаемого $($cert.Thumbprint)."
}
Write-ToEventLog "Сертификат установлен на RD Gateway. Отпечаток: $($cert.Thumbprint). Действителен до: $($cert.NotAfter)."
}
catch {
Expand Down
Loading