Skip to content

Fix Paths.IsInsideDir method when paths belongs to different drives/filesystem #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 28, 2023
Merged

Fix Paths.IsInsideDir method when paths belongs to different drives/filesystem #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8780dcc
Fixed IsInsideDir for paths on different filesystems
cmaglie Apr 28, 2023
657985f
Removed now useless error from IsInsideDir
cmaglie Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions paths.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,17 @@ func (p *Path) Clean() *Path {

// IsInsideDir returns true if the current path is inside the provided
// dir
func (p *Path) IsInsideDir(dir *Path) (bool, error) {
func (p *Path) IsInsideDir(dir *Path) bool {
rel, err := filepath.Rel(dir.path, p.path)
if err != nil {
return false, err
// If the dir cannot be made relative to this path it means
// that it belong to a different filesystems, so it cannot be
// inside this path.
return false
}
return !strings.Contains(rel, ".."+string(os.PathSeparator)) && rel != ".." && rel != ".", nil
return !strings.Contains(rel, ".."+string(os.PathSeparator)) &&
rel != ".." &&
rel != "."
}

// Parent returns all but the last element of path, typically the path's
Expand Down
25 changes: 14 additions & 11 deletions paths_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,13 @@ func TestResetStatCacheWhenFollowingSymlink(t *testing.T) {
}

func TestIsInsideDir(t *testing.T) {
inside := func(a, b *Path) {
in, err := a.IsInsideDir(b)
require.NoError(t, err)
require.True(t, in, "%s is inside %s", a, b)
notInside := func(a, b *Path) {
require.False(t, a.IsInsideDir(b), "%s is inside %s", a, b)
}

notInside := func(a, b *Path) {
in, err := a.IsInsideDir(b)
require.NoError(t, err)
require.False(t, in, "%s is inside %s", a, b)
inside := func(a, b *Path) {
require.True(t, a.IsInsideDir(b), "%s is inside %s", a, b)
notInside(b, a)
}

f1 := New("/a/b/c")
Expand Down Expand Up @@ -196,6 +193,14 @@ func TestIsInsideDir(t *testing.T) {
f5 := New("/home/megabug/a15/packages")
notInside(f5, f4)
notInside(f4, f5)

if runtime.GOOS == "windows" {
f6 := New("C:\\", "A")
f7 := New("C:\\", "A", "B", "C")
f8 := New("E:\\", "A", "B", "C")
inside(f7, f6)
notInside(f8, f6)
}
}

func TestReadFileAsLines(t *testing.T) {
Expand Down Expand Up @@ -372,9 +377,7 @@ func TestWriteToTempFile(t *testing.T) {
defer tmp.Remove()
require.NoError(t, err)
require.True(t, strings.HasPrefix(tmp.Base(), "prefix"))
inside, err := tmp.IsInsideDir(tmpDir)
require.NoError(t, err)
require.True(t, inside)
require.True(t, tmp.IsInsideDir(tmpDir))
data, err := tmp.ReadFile()
require.NoError(t, err)
require.Equal(t, tmpData, data)
Expand Down