From 27ebfa8c561e758b60872b9bb081253036e559ff Mon Sep 17 00:00:00 2001
From: Thomas FREYSS <thomas.freyss@gmail.com>
Date: Thu, 23 Apr 2020 14:47:08 +0200
Subject: [PATCH] fix(*): remove bom in utf files when loading chart files
 (#6081)

Removes the BOM prefix if present, in read files before
processing the data.
Affects the following pkg:
- pkg/chart/loader: directory and archive loader
- internal/ignore: when loading .helmignore file

Signed-off-by: Thomas FREYSS <thomas.freyss@gmail.com>
---
 internal/ignore/rules.go                      |  13 +++++-
 pkg/chart/loader/archive.go                   |   4 +-
 pkg/chart/loader/directory.go                 |   5 +++
 pkg/chart/loader/load_test.go                 |  40 ++++++++++++++++++
 .../loader/testdata/frobnitz_with_bom.tgz     | Bin 0 -> 3523 bytes
 .../testdata/frobnitz_with_bom/.helmignore    |   1 +
 .../testdata/frobnitz_with_bom/Chart.lock     |   8 ++++
 .../testdata/frobnitz_with_bom/Chart.yaml     |  27 ++++++++++++
 .../testdata/frobnitz_with_bom/INSTALL.txt    |   1 +
 .../loader/testdata/frobnitz_with_bom/LICENSE |   1 +
 .../testdata/frobnitz_with_bom/README.md      |  11 +++++
 .../frobnitz_with_bom/charts/_ignore_me       |   1 +
 .../charts/alpine/Chart.yaml                  |   5 +++
 .../frobnitz_with_bom/charts/alpine/README.md |   9 ++++
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +++
 .../charts/alpine/charts/mast1/values.yaml    |   4 ++
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 ++++++
 .../charts/alpine/values.yaml                 |   2 +
 .../charts/mariner-4.3.2.tgz                  | Bin 0 -> 967 bytes
 .../testdata/frobnitz_with_bom/docs/README.md |   1 +
 .../testdata/frobnitz_with_bom/icon.svg       |   8 ++++
 .../testdata/frobnitz_with_bom/ignore/me.txt  |   0
 .../frobnitz_with_bom/templates/template.tpl  |   1 +
 .../testdata/frobnitz_with_bom/values.yaml    |   6 +++
 25 files changed, 165 insertions(+), 2 deletions(-)
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom.tgz
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/.helmignore
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/Chart.lock
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/Chart.yaml
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/INSTALL.txt
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/LICENSE
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/README.md
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/charts/_ignore_me
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/README.md
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/charts/mariner-4.3.2.tgz
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/docs/README.md
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/icon.svg
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/ignore/me.txt
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/templates/template.tpl
 create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/values.yaml

diff --git a/internal/ignore/rules.go b/internal/ignore/rules.go
index 9049aff0d..a80923baf 100644
--- a/internal/ignore/rules.go
+++ b/internal/ignore/rules.go
@@ -18,6 +18,7 @@ package ignore
 
 import (
 	"bufio"
+	"bytes"
 	"io"
 	"log"
 	"os"
@@ -65,8 +66,18 @@ func Parse(file io.Reader) (*Rules, error) {
 	r := &Rules{patterns: []*pattern{}}
 
 	s := bufio.NewScanner(file)
+	currentLine := 0
+	utf8bom := []byte{0xEF, 0xBB, 0xBF}
 	for s.Scan() {
-		if err := r.parseRule(s.Text()); err != nil {
+		scannedBytes := s.Bytes()
+		// We trim UTF8 BOM
+		if currentLine == 0 {
+			scannedBytes = bytes.TrimPrefix(scannedBytes, utf8bom)
+		}
+		line := string(scannedBytes)
+		currentLine++
+
+		if err := r.parseRule(line); err != nil {
 			return r, err
 		}
 	}
diff --git a/pkg/chart/loader/archive.go b/pkg/chart/loader/archive.go
index 7e187a170..8b38cb89f 100644
--- a/pkg/chart/loader/archive.go
+++ b/pkg/chart/loader/archive.go
@@ -173,7 +173,9 @@ func LoadArchiveFiles(in io.Reader) ([]*BufferedFile, error) {
 			return nil, err
 		}
 
-		files = append(files, &BufferedFile{Name: n, Data: b.Bytes()})
+		data := bytes.TrimPrefix(b.Bytes(), utf8bom)
+
+		files = append(files, &BufferedFile{Name: n, Data: data})
 		b.Reset()
 	}
 
diff --git a/pkg/chart/loader/directory.go b/pkg/chart/loader/directory.go
index a12c5158e..bbe543870 100644
--- a/pkg/chart/loader/directory.go
+++ b/pkg/chart/loader/directory.go
@@ -17,6 +17,7 @@ limitations under the License.
 package loader
 
 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -30,6 +31,8 @@ import (
 	"helm.sh/helm/v3/pkg/chart"
 )
 
+var utf8bom = []byte{0xEF, 0xBB, 0xBF}
+
 // DirLoader loads a chart from a directory
 type DirLoader string
 
@@ -104,6 +107,8 @@ func LoadDir(dir string) (*chart.Chart, error) {
 			return errors.Wrapf(err, "error reading %s", n)
 		}
 
+		data = bytes.TrimPrefix(data, utf8bom)
+
 		files = append(files, &BufferedFile{Name: n, Data: data})
 		return nil
 	}
diff --git a/pkg/chart/loader/load_test.go b/pkg/chart/loader/load_test.go
index 26513d359..3fa6bba0d 100644
--- a/pkg/chart/loader/load_test.go
+++ b/pkg/chart/loader/load_test.go
@@ -85,6 +85,38 @@ func TestLoadDirWithSymlink(t *testing.T) {
 	verifyDependenciesLock(t, c)
 }
 
+func TestLoadDirWithUTFBOM(t *testing.T) {
+	l, err := Loader("testdata/frobnitz_with_bom")
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	c, err := l.Load()
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	verifyFrobnitz(t, c)
+	verifyChart(t, c)
+	verifyDependencies(t, c)
+	verifyDependenciesLock(t, c)
+	verifyBomStripped(t, c.Files)
+}
+
+func TestLoadArchiveWithUTFBOM(t *testing.T) {
+	l, err := Loader("testdata/frobnitz_with_bom.tgz")
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	c, err := l.Load()
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	verifyFrobnitz(t, c)
+	verifyChart(t, c)
+	verifyDependencies(t, c)
+	verifyDependenciesLock(t, c)
+	verifyBomStripped(t, c.Files)
+}
+
 func TestLoadV1(t *testing.T) {
 	l, err := Loader("testdata/frobnitz.v1")
 	if err != nil {
@@ -465,3 +497,11 @@ func verifyChartFileAndTemplate(t *testing.T, c *chart.Chart, name string) {
 		}
 	}
 }
+
+func verifyBomStripped(t *testing.T, files []*chart.File) {
+	for _, file := range files {
+		if bytes.HasPrefix(file.Data, utf8bom) {
+			t.Errorf("Byte Order Mark still present in processed file %s", file.Name)
+		}
+	}
+}
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom.tgz b/pkg/chart/loader/testdata/frobnitz_with_bom.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..be0cd027db34d392a875cf8151642f9922016dbd
GIT binary patch
literal 3523
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

literal 0
HcmV?d00001

diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/.helmignore b/pkg/chart/loader/testdata/frobnitz_with_bom/.helmignore
new file mode 100644
index 000000000..7a4b92da2
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/Chart.lock b/pkg/chart/loader/testdata/frobnitz_with_bom/Chart.lock
new file mode 100644
index 000000000..ed43b227f
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/Chart.lock
@@ -0,0 +1,8 @@
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+digest: invalid
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/Chart.yaml b/pkg/chart/loader/testdata/frobnitz_with_bom/Chart.yaml
new file mode 100644
index 000000000..21b21f0b5
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/Chart.yaml
@@ -0,0 +1,27 @@
+apiVersion: v1
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/INSTALL.txt b/pkg/chart/loader/testdata/frobnitz_with_bom/INSTALL.txt
new file mode 100644
index 000000000..77c4e724a
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/LICENSE b/pkg/chart/loader/testdata/frobnitz_with_bom/LICENSE
new file mode 100644
index 000000000..c27b00bf2
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/README.md b/pkg/chart/loader/testdata/frobnitz_with_bom/README.md
new file mode 100644
index 000000000..e9c40031b
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/_ignore_me b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/_ignore_me
new file mode 100644
index 000000000..a7e3a38b7
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..adb9853c6
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/README.md b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/README.md
new file mode 100644
index 000000000..ea7526bee
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..1ad84b346
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..f690d53c4
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..f3e662a28
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    app.kubernetes.io/name: {{.Chart.Name}}
+    helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.9"
+    command: ["/bin/sleep","9000"]
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml
new file mode 100644
index 000000000..6b7cb2596
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/mariner-4.3.2.tgz b/pkg/chart/loader/testdata/frobnitz_with_bom/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..3190136b050e62c628b3c817fd963ac9dc4a9e25
GIT binary patch
literal 967
zcmV;&133I2iwFR+9h6)E1MQb<XcR{rz^_PKS%@t@2-T(;FA7S?-tO(=@EQ|Bv<6Hh
zL{Z`^&RynmOZRb|olT7*El5F)TEwV`nuzp6)emYPp9BRpS`dt{#^i%ap<*CLvDLF8
zG0yGfjwGT{n~R9^<6vg*X8-@W`9H^iSThm!c`}F~2mwU_?x?EnDEQ^%*bfjTSylv5
z73o|MB~es7K*{8$QaCn&m~I7PglzQUb#z%I@)9}y|06xVBN+YmFO5P>_y%a`Bd>#=
zhbqf2w!b6}wZ9@rvIhtwzm?~C&+QLm+G2!l%`$_aUgS(@pdjdX3a%E}VXVc7`)dg(
zL%IRN2}c1D3xoMi2w@WuWOMZ?5i&3FelBVyq<FnlKn$6+$P8=94srk#fTRMbhakb0
zZPV`nz$j+f8nJLg5JU-y*+HKVt%gQSM|{{ad?_DwRVQCbEA$Gy$O~TXZJ*=2%HXrj
zOc{99{4YzYDk>_Ce_8fREdP%NDf<&d!wu3{&VUQNs{N%vK$Ha~k^gB2!0bO7r0ic0
zbqCp*X#j?=|H@GNONsuE)&I<s2j-v%baVoe9^h8?!qT#msznP*D&`jPTpm~y)oegN
z5LA~`lo!wy1|$U4f`~>dbh>2MX(Z}|+=@*sLod*wS?A8Ugp#mMPuMO0NnZmos9_rr
z3xpDL+otj~lRh?B4hHFTl+d5-8NBXmUXB~EyF^bx7m*+!*g>obczvGF|8xkWsHN8;
z%#+wiWP{=2pC*98@$VNzzsll&G#D7&11-;D>HT0x|DV2?6}a~*p46@R|2l??e_8dX
z@Bb>D3t~VC_*wjq2Dy!6J-_5ME%%J+xmsbK5<dNKReMqEhB1|U&TMST2`xPM<Zf1Z
z*|hcBdcecDQ#JXgLl?6i%v*OeGO-ok+1#>a#qO>ZV?Wt`d|TDdrB^B&LqFr@lYdUA
zs&4-JAg3&uc4dA0gv*bXU9QePa9^8wR{HovA)j@)JOAIkak0Jl)aKqA_3XLM#?H=V
z-{tlG=xy^os=1Z><jAl7hc!3WOl^65uebQOwmYTW@ku#5I`-r&k-y-M{dF|nGj-g(
z><53;&+C4=zp|%rwv!)UyY=%k_t%Y|wNRQl`C6N_Z&S;S+~wb1=)2Uh_4I81`y>DO
zoLPSt=btB&x{CUK`0DA&){efW_O36RxnsYZNT0r;JbTLR{H4M3C$8(Cee==aQ~Gbq
p$`5v3?NB{4-j0<R3<iV2U@#aA27|$1Fc^$C;~7HLiNF9T006nP>XQHf

literal 0
HcmV?d00001

diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/docs/README.md b/pkg/chart/loader/testdata/frobnitz_with_bom/docs/README.md
new file mode 100644
index 000000000..816c3e431
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/icon.svg b/pkg/chart/loader/testdata/frobnitz_with_bom/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/ignore/me.txt b/pkg/chart/loader/testdata/frobnitz_with_bom/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/templates/template.tpl b/pkg/chart/loader/testdata/frobnitz_with_bom/templates/template.tpl
new file mode 100644
index 000000000..bb29c5491
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/values.yaml b/pkg/chart/loader/testdata/frobnitz_with_bom/values.yaml
new file mode 100644
index 000000000..c24ceadf9
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"