csi: fix check of StagePublishBaseDir being subdirectory of MountDir#27717
Open
allisonlarson wants to merge 2 commits intomainfrom
Open
csi: fix check of StagePublishBaseDir being subdirectory of MountDir#27717allisonlarson wants to merge 2 commits intomainfrom
allisonlarson wants to merge 2 commits intomainfrom
Conversation
chrisroberts
previously approved these changes
Mar 19, 2026
Member
@themavik keep this slop debris out of our repo, please. If you want to contribute helpful comments on PR reviews, that's fine. But AI-generated reviews are absolutely unwelcome. |
Contributor
Author
|
@chrisroberts I had forgotten the changelog, so thats been updated along with the appropriate labels |
chrisroberts
approved these changes
Mar 24, 2026
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
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
Small fix, adds an
IsSubdirectoryhelper that checks if a path is a subdirectory of another using thefilepath.Rel, instead of only checking for a prefix match of two strings. Prevents an error being thrown if the StagePublishBaseDir and MountDir are given as separate directories that still start with the same characters (like/csiand/csilocal)Testing & Reproduction steps
Bug was found when using a
csi_pluginblock such as:returned the error
CSIPluginConfig StagePublishBaseDir must not be a subdirectory of MountDir, now it does not error. Tests have been added/updated.Links
Contributor Checklist
changelog entry using the
make clcommand.ensure regressions will be caught.
and job configuration, please update the Nomad product documentation, which is stored in the
web-unified-docsrepo. Refer to theweb-unified-docscontributor guide for docs guidelines.Please also consider whether the change requires notes within the upgrade
guide. If you would like help with the docs, tag the
nomad-docsteam in this PR.Reviewer Checklist
backporting document.
in the majority of situations. The main exceptions are long-lived feature branches or merges where
history should be preserved.
within the public repository.
Changes to Security Controls
Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.