fix(helm): resolve symlinks when loading chart

Possible fix for #1639
helm · Feb 23, 2017 · edd4e56 · edd4e56
1 parent c03714e
commit edd4e56
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -64,6 +64,7 @@ import:
 - package: github.com/gobwas/glob
   version: ^0.2.1
 - package: github.com/evanphx/json-patch
+- package: github.com/facebookgo/symwalk
 testImports:
 - package: github.com/stretchr/testify
   version: ^1.1.4

diff --git a/pkg/chartutil/load.go b/pkg/chartutil/load.go
@@ -22,6 +22,7 @@ import (
 	"compress/gzip"
 	"errors"
 	"fmt"
+	"github.com/facebookgo/symwalk"
 	"io"
 	"io/ioutil"
 	"os"
@@ -239,7 +240,7 @@ func LoadDir(dir string) (*chart.Chart, error) {
 	files := []*afile{}
 	topdir += string(filepath.Separator)
 
-	err = filepath.Walk(topdir, func(name string, fi os.FileInfo, err error) error {
+	err = symwalk.Walk(topdir, func(name string, fi os.FileInfo, err error) error {
 		n := strings.TrimPrefix(name, topdir)
 
 		// Normalize to / since it will also work on Windows