move filepath.Clean to caller

hashicorp · Oct 22, 2020 · 54109b4 · 54109b4
1 parent 2505858
commit 54109b4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/client/allocrunner/taskrunner/template/template.go b/client/allocrunner/taskrunner/template/template.go
@@ -555,6 +555,8 @@ func parseTemplateConfigs(config *TaskTemplateManagerConfig) (map[*ctconf.Templa
 			src = taskEnv.ReplaceEnv(tmpl.SourcePath)
 			if !filepath.IsAbs(src) {
 				src = filepath.Join(config.TaskDir, src)
+			} else {
+				src = filepath.Clean(src)
 			}
 			escapes := helper.PathEscapesSandbox(config.TaskDir, src)
 			if escapes && sandboxEnabled {

diff --git a/helper/funcs.go b/helper/funcs.go
@@ -514,10 +514,10 @@ func CheckNamespaceScope(provided string, requested []string) []string {
 	return nil
 }
 
-// PathEscapesSandbox returns whether a cleaned path inside the sandbox
-// directory (typically this will be the allocation directory) escapes.
+// PathEscapesSandbox returns whether previously cleaned path inside the
+// sandbox directory (typically this will be the allocation directory)
+// escapes.
 func PathEscapesSandbox(sandboxDir, path string) bool {
-	path = filepath.Clean(path)
 	rel, err := filepath.Rel(sandboxDir, path)
 	if err != nil {
 		return true