fix path check

Signed-off-by: nikpivkin <[email protected]>
aquasecurity · Sep 25, 2024 · a002320 · a002320
1 parent 60e553c
commit a002320
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pkg/mapfs/fs.go b/pkg/mapfs/fs.go
@@ -247,5 +247,5 @@ func cleanPath(path string) string {
 }
 
 func (m *FS) isPathAboveRoot(name string) bool {
-	return strings.HasPrefix(name, "..") && m.underlyingRoot != ""
+	return (name == ".." || strings.HasPrefix(name, "../")) && m.underlyingRoot != ""
 }
diff --git a/pkg/mapfs/fs_test.go b/pkg/mapfs/fs_test.go
@@ -482,7 +482,8 @@ func TestFS_RemoveAll(t *testing.T) {
 func TestFS_WithUnderlyingRoot(t *testing.T) {
 	root := "testdata/subdir"
 	fsys := mapfs.New(mapfs.WithUnderlyingRoot(root))
-	fsys.WriteFile("foo.txt", root+"/foo.txt")
+	require.NoError(t, fsys.WriteFile("foo.txt", root+"/foo.txt"))
+	require.NoError(t, fsys.WriteFile("..foo.txt", root+"/..foo.txt"))
 
 	fi, err := fsys.Stat("..")
 	require.NoError(t, err)
@@ -495,4 +496,8 @@ func TestFS_WithUnderlyingRoot(t *testing.T) {
 	fi, err = fsys.Stat("foo.txt")
 	require.NoError(t, err)
 	assert.False(t, fi.IsDir())
+
+	fi, err = fsys.Stat("..foo.txt")
+	require.NoError(t, err)
+	assert.False(t, fi.IsDir())
 }
diff --git a/pkg/mapfs/testdata/subdir/..foo.txt b/pkg/mapfs/testdata/subdir/..foo.txt