Add validation to allowed directories on config load #1144
+342
−153
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
aphralG
reviewed
Jul 1, 2025
dhurley
reviewed
Jul 4, 2025
internal/config/types.go
Outdated
| // It returns true if the path is allowed, false otherwise. | ||
| // If the path is allowed but does not exist, it also logs a warning. | ||
| // It also checks if the path is a file, in which case it checks the directory of the file. | ||
| func isAllowedDir(path string, allowedDirs []string) bool { |
There was a problem hiding this comment.
Can you pass the context into this function as well so that we can use it in the log statements?
| directoryPath := path | ||
| isFilePath, err := regexp.MatchString(`\.(\w+)$`, directoryPath) | ||
| if err != nil { | ||
| slog.Error("Error matching path", "path", directoryPath, "error", err) |
dhurley
reviewed
Jul 11, 2025
| // It also checks if the path is a file, in which case it checks the directory of the file. | ||
| func isAllowedDir(path string, allowedDirs []string) (bool, error) { | ||
| if len(allowedDirs) == 0 { | ||
| slog.Warn("No allowed directories configured") |
There was a problem hiding this comment.
If you are returning an error then there is no need for this log message as the calling function will probably log the error anyways
| directoryPath := path | ||
| isFilePath, err := regexp.MatchString(`\.(\w+)$`, directoryPath) | ||
| if err != nil { | ||
| slog.Error("Error matching path", "path", directoryPath, "error", err) |
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.
Proposed changes
Adds some validation of paths when loading the allowed directories.
Allowed paths must:
.,..,etc)Any files not satisfying this criteria will be ignored, and logged at WARN level.
When checking if a path is allowed using
isAllowedDir, we will now check if the path exists and if it does we will perform a symlink check. Any symlinks will be logged and the function will return false.Checklist
Before creating a PR, run through this checklist and mark each as complete.
CONTRIBUTINGdocumentmake install-toolsand have attached any dependency changes to this pull requestREADME.md)