ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

win_certificate_store - fix glob like paths (#54007)

Browse source
This commit is contained in:
Jordan Borean 2019-03-19 11:49:25 +10:00 committed by GitHub
parent 2f1bc34589
commit eb18df1a0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/win_certificate_store-paths.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- win_certificate_store - Fix issues when using paths with glob like characters, e.g. ``[``, ``]``

18
lib/ansible/modules/windows/win_certificate_store.ps1
View file

@ -31,7 +31,7 @@ $module = [Ansible.Basic.AnsibleModule]::Create($args, $spec)
Function Get-CertFile($module, $path, $password, $key_exportable, $key_storage) { Function Get-CertFile($module, $path, $password, $key_exportable, $key_storage) {
# parses a certificate file and returns X509Certificate2Collection # parses a certificate file and returns X509Certificate2Collection
if (-not (Test-Path -Path $path -PathType Leaf)) { if (-not (Test-Path -LiteralPath $path -PathType Leaf)) {
$module.FailJson("File at '$path' either does not exist or is not a file") $module.FailJson("File at '$path' either does not exist or is not a file")
} }
@ -77,8 +77,8 @@ Function New-CertFile($module, $cert, $path, $type, $password) {
} }
} }
if (Test-Path -Path $path) { if (Test-Path -LiteralPath $path) {
Remove-Item -Path $path -Force Remove-Item -LiteralPath $path -Force
$module.Result.changed = $true $module.Result.changed = $true
} }
try { try {
@ -109,7 +109,7 @@ Function New-CertFile($module, $cert, $path, $type, $password) {
$module.FailJson("Failed to write cert to file, cert was null: $($_.Exception.Message)", $_) $module.FailJson("Failed to write cert to file, cert was null: $($_.Exception.Message)", $_)
} catch [System.IO.IOException] { } catch [System.IO.IOException] {
$module.FailJson("Failed to write cert to file due to IO Exception: $($_.Exception.Message)", $_) $module.FailJson("Failed to write cert to file due to IO Exception: $($_.Exception.Message)", $_)
} catch [System.UnauthorizedAccessException, System.Security.SecurityException] { } catch [System.UnauthorizedAccessException] {
$module.FailJson("Failed to write cert to file due to permissions: $($_.Exception.Message)", $_) $module.FailJson("Failed to write cert to file due to permissions: $($_.Exception.Message)", $_)
} catch { } catch {
$module.FailJson("Failed to write cert to file: $($_.Exception.Message)", $_) $module.FailJson("Failed to write cert to file: $($_.Exception.Message)", $_)
@ -129,7 +129,7 @@ Function Get-CertFileType($path, $password) {
return "unknown" return "unknown"
} }
$file_contents = Get-Content -Path $path -Raw $file_contents = Get-Content -LiteralPath $path -Raw
if ($file_contents.StartsWith("-----BEGIN CERTIFICATE-----")) { if ($file_contents.StartsWith("-----BEGIN CERTIFICATE-----")) {
return "pem" return "pem"
} elseif ($file_contents.StartsWith("-----BEGIN PKCS7-----")) { } elseif ($file_contents.StartsWith("-----BEGIN PKCS7-----")) {
@ -176,12 +176,12 @@ try {
if ($state -eq "absent") { if ($state -eq "absent") {
$cert_thumbprints = @() $cert_thumbprints = @()
if ($path -ne $null) { if ($null -ne $path) {
$certs = Get-CertFile -module $module -path $path -password $password -key_exportable $key_exportable -key_storage $key_storage $certs = Get-CertFile -module $module -path $path -password $password -key_exportable $key_exportable -key_storage $key_storage
foreach ($cert in $certs) { foreach ($cert in $certs) {
$cert_thumbprints += $cert.Thumbprint $cert_thumbprints += $cert.Thumbprint
} }
} elseif ($thumbprint -ne $null) { } elseif ($null -ne $thumbprint) {
$cert_thumbprints += $thumbprint $cert_thumbprints += $thumbprint
} }
@ -207,9 +207,9 @@ try {
# TODO: Add support for PKCS7 and exporting a cert chain # TODO: Add support for PKCS7 and exporting a cert chain
$module.Result.thumbprints += $thumbprint $module.Result.thumbprints += $thumbprint
$export = $true $export = $true
if (Test-Path -Path $path -PathType Container) { if (Test-Path -LiteralPath $path -PathType Container) {
$module.FailJson("Cannot export cert to path '$path' as it is a directory") $module.FailJson("Cannot export cert to path '$path' as it is a directory")
} elseif (Test-Path -Path $path -PathType Leaf) { } elseif (Test-Path -LiteralPath $path -PathType Leaf) {
$actual_cert_type = Get-CertFileType -path $path -password $password $actual_cert_type = Get-CertFileType -path $path -password $password
if ($actual_cert_type -eq $file_type) { if ($actual_cert_type -eq $file_type) {
try { try {

2
test/integration/targets/win_certificate_store/defaults/main.yml
View file

@ -1,4 +1,4 @@
win_cert_dir: '{{win_output_dir}}\win_certificate' win_cert_dir: '{{win_output_dir}}\win_certificate .ÅÑŚÌβŁÈ [$!@^&test(;)]'
key_password: password key_password: password
subj_thumbprint: 'BD7AF104CF1872BDB518D95C9534EA941665FD27' subj_thumbprint: 'BD7AF104CF1872BDB518D95C9534EA941665FD27'
root_thumbprint: 'BC05633694E675449136679A658281F17A191087' root_thumbprint: 'BC05633694E675449136679A658281F17A191087'