For code scan only, don't merge: Do not relativize ExpData URIs when making the LSID unless under file root #7264
Conversation
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
under file root
Contributor
There was a problem hiding this comment.
Pull request overview
This PR modifies the createData method to only relativize ExpData URIs when creating LSIDs if the path is a descendant of the file root. This prevents incorrect relativization of paths that exist outside the root directory hierarchy. The PR is marked as "For code scan only, don't merge."
- Adds URIUtil import for descendant checking
- Implements conditional path relativization based on directory hierarchy
- Normalizes paths before descendant validation
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
|
||
| // Only convert to a relative path if this is a descendant of the root: | ||
| path = path.normalize(); | ||
| if (URIUtil.isDescendant(source.getRootPath().toUri(), path.toUri())) |
There was a problem hiding this comment.
Potential NullPointerException if source.getRootPath() returns null. Based on usage patterns in other parts of the codebase (e.g., XarReader.java line 924), getRootPath() can return null. Add a null check before calling toUri() on the result.
Suggested change
| if (URIUtil.isDescendant(source.getRootPath().toUri(), path.toUri())) | |
| if (source.getRootPath() != null && URIUtil.isDescendant(source.getRootPath().toUri(), path.toUri())) |
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.
Rationale
For code scan only, don't merge.
Related Pull Requests
Changes