-
Notifications
You must be signed in to change notification settings - Fork 7
[NAE-2389] Actor ref resolution does not includes realmId #421
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
267ff2e
[NAE-2389] Actor ref resolution does not includes realmId
renczesstefan c68380b
Handle null checks for actorFieldValue in actorExists method
renczesstefan f8f3649
Validate actor ID format and handle blank IDs.
renczesstefan f8f510e
Ensure valid actor ID in actorExists method
renczesstefan d923e4f
Merge remote-tracking branch 'origin/release/7.0.0-rev10' into NAE-2389
machacjozef File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Catch invalid user IDs here instead of aborting task resolution.
Line 871 can still throw on blank or malformed ids because
userService.findById(...)builds anObjectIdinternally. That means one bad actor entry can fail the whole resolution path instead of being filtered out. Treat blank ids as missing and swallowIllegalArgumentExceptionfrom the user lookup before falling back to groups.Proposed fix
private boolean actorExists(ActorFieldValue actorFieldValue) { - if (actorFieldValue == null || actorFieldValue.getId() == null) { + if (actorFieldValue == null || actorFieldValue.getId() == null || actorFieldValue.getId().isBlank()) { return false; } - AbstractUser user = userService.findById(actorFieldValue.getId(), actorFieldValue.getRealmId()); - if (user != null) { - return true; + try { + AbstractUser user = userService.findById(actorFieldValue.getId(), actorFieldValue.getRealmId()); + if (user != null) { + return true; + } + } catch (IllegalArgumentException ignored) { + // Not a valid user id, continue with group lookup. } try { groupService.findById(actorFieldValue.getId()); return true; } catch (IllegalArgumentException ignored) { return false; } }🤖 Prompt for AI Agents
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added check to the first IF statement to check whether the ID is valid ObjectID, because If it its not valid, both the userService and groupService will throw IllegalArgumentException, so in both cases we should return false.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
Let me check the current state of the
actorExistsmethod on the PR branch.🏁 Script executed:
Length of output: 893
Let me see the full current method.
🏁 Script executed:
Length of output: 1015
@renczesstefan, that's a clean approach — usingObjectId.isValid(id)as an upfront guard is more concise than wrapping both service calls in separate try-catch blocks. SinceObjectIdis already imported at Line 45, it fits naturally here.The guard would look something like:
One small note:
ObjectId.isValid(null)returnsfalsein the Mongo driver, so the explicitactorFieldValue.getId() == nullcheck is technically redundant when placed before it — but keeping it is fine for readability.The fix hasn't appeared on the branch yet though — could you push the commit? Once it's up I'll mark this resolved.
🧠 Learnings used
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check it once more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Length of output: 738
@renczesstefan, the fix is in place. Line 868 now guards with all four conditions:This correctly short-circuits before either
userService.findById(...)orgroupService.findById(...)are called for null, blank, or malformed IDs — noIllegalArgumentExceptioncan propagate from those lookups due to a bad ID.🧠 Learnings used
If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!