mirror of https://github.com/helm/helm
fix: perform extra validation on paths in tar archives (#5165)
* fix: perform extra validation on paths in tar archives Signed-off-by: Matt Butcher <matt.butcher@microsoft.com> * fix: Cover a few Windows cases and also remove a duplicate tar reader Signed-off-by: Matt Butcher <matt.butcher@microsoft.com> * fix: removed debug output Signed-off-by: Matt Butcher <matt.butcher@microsoft.com> * fix: Expand again preserves the files verbatim Also added tests for Expand Signed-off-by: Matt Butcher <matt.butcher@microsoft.com> * fix: add license block and remove println Signed-off-by: Matt Butcher <matt.butcher@microsoft.com>pull/5175/head
parent
893c3b61f6
commit
5603fe8d3e
@ -0,0 +1,121 @@
|
||||
/*
|
||||
Copyright The Helm Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package chartutil
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestExpand(t *testing.T) {
|
||||
dest, err := ioutil.TempDir("", "helm-testing-")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer os.RemoveAll(dest)
|
||||
|
||||
reader, err := os.Open("testdata/frobnitz-1.2.3.tgz")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := Expand(dest, reader); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
expectedChartPath := filepath.Join(dest, "frobnitz")
|
||||
fi, err := os.Stat(expectedChartPath)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !fi.IsDir() {
|
||||
t.Fatalf("expected a chart directory at %s", expectedChartPath)
|
||||
}
|
||||
|
||||
dir, err := os.Open(expectedChartPath)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
fis, err := dir.Readdir(0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
expectLen := 12
|
||||
if len(fis) != expectLen {
|
||||
t.Errorf("Expected %d files, but got %d", expectLen, len(fis))
|
||||
}
|
||||
|
||||
for _, fi := range fis {
|
||||
expect, err := os.Stat(filepath.Join("testdata", "frobnitz", fi.Name()))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if fi.Size() != expect.Size() {
|
||||
t.Errorf("Expected %s to have size %d, got %d", fi.Name(), expect.Size(), fi.Size())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestExpandFile(t *testing.T) {
|
||||
dest, err := ioutil.TempDir("", "helm-testing-")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer os.RemoveAll(dest)
|
||||
|
||||
if err := ExpandFile(dest, "testdata/frobnitz-1.2.3.tgz"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
expectedChartPath := filepath.Join(dest, "frobnitz")
|
||||
fi, err := os.Stat(expectedChartPath)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !fi.IsDir() {
|
||||
t.Fatalf("expected a chart directory at %s", expectedChartPath)
|
||||
}
|
||||
|
||||
dir, err := os.Open(expectedChartPath)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
fis, err := dir.Readdir(0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
expectLen := 12
|
||||
if len(fis) != expectLen {
|
||||
t.Errorf("Expected %d files, but got %d", expectLen, len(fis))
|
||||
}
|
||||
|
||||
for _, fi := range fis {
|
||||
expect, err := os.Stat(filepath.Join("testdata", "frobnitz", fi.Name()))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if fi.Size() != expect.Size() {
|
||||
t.Errorf("Expected %s to have size %d, got %d", fi.Name(), expect.Size(), fi.Size())
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in new issue