Skip to content

Commit 63cd794

Browse files
committed
Fix golint errors because of updated gosec dep
This is mostly adding `nolint` becasue gosec showing errors even for temp folders and files.
1 parent b9fc67b commit 63cd794

15 files changed

Lines changed: 32 additions & 26 deletions

File tree

cmd/crc/cmd/start.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ type clusterConfig struct {
148148

149149
type credentials struct {
150150
Username string `json:"username"`
151-
Password string `json:"password"`
151+
Password string `json:"password"` // nolint:gosec
152152
}
153153

154154
type startResult struct {

pkg/crc/api/client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func (c *client) sendRequest(url string, method string, data io.Reader) ([]byte,
249249
}
250250
req.Header.Set("Content-Type", "application/json")
251251

252-
res, err := c.client.Do(req)
252+
res, err := c.client.Do(req) //nolint:gosec // G704: SSRF vulnerability check not needed as the base URL is unix socket
253253
if err != nil {
254254
return nil, err
255255
}

pkg/crc/config/viper_config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ func atomicWrite(bin []byte, configFile string) error {
130130
return err
131131
}
132132
defer func() {
133-
_ = os.Remove(tmpFile.Name())
133+
_ = os.Remove(tmpFile.Name()) // nolint:gosec // G703: paths from CreateTemp
134134
}()
135135
if err := tmpFile.Close(); err != nil {
136136
return err
137137
}
138-
if err := os.WriteFile(tmpFile.Name(), bin, 0600); err != nil {
138+
if err := os.WriteFile(tmpFile.Name(), bin, 0600); err != nil { // nolint:gosec // G703: paths from CreateTemp
139139
return err
140140
}
141-
return os.Rename(tmpFile.Name(), configFile)
141+
return os.Rename(tmpFile.Name(), configFile) // nolint:gosec // G703: paths from CreateTemp and caller
142142
}

pkg/crc/errors/maskederror.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const mask = "*****"
88

99
type MaskedSecretError struct {
1010
Err error
11-
Secret string
11+
Secret string // nolint:gosec
1212
}
1313

1414
func (err *MaskedSecretError) Error() string {

pkg/crc/logging/logging.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package logging
33
import (
44
"os"
55

6+
terminal "github.com/crc-org/crc/v2/pkg/os/terminal"
67
"github.com/sirupsen/logrus"
78
"github.com/spf13/pflag"
8-
terminal "golang.org/x/term"
99
"gopkg.in/natefinch/lumberjack.v2"
1010
)
1111

@@ -53,7 +53,7 @@ func InitLogrus(logFilePath string) {
5353

5454
// Add hook to send error/fatal to stderr
5555
logrus.AddHook(newstdErrHook(level, &logrus.TextFormatter{
56-
ForceColors: terminal.IsTerminal(int(os.Stderr.Fd())),
56+
ForceColors: terminal.IsRunningInTerminal(),
5757
DisableTimestamp: true,
5858
DisableLevelTruncation: false,
5959
}))

pkg/crc/machine/kubeconfig_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func createTempKubeConfig(config *api.Config) (string, error) {
9797

9898
err = clientcmd.WriteToFile(*config, path)
9999
if err != nil {
100-
os.Remove(path)
100+
os.Remove(path) // nolint:gosec // G703: paths from CreateTemp and caller
101101
return "", err
102102
}
103103

pkg/crc/ssh/keys.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var (
2525
)
2626

2727
type KeyPair struct {
28-
PrivateKey []byte
28+
PrivateKey []byte // nolint:gosec
2929
PublicKey []byte
3030
}
3131

@@ -92,7 +92,7 @@ func RemoveCRCHostEntriesFromKnownHosts() error {
9292
}
9393
defer func() {
9494
tempHostsFile.Close()
95-
os.Remove(tempHostsFile.Name())
95+
os.Remove(tempHostsFile.Name()) //nolint:gosec // G703: paths from CreateTemp
9696
}()
9797

9898
if err := tempHostsFile.Chmod(0600); err != nil {
@@ -142,7 +142,7 @@ func RemoveCRCHostEntriesFromKnownHosts() error {
142142
if err := tempHostsFile.Close(); err != nil {
143143
return fmt.Errorf("Error closing temp file: %w", err)
144144
}
145-
return os.Rename(tempHostsFile.Name(), knownHostsPath)
145+
return os.Rename(tempHostsFile.Name(), knownHostsPath) //nolint:gosec // G703: paths from CreateTemp
146146
}
147147
return nil
148148
}

pkg/download/download.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func InMemory(uri string) (io.ReadCloser, error) {
108108
if err != nil {
109109
return nil, err
110110
}
111-
return os.Open(filePath)
111+
return os.Open(filePath) // nolint:gosec
112112
}
113113
client := grab.NewClient()
114114
client.HTTPClient = &http.Client{Transport: httpproxy.HTTPTransport()}

pkg/extract/extract.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func untar(ctx context.Context, reader io.Reader, targetDir string, fileFilter f
122122

123123
// if its a dir and it doesn't exist create it
124124
case tar.TypeDir:
125-
if err := os.MkdirAll(path, header.FileInfo().Mode()); err != nil {
125+
if err := os.MkdirAll(path, header.FileInfo().Mode()); err != nil { // nolint:gosec // G703: paths from header.FileInfo()
126126
return nil, err
127127
}
128128

@@ -139,11 +139,11 @@ func untar(ctx context.Context, reader io.Reader, targetDir string, fileFilter f
139139

140140
func uncompressFile(ctx context.Context, tarReader io.Reader, fileInfo os.FileInfo, path string, showProgress bool) error {
141141
// with a file filter, we may have skipped the intermediate directories, make sure they exist
142-
if err := os.MkdirAll(filepath.Dir(path), 0750); err != nil {
142+
if err := os.MkdirAll(filepath.Dir(path), 0750); err != nil { // nolint:gosec // G703: paths from filepath.Dir
143143
return err
144144
}
145145

146-
file, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, fileInfo.Mode())
146+
file, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, fileInfo.Mode()) // nolint:gosec // G703: paths from filepath.Dir
147147
if err != nil {
148148
return err
149149
}

pkg/libmachine/persist/filestore.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (s Filestore) saveToFile(data []byte, file string) error {
3131
}
3232
defer os.Remove(tmpfi.Name())
3333

34-
if err = os.WriteFile(tmpfi.Name(), data, 0600); err != nil {
34+
if err = os.WriteFile(tmpfi.Name(), data, 0600); err != nil { // nolint:gosec // G703: paths from CreateTemp
3535
return err
3636
}
3737

@@ -43,7 +43,7 @@ func (s Filestore) saveToFile(data []byte, file string) error {
4343
return err
4444
}
4545

46-
err = os.Rename(tmpfi.Name(), file)
46+
err = os.Rename(tmpfi.Name(), file) // nolint:gosec // G703: paths from CreateTemp and caller
4747
return err
4848
}
4949

0 commit comments

Comments
 (0)