Fixed IsInsideDir check

cmaglie · cmaglie · commit 751652ddd9f0 · 2018-09-11T15:57:17.000+02:00
diff --git a/paths.go b/paths.go
@@ -167,11 +167,11 @@ 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) {
-	rel, err := filepath.Rel(p.path, dir.path)
+	rel, err := filepath.Rel(dir.path, p.path)
 	if err != nil {
 		return false, err
 	}
-	return strings.Contains(rel, ".."+string(os.PathSeparator)) || rel == "..", nil
+	return !strings.Contains(rel, ".."+string(os.PathSeparator)) && rel != ".." && rel != ".", nil
 }
 
 // Parent returns all but the last element of path, typically the path's

Original file line number	Diff line number	Diff line change
`@@ -167,11 +167,11 @@ func (p Path) Clean() Path {`
`167`	`167`	`// IsInsideDir returns true if the current path is inside the provided`
`168`	`168`	`// dir`
`169`	`169`	`func (p Path) IsInsideDir(dir Path) (bool, error) {`
`170`		`- rel, err := filepath.Rel(p.path, dir.path)`
	`170`	`+ rel, err := filepath.Rel(dir.path, p.path)`
`171`	`171`	`if err != nil {`
`172`	`172`	`return false, err`
`173`	`173`	`}`
`174`		`- return strings.Contains(rel, ".."+string(os.PathSeparator)) \|\| rel == "..", nil`
	`174`	`+ return !strings.Contains(rel, ".."+string(os.PathSeparator)) && rel != ".." && rel != ".", nil`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`// Parent returns all but the last element of path, typically the path's`