github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Refactor:move clean method to suitable place

Browse Source
This commit is contained in:
yanghaichao12 2019-05-07 14:23:30 -04:00
parent a1588cfe34
commit e21ce73fba
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/cmd/cp/cp.go
View File

@ -413,12 +413,6 @@ func recursiveTar(srcBase, srcFile, destBase, destFile string, tw *tar.Writer) e
return nil return nil
} }
// clean prevents path traversals by stripping them out.
// This is adapted from https://golang.org/src/net/http/fs.go#L74
func clean(fileName string) string {
return path.Clean(string(os.PathSeparator) + fileName)
}
func (o *CopyOptions) untarAll(reader io.Reader, destDir, prefix string) error { func (o *CopyOptions) untarAll(reader io.Reader, destDir, prefix string) error {
// TODO: use compression here? // TODO: use compression here?
tarReader := tar.NewReader(reader) tarReader := tar.NewReader(reader)

6
pkg/kubectl/cmd/cp/cp_test.go
View File

@ -551,6 +551,12 @@ func TestBadTar(t *testing.T) {
} }
} }
// clean prevents path traversals by stripping them out.
// This is adapted from https://golang.org/src/net/http/fs.go#L74
func clean(fileName string) string {
return path.Clean(string(os.PathSeparator) + fileName)
}
func TestClean(t *testing.T) { func TestClean(t *testing.T) {
tests := []struct { tests := []struct {
input string input string