Skip to content

Commit ddb40a1

Browse files
authored
Merge pull request #2532 from rosspa05/RossTestBranch
Corrections to group check in MDOThreatPolicyChecker.ps1
2 parents a180a03 + 5c9c312 commit ddb40a1

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

M365/MDO/MDOThreatPolicyChecker.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,11 @@ begin {
191191
$groupMembers = $null
192192
Write-Verbose "Getting $GroupObjectId"
193193
try {
194-
$groupMembers = Get-MgGroupMember -GroupId $GroupObjectId -ErrorAction Stop
194+
$groupMembers = Get-MgGroupMember -GroupId $GroupObjectId -All -ErrorAction Stop
195195
} catch {
196196
Write-Host "Error getting group members for $GroupObjectId`:`n$_" -ForegroundColor Red
197-
return $null
197+
$memberCache[$cacheKey] = $false
198+
return $false
198199
}
199200

200201
# Check if the email address is in the group
@@ -209,7 +210,8 @@ begin {
209210
$user = Get-MgUser -UserId $member.Id -ErrorAction Stop
210211
} catch {
211212
Write-Host "Error getting user with Id $($member.Id):`n$_" -ForegroundColor Red
212-
return $null
213+
$memberCache[$cacheKey] = $false
214+
return $false
213215
}
214216
# Compare the user's email address with the $email parameter
215217
if ($user.Mail -eq $Email.ToString()) {
@@ -351,7 +353,6 @@ begin {
351353
break
352354
} else {
353355
Write-DetailedExplanationOption -Message "No Group match because $($Email.ToString()) is not a member of Group $($groupObjectId)" -ShowDetailedExplanation:$ShowDetailedExplanation
354-
break
355356
}
356357
}
357358
}
@@ -370,7 +371,6 @@ begin {
370371
break
371372
} else {
372373
Write-DetailedExplanationOption -Message "$($Email.ToString()) is not excluded from rule by membership in Group $($groupObjectId)" -ShowDetailedExplanation:$ShowDetailedExplanation
373-
break
374374
}
375375
}
376376
}

0 commit comments

Comments
 (0)