From 3371a779b6f9c093073fd0813047e57906157192 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Tue, 11 Sep 2018 13:07:43 +1000 Subject: [PATCH] win_group_membership - fix random issue with CI on 2012 R2 (#45462) --- .../win_group_membership-com-marshal.yaml | 2 ++ .../modules/windows/win_group_membership.ps1 | 24 ++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 changelogs/fragments/win_group_membership-com-marshal.yaml diff --git a/changelogs/fragments/win_group_membership-com-marshal.yaml b/changelogs/fragments/win_group_membership-com-marshal.yaml new file mode 100644 index 0000000000..57a2a9546f --- /dev/null +++ b/changelogs/fragments/win_group_membership-com-marshal.yaml @@ -0,0 +1,2 @@ +bugfixes: +- win_group_membership - fix intermittent issue where it failed to convert the ADSI object to the .NET object after using it once diff --git a/lib/ansible/modules/windows/win_group_membership.ps1 b/lib/ansible/modules/windows/win_group_membership.ps1 index 9093cfe15f..5d6dce2a59 100644 --- a/lib/ansible/modules/windows/win_group_membership.ps1 +++ b/lib/ansible/modules/windows/win_group_membership.ps1 @@ -46,16 +46,24 @@ function Get-GroupMember { [System.DirectoryServices.DirectoryEntry]$Group ) - $members = @() - - $current_members = $Group.psbase.Invoke("Members") | ForEach-Object { - $bytes = ([ADSI]$_).InvokeGet("objectSID") - $sid = New-Object -TypeName Security.Principal.SecurityIdentifier -ArgumentList $bytes, 0 - $adspath = ([ADSI]$_).InvokeGet("ADsPath") - - @{sid = $sid; adspath = $adspath} | Write-Output + # instead of using ForEach pipeline we use a standard loop and cast the + # object to the ADSI adapter type before using it to get the SID and path + # this solves an random issue where multiple casts could fail once the raw + # object is invoked at least once + $raw_members = $Group.psbase.Invoke("Members") + $current_members = [System.Collections.ArrayList]@() + foreach ($raw_member in $raw_members) { + $raw_member = [ADSI]$raw_member + $sid_bytes = $raw_member.InvokeGet("objectSID") + $ads_path = $raw_member.InvokeGet("ADsPath") + $member_info = @{ + sid = New-Object -TypeName System.Security.Principal.SecurityIdentifier -ArgumentList $sid_bytes, 0 + adspath = $ads_path + } + $current_members.Add($member_info) > $null } + $members = @() foreach ($current_member in $current_members) { $parsed_member = @{ sid = $current_member.sid