Skip to content
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

xWebSite: skip certificate thumbprint and store name check when SslFlags are valid #600

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

xWebSite: skip certificate thumbprint and store name check when SslFlags are valid #600

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ced67c6
skip checking for certificate thumbprint and store name when SslFlags…
changbowen Nov 15, 2021
6d85fa8
add indent
changbowen Nov 15, 2021
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
103 changes: 53 additions & 50 deletions source/DSCResources/MSFT_xWebSite/MSFT_xWebSite.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,72 +1435,75 @@ function ConvertTo-WebBinding
# SSL-related properties
if ($binding.Protocol -eq 'https')
{
if ([String]::IsNullOrEmpty($binding.CertificateThumbprint))
if ([Environment]::OSVersion.Version -lt '6.2' -or $binding.SslFlags -notin @('2', '3'))
{
if ($Binding.CertificateSubject)
if ([String]::IsNullOrEmpty($binding.CertificateThumbprint))
{
if ($binding.CertificateSubject.substring(0,3) -ne 'CN=')
if ($Binding.CertificateSubject)
{
$binding.CertificateSubject = "CN=$($Binding.CertificateSubject)"
if ($binding.CertificateSubject.substring(0,3) -ne 'CN=')
{
$binding.CertificateSubject = "CN=$($Binding.CertificateSubject)"
}
$FindCertificateSplat = @{
Subject = $Binding.CertificateSubject
}
}
$FindCertificateSplat = @{
Subject = $Binding.CertificateSubject
else
{
$errorMessage = $script:localizedData.ErrorWebBindingMissingCertificateThumbprint `
-f $binding.Protocol
New-TerminatingError -ErrorId 'WebBindingMissingCertificateThumbprint' `
-ErrorMessage $errorMessage `
-ErrorCategory 'InvalidArgument'
}
}

if ([String]::IsNullOrEmpty($binding.CertificateStoreName))
{
$certificateStoreName = 'MY'
Write-Verbose -Message `
($script:localizedData.VerboseConvertToWebBindingDefaultCertificateStoreName `
-f $certificateStoreName)
}
else
{
$errorMessage = $script:localizedData.ErrorWebBindingMissingCertificateThumbprint `
-f $binding.Protocol
New-TerminatingError -ErrorId 'WebBindingMissingCertificateThumbprint' `
-ErrorMessage $errorMessage `
-ErrorCategory 'InvalidArgument'
$certificateStoreName = $binding.CertificateStoreName
}
}

if ([String]::IsNullOrEmpty($binding.CertificateStoreName))
{
$certificateStoreName = 'MY'
Write-Verbose -Message `
($script:localizedData.VerboseConvertToWebBindingDefaultCertificateStoreName `
-f $certificateStoreName)
}
else
{
$certificateStoreName = $binding.CertificateStoreName
}

$certificateHash = $null
if ($FindCertificateSplat)
{
$FindCertificateSplat.Add('Store',$CertificateStoreName)
$Certificate = Find-Certificate @FindCertificateSplat | Select-Object -First 1
if ($Certificate)

$certificateHash = $null
if ($FindCertificateSplat)
{
$certificateHash = $Certificate.Thumbprint
$FindCertificateSplat.Add('Store',$CertificateStoreName)
$Certificate = Find-Certificate @FindCertificateSplat | Select-Object -First 1
if ($Certificate)
{
$certificateHash = $Certificate.Thumbprint
}
else
{
$errorMessage = $script:localizedData.ErrorWebBindingInvalidCertificateSubject `
-f $binding.CertificateSubject, $binding.CertificateStoreName
New-TerminatingError -ErrorId 'WebBindingInvalidCertificateSubject' `
-ErrorMessage $errorMessage `
-ErrorCategory 'InvalidArgument'
}
}

# Remove the Left-to-Right Mark character
if ($certificateHash)
{
$certificateHash = $certificateHash -replace '^\u200E'
}
else
{
$errorMessage = $script:localizedData.ErrorWebBindingInvalidCertificateSubject `
-f $binding.CertificateSubject, $binding.CertificateStoreName
New-TerminatingError -ErrorId 'WebBindingInvalidCertificateSubject' `
-ErrorMessage $errorMessage `
-ErrorCategory 'InvalidArgument'
$certificateHash = $binding.CertificateThumbprint -replace '^\u200E'
}

$outputObject.Add('certificateHash', [String]$certificateHash)
$outputObject.Add('certificateStoreName', [String]$certificateStoreName)
}

# Remove the Left-to-Right Mark character
if ($certificateHash)
{
$certificateHash = $certificateHash -replace '^\u200E'
}
else
{
$certificateHash = $binding.CertificateThumbprint -replace '^\u200E'
}

$outputObject.Add('certificateHash', [String]$certificateHash)
$outputObject.Add('certificateStoreName', [String]$certificateStoreName)

if ([Environment]::OSVersion.Version -ge '6.2')
{
$sslFlags = [Int64]$binding.SslFlags
Expand Down