Simplify the implementation of WithinDirectory

kptdev · Jul 7, 2020 · d5d6d78 · d5d6d78
1 parent 07e86c4
commit d5d6d78
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/internal/util/pathutil/pathutil.go b/internal/util/pathutil/pathutil.go
@@ -68,15 +68,12 @@ func IsInsideDir(path string, directory string) (isInside bool, err error) {
 		return
 	}
 
-	separator := string(os.PathSeparator)
-	// Trim the ending separator if any
-	directory = strings.TrimRight(directory, separator)
-	directoryWithSeparator := fmt.Sprintf("%s%s", directory, separator)
+	rel, err := filepath.Rel(directory, path)
+	if err != nil {
+		return false, err
+	}
 
-	isInside = path == directory || strings.HasPrefix(
-		path,
-		directoryWithSeparator,
-	)
+	isInside = rel == "." || !strings.HasPrefix(rel, ".")
 
 	return
 }
diff --git a/internal/util/pathutil/pathutil_test.go b/internal/util/pathutil/pathutil_test.go
@@ -93,7 +93,7 @@ func TestIsInsideDirectory(t *testing.T) {
 	result, err = IsInsideDir(file, base)
 	assert.NilError(t, err)
 	assert.Equal(t, result, true)
-	result, err = IsInsideDir(path.Join(base, file), baseWithSeparator)
+	result, err = IsInsideDir(file, baseWithSeparator)
 	assert.NilError(t, err)
 	assert.Equal(t, result, true)
 	result, err = IsInsideDir(path.Join(base, ".."), base)