msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Merge bf2c8c4af0 into 06b95860dc

Browse Source
pull/32264/merge
Kartik Suryavanshi 3 months ago committed by GitHub
parent 06b95860dc bf2c8c4af0
commit 048eeb93a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 195 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
internal/chart/v3/loader/directory.go
Unescape View File

@ -77,6 +77,10 @@ func LoadDir(dir string) (*chart.Chart, error) {
n = filepath.ToSlash(n)
if err != nil {
// For broken symlinks, respect .helmignore before erroring.
if os.IsNotExist(err) && fi != nil && rules.Ignore(n, fi) {
return nil
}
return err
}
if fi.IsDir() {

90
internal/chart/v3/loader/load_test.go
Unescape View File

@ -93,6 +93,96 @@ func TestLoadDirWithSymlink(t *testing.T) {
verifyDependenciesLock(t, c)
}
func TestLoadDirWithBrokenSymlinkNotInHelmignore(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("symlink tests require unix")
}
tmpDir := t.TempDir()
chartYAML := `apiVersion: v2
name: test
version: 0.1.0
`
valuesYAML := `{}
`
if err := os.WriteFile(filepath.Join(tmpDir, "Chart.yaml"), []byte(chartYAML), 0644); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(tmpDir, "values.yaml"), []byte(valuesYAML), 0644); err != nil {
t.Fatal(err)
}
// Create a broken symlink NOT listed in .helmignore
brokenLink := filepath.Join(tmpDir, "broken")
if err := os.Symlink("nonexistent", brokenLink); err != nil {
t.Fatal(err)
}
// Empty .helmignore — broken symlink is not ignored
if err := os.WriteFile(filepath.Join(tmpDir, ".helmignore"), []byte(""), 0644); err != nil {
t.Fatal(err)
}
l, err := Loader(tmpDir)
if err != nil {
t.Fatal(err)
}
if _, err := l.Load(); err == nil || !os.IsNotExist(err) {
t.Fatalf("expected broken symlink error (os.IsNotExist), got: %v", err)
}
}
func TestLoadDirWithBrokenSymlinkInHelmignore(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("symlink tests require unix")
}
tmpDir := t.TempDir()
// Create minimal chart structure
chartYAML := `apiVersion: v2
name: test
version: 0.1.0
`
valuesYAML := `{}
`
tpl := `config: {}
`
if err := os.WriteFile(filepath.Join(tmpDir, "Chart.yaml"), []byte(chartYAML), 0644); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(tmpDir, "values.yaml"), []byte(valuesYAML), 0644); err != nil {
t.Fatal(err)
}
if err := os.MkdirAll(filepath.Join(tmpDir, "templates"), 0755); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(tmpDir, "templates", "config.yaml"), []byte(tpl), 0644); err != nil {
t.Fatal(err)
}
// Create a broken symlink in templates/
brokenLink := filepath.Join(tmpDir, "templates", "broken")
if err := os.Symlink("nonexistent", brokenLink); err != nil {
t.Fatal(err)
}
// Add the broken symlink to .helmignore
if err := os.WriteFile(filepath.Join(tmpDir, ".helmignore"), []byte("templates/broken\n"), 0644); err != nil {
t.Fatal(err)
}
// Loading should succeed despite the broken symlink
l, err := Loader(tmpDir)
if err != nil {
t.Fatal(err)
}
if _, err := l.Load(); err != nil {
t.Fatalf("loading chart with broken symlink in .helmignore should not fail: %s", err)
}
}
func TestBomTestData(t *testing.T) {
testFiles := []string{"frobnitz_with_bom/.helmignore", "frobnitz_with_bom/templates/template.tpl", "frobnitz_with_bom/Chart.yaml"}
for _, file := range testFiles {

10
internal/sympath/walk.go
Unescape View File

@ -21,7 +21,6 @@ limitations under the License.
package sympath
import (
"fmt"
"log/slog"
"os"
"path/filepath"
@ -68,12 +67,17 @@ func symwalk(path string, info os.FileInfo, walkFn filepath.WalkFunc) error {
if IsSymlink(info) {
resolved, err := filepath.EvalSymlinks(path)
if err != nil {
return fmt.Errorf("error evaluating symlink %s: %w", path, err)
// Pass the error to walkFn so callers (e.g. chart loaders)
// can decide whether to skip it based on .helmignore rules.
return walkFn(path, info, err)
}
// This log message is to highlight a symlink that is being used within a chart, symlinks can be used for nefarious reasons.
slog.Info("found symbolic link in path. Contents of linked file included and used", "path", path, "resolved", resolved)
originalInfo := info
if info, err = os.Lstat(resolved); err != nil {
return err
// Route through walkFn with the original symlink info so callers
// can decide whether to skip it based on .helmignore rules.
return walkFn(path, originalInfo, err)
}
if err := symwalk(path, info, walkFn); err != nil && err != filepath.SkipDir {
return err

4
pkg/chart/v2/loader/directory.go
Unescape View File

@ -77,6 +77,10 @@ func LoadDir(dir string) (*chart.Chart, error) {
n = filepath.ToSlash(n)
if err != nil {
// For broken symlinks, respect .helmignore before erroring.
if os.IsNotExist(err) && fi != nil && rules.Ignore(n, fi) {
return nil
}
return err
}
if fi.IsDir() {

90
pkg/chart/v2/loader/load_test.go
Unescape View File

@ -92,6 +92,96 @@ func TestLoadDirWithSymlink(t *testing.T) {
verifyDependenciesLock(t, c)
}
func TestLoadDirWithBrokenSymlinkNotInHelmignore(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("symlink tests require unix")
}
tmpDir := t.TempDir()
chartYAML := `apiVersion: v2
name: test
version: 0.1.0
`
valuesYAML := `{}
`
if err := os.WriteFile(filepath.Join(tmpDir, "Chart.yaml"), []byte(chartYAML), 0644); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(tmpDir, "values.yaml"), []byte(valuesYAML), 0644); err != nil {
t.Fatal(err)
}
// Create a broken symlink NOT listed in .helmignore
brokenLink := filepath.Join(tmpDir, "broken")
if err := os.Symlink("nonexistent", brokenLink); err != nil {
t.Fatal(err)
}
// Empty .helmignore — broken symlink is not ignored
if err := os.WriteFile(filepath.Join(tmpDir, ".helmignore"), []byte(""), 0644); err != nil {
t.Fatal(err)
}
l, err := Loader(tmpDir)
if err != nil {
t.Fatal(err)
}
if _, err := l.Load(); err == nil || !os.IsNotExist(err) {
t.Fatalf("expected broken symlink error (os.IsNotExist), got: %v", err)
}
}
func TestLoadDirWithBrokenSymlinkInHelmignore(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("symlink tests require unix")
}
tmpDir := t.TempDir()
// Create minimal chart structure
chartYAML := `apiVersion: v2
name: test
version: 0.1.0
`
valuesYAML := `{}
`
tpl := `config: {}
`
if err := os.WriteFile(filepath.Join(tmpDir, "Chart.yaml"), []byte(chartYAML), 0644); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(tmpDir, "values.yaml"), []byte(valuesYAML), 0644); err != nil {
t.Fatal(err)
}
if err := os.MkdirAll(filepath.Join(tmpDir, "templates"), 0755); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(tmpDir, "templates", "config.yaml"), []byte(tpl), 0644); err != nil {
t.Fatal(err)
}
// Create a broken symlink in templates/
brokenLink := filepath.Join(tmpDir, "templates", "broken")
if err := os.Symlink("nonexistent", brokenLink); err != nil {
t.Fatal(err)
}
// Add the broken symlink to .helmignore
if err := os.WriteFile(filepath.Join(tmpDir, ".helmignore"), []byte("templates/broken\n"), 0644); err != nil {
t.Fatal(err)
}
// Loading should succeed despite the broken symlink
l, err := Loader(tmpDir)
if err != nil {
t.Fatal(err)
}
if _, err := l.Load(); err != nil {
t.Fatalf("loading chart with broken symlink in .helmignore should not fail: %s", err)
}
}
func TestBomTestData(t *testing.T) {
testFiles := []string{"frobnitz_with_bom/.helmignore", "frobnitz_with_bom/templates/template.tpl", "frobnitz_with_bom/Chart.yaml"}
for _, file := range testFiles {

Write Preview
Loading…
Cancel
Save