fix(filesystem): validate the request path as it will be used - #4945
Open
jayhemnani9910 wants to merge 1 commit into
Open
jayhemnani9910 wants to merge 1 commit into
jayhemnani9910 wants to merge 1 commit into
Conversation
validatePath compared the request against the allowed directories after normalizePath, which trims surrounding whitespace and quotes, but then returned the untrimmed path for the file operation. Keep normalizePath's trimming for configured directories and check request paths with a format-only normalization, so the path that is checked is the path that is used.
|
5 tasks done
This branch has not been deployed
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
validatePathchecks a request against the allowed directories after running it throughnormalizePath, which trims surrounding whitespace and strips a leading/trailing quote. It then returns the untrimmed path, and that's what the tool operates on. So the path that is checked and the path that is used can differ: with/x/allowedconfigured, a request for/x/allowed'(or with a trailing", space or tab) is checked as/x/allowedbut read, listed or written as the sibling/x/allowed'.The trimming in
normalizePathmakes sense for directory arguments from the command line, where quotes can come from shell quoting. This keeps it there, and addsnormalizePathFormat(the same normalization without the trimming) for paths that are validated and then used as-is inlib.ts.Server Details
lib.ts,path-utils.ts)Motivation and Context
A request path should be validated in exactly the form it will be used. A file inside an allowed directory whose name ends with a quote (e.g.
it's') still works.How Has This Been Tested?
__tests__/sibling-paths.test.ts: siblings namedallowed',allowed",allowedandallowed<TAB>are rejected, a new file next to the allowed directory is rejected, and a quote-ending file inside it is allowed. The rejection cases fail on main and pass here.tscis clean.read_text_file,list_directoryandwrite_fileon those sibling paths now return "Access denied".Breaking Changes
None. Configured directories are still trimmed as before.
Types of changes
Checklist