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

fix big group problem #204

Merged
merged 5 commits into from
May 11, 2021
+8 −4
Merged

fix big group problem #204

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf48b16
fix big group problem
baldator Feb 25, 2021
29c19e2
fix syntax to pass tests
baldator Feb 25, 2021
c9216b7
Update win_domain_group_membership.ps1
baldator Apr 6, 2021
6fa7158
fix as suggested by @jborean93
baldator May 10, 2021
7f3060a
Added changelog fragment
jborean93 May 11, 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
Prev Previous commit
Next Next commit
Update win_domain_group_membership.ps1
@baldator
baldator authored Apr 6, 2021
commit c9216b7ff60a210f286ccfb35bc194d8843adc2d
16 changes: 8 additions & 8 deletions plugins/modules/win_domain_group_membership.ps1
View file
Original file line number Diff line number Diff line change
@@ -50,8 +50,11 @@ if ($diff_mode) {
$result.diff = @{}
}

$members_before = Get-AdGroup -Identity $ADGroup @extra_args -Properties Member | select-Object -Property 'Member' -ExpandProperty 'Member'
$members_before = $members_before | ForEach-Object{Get-AdUser $_ @extra_args -Properties SamAccountName, sid | select-object -Property SamAccountName, sid}
$group = Get-ADGroup $ADGroup @extra_args
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to run this again, you can just use $ADGroup which was retrieved above.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are right. I've fixed it

$filter = " (&(objectClass=groupOfNames)(memberOf=$($group.DistinguishedName)))"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain the objectClass=groupOfNames part? When using this filter I get nothing returned back to me on some of my AD groups.

There's also a leading space here that probably isn't needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...good catch: it doesn't make sense. I propose to remove the class filter as we can have groups of any ldap object class.



$members_before = Get-ADObject -LDAPFilter $filter -Properties sAMAccountName, objectSID @extra_args
$pure_members = [System.Collections.Generic.List`1[String]]@()

foreach ($member in $members) {
@@ -90,9 +93,7 @@ foreach ($member in $members) {

if ($state -eq "pure") {
# Perform removals for existing group members not defined in $members
$current_members = Get-AdGroup -Identity $ADGroup @extra_args -Properties Member | select-Object -Property 'Member' -ExpandProperty 'Member'
$current_members = $current_members | ForEach-Object{Get-AdUser $_ @extra_args -Properties SamAccountName, sid | select-object -Property SamAccountName, sid}

$current_members = Get-ADObject -LDAPFilter $filter -Properties sAMAccountName, objectSID @extra_args

foreach ($current_member in $current_members) {
$user_to_remove = $true
@@ -104,15 +105,14 @@ if ($state -eq "pure") {
}

if ($user_to_remove) {
Remove-ADPrincipalGroupMembership -Identity $current_member -MemberOf $ADGroup -WhatIf:$check_mode -Confirm:$False
Remove-ADPrincipalGroupMembership -Identity $current_member -MemberOf $ADGroup -WhatIf:$check_mode -Confirm:$False @extra_member_args
$result.removed.Add($current_member.SamAccountName)
$result.changed = $true
}
}
}

$final_members = Get-AdGroup -Identity $ADGroup @extra_args -Properties Member | select-Object -Property 'Member' -ExpandProperty 'Member'
$final_members = $final_members | ForEach-Object{Get-AdUser $_ @extra_args -Properties SamAccountName | select-object -Property SamAccountName}
$final_members = Get-ADObject -LDAPFilter $filter -Properties sAMAccountName, objectSID @extra_args

if ($final_members) {
$result.members = [Array]$final_members.SamAccountName