Resolved the issue where a NullPointer occurs when the admin role is a trust role #2857
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…a trust role Signed-off-by: Takuya Matsumoto <[email protected]>
havetisyan
requested changes
Jan 17, 2025
| List<RoleMember> members = adminRole.getRoleMembers(); | ||
| if (members.size() == 1 && members.get(0).getMemberName().equals(memberName)) { | ||
| throw ZMSUtils.forbiddenError("deleteDomainRoleMember: Cannot delete last member of 'admin' role", caller); | ||
| if (StringUtils.isEmpty(adminRole.trust)) { |
There was a problem hiding this comment.
-
Rather than checking the trust attribute, why not just add a members != null condition to the if line. It will all other edge cases when somehow we get a null for the member list.
-
more importantly, we also have the same issue in the deleteMembership API which is probably more commonly used than deleteDomainRoleMember api. So can you please apply the same fix in that function as well.
There was a problem hiding this comment.
I've made the changes. Please check
…Trust Role Signed-off-by: Takuya Matsumoto <[email protected]>
havetisyan
approved these changes
Jan 18, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
It might be a rare case, but when the trust of the admin role is set, the admin role member cannot be retrieved, resulting in a NullPointerException.
I have modified it so that member checks are not performed when it is a role with trust set.
Contribution Checklist:
Attach Screenshots (Optional)