fix: allow access to '..' in mapfs #7575
Merged
+31
−4
Conversation
This file contains 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
Signed-off-by: nikpivkin <nikita.pivkin@smartforce.io>
nikpivkin
changed the title
knqyf263
reviewed
Sep 25, 2024
pkg/mapfs/fs.go
Outdated
| @@ -245,3 +245,7 @@ func cleanPath(path string) string { | |||
| path = strings.TrimLeft(path, "/") // Remove the leading slash | |||
| return path | |||
| } | |||
|
|
|||
| func (m *FS) isPathAboveRoot(name string) bool { | |||
| return strings.HasPrefix(name, "..") && m.underlyingRoot != "" | |||
There was a problem hiding this comment.
Suggested change
| return strings.HasPrefix(name, "..") && m.underlyingRoot != "" | |
| return (name == ".." || strings.HasPrefix(name, "../")) && m.underlyingRoot != "" |
A regular file can have .. prefix.
$ touch ..foo
$ ls -al
total 0
drwxr-xr-x 3 teppei 96 9 25 11:06 ./
drwxrwxrwt 37 root 1184 9 25 11:06 ../
-rw-r--r-- 1 teppei 0 9 25 11:06 ..foo
Signed-off-by: nikpivkin <nikita.pivkin@smartforce.io>
knqyf263
reviewed
Sep 25, 2024
| @@ -478,3 +478,26 @@ func TestFS_RemoveAll(t *testing.T) { | |||
| require.ErrorIs(t, err, fs.ErrNotExist) | |||
| }) | |||
| } | |||
|
|
|||
| func TestFS_WithUnderlyingRoot(t *testing.T) { | |||
| root := "testdata/subdir" | |||
There was a problem hiding this comment.
Is there any reason why testdata is used? Can we use filepath.Join(t.TempDir(), "subdir"?
There was a problem hiding this comment.
The testdata/subdir contains some files to which access is tested.
knqyf263
approved these changes
Sep 25, 2024
| @@ -478,3 +478,26 @@ func TestFS_RemoveAll(t *testing.T) { | |||
| require.ErrorIs(t, err, fs.ErrNotExist) | |||
| }) | |||
| } | |||
|
|
|||
| func TestFS_WithUnderlyingRoot(t *testing.T) { | |||
| root := "testdata/subdir" | |||
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
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
The path “../” becomes “..” after cleaning, causing the MapFS check that the path lies outside FS to fail.
Before
After
Related issues
Checklist