suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2024-12-19 20:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix for gosec rule G304 - sanitize filepaths"

Browse Source 
This reverts commit ffb6cbf769.
This commit is contained in:
Mike Farah 2021-07-08 10:14:01 +10:00
parent 90708c010c
commit 38ce8618e1
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/yqlib/file_utils.go
View File

@ -3,7 +3,6 @@ package yqlib
import (
"io"
"os"
"path/filepath"
)
func safelyRenameFile(from string, to string) {
@ -26,7 +25,7 @@ func safelyRenameFile(from string, to string) {
// thanks https://stackoverflow.com/questions/21060945/simple-way-to-copy-a-file-in-golang
func copyFileContents(src, dst string) (err error) {
in, err := os.Open(filepath.Clean(src))
in, err := os.Open(src) // nolint gosec
if err != nil {
return err
}

3
pkg/yqlib/utils.go
View File

@ -5,7 +5,6 @@ import (
"container/list"
"io"
"os"
"path/filepath"
yaml "gopkg.in/yaml.v3"
)
@ -14,7 +13,7 @@ func readStream(filename string) (io.Reader, error) {
if filename == "-" {
return bufio.NewReader(os.Stdin), nil
} else {
return os.Open(filepath.Clean(filename))
return os.Open(filename) // nolint gosec
}
}

3
test/utils.go
View File

@ -5,7 +5,6 @@ import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"reflect"
"strings"
"testing"
@ -82,7 +81,7 @@ func WriteTempYamlFile(content string) string {
}
func ReadTempYamlFile(name string) string {
content, _ := ioutil.ReadFile(filepath.Clean(name))
content, _ := ioutil.ReadFile(name)
return string(content)
}