add input validation and path traversal protections #26241
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
mismithhisler
commented
Jul 9, 2025
| @@ -59,22 +62,38 @@ func (n *NomadProvider) BuildTemplate() *structs.Template { | |||
|
|
|||
| return &structs.Template{ | |||
| EmbeddedTmpl: data, | |||
| DestPath: n.tmplPath, | |||
| DestPath: filepath.Join(n.secretDir, n.tmplFile), | |||
There was a problem hiding this comment.
I'm not excited about doing multiple filepath.Join()'s but it's nice having the directory and filename separate for os.OpenInRoot. We could store this on the struct but that also feels like unnecessary duplication.
There was a problem hiding this comment.
We could clean up some path traversals here:
Suggested change
| DestPath: filepath.Join(n.secretDir, n.tmplFile), | |
| DestPath: filepath.Clean(filepath.Join(n.secretDir, n.tmplFile)), |
tgross
reviewed
Jul 9, 2025
jrasell
approved these changes
Jul 10, 2025
| @@ -59,22 +62,38 @@ func (n *NomadProvider) BuildTemplate() *structs.Template { | |||
|
|
|||
| return &structs.Template{ | |||
| EmbeddedTmpl: data, | |||
| DestPath: n.tmplPath, | |||
| DestPath: filepath.Join(n.secretDir, n.tmplFile), | |||
There was a problem hiding this comment.
We could clean up some path traversals here:
Suggested change
| DestPath: filepath.Join(n.secretDir, n.tmplFile), | |
| DestPath: filepath.Clean(filepath.Join(n.secretDir, n.tmplFile)), |
| @@ -69,22 +73,26 @@ func (v *VaultProvider) BuildTemplate() *structs.Template { | |||
|
|
|||
| return &structs.Template{ | |||
| EmbeddedTmpl: data, | |||
| DestPath: v.tmplPath, | |||
| DestPath: filepath.Join(v.secretDir, v.tmplFile), | |||
There was a problem hiding this comment.
Suggested change
| DestPath: filepath.Join(v.secretDir, v.tmplFile), | |
| DestPath: filepath.Clean(filepath.Join(v.secretDir, v.tmplFile)), |
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
Adds
OpenRootfor accessing rendered template, and user input validation so users cannot inject template functions into secret block parameters.Testing & Reproduction steps
Links
Contributor Checklist
changelog entry using the
make clcommand.ensure regressions will be caught.
and job configuration, please update the Nomad website documentation to reflect this. Refer to
the website README for docs guidelines. Please also consider whether the
change requires notes within the upgrade guide.
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.