Skip to content

Commit 2484715

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3064 from alvaroaleman/remove-gosec
🌱 Remove gosec linter
2 parents c80ea33 + 3b0b995 commit 2484715

File tree

19 files changed

+27
-29
lines changed

19 files changed

+27
-29
lines changed

‎.golangci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ linters:
1919
- gofmt
2020
- goimports
2121
- goprintffuncname
22-
- gosec
2322
- gosimple
2423
- govet
2524
- importas

‎pkg/cache/internal/informers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ func newGVKFixupWatcher(gvk schema.GroupVersionKind, watcher watch.Interface) wa
585585
// hammer the apiserver with list requests simultaneously.
586586
func calculateResyncPeriod(resync time.Duration) time.Duration {
587587
// the factor will fall into [0.9, 1.1)
588-
factor := rand.Float64()/5.0 + 0.9 //nolint:gosec
588+
factor := rand.Float64()/5.0 + 0.9
589589
return time.Duration(float64(resync.Nanoseconds()) * factor)
590590
}
591591

‎pkg/client/config/config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func setConfigs(tc testCase, dir string) {
191191

192192
func createFiles(files map[string]string, dir string) error {
193193
for path, data := range files {
194-
if err := os.WriteFile(filepath.Join(dir, path), []byte(data), 0644); err != nil { //nolint:gosec
194+
if err := os.WriteFile(filepath.Join(dir, path), []byte(data), 0644); err != nil {
195195
return err
196196
}
197197
}

‎pkg/controller/controllerutil/controllerutil_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ var _ = Describe("Controllerutil", func() {
457457
BeforeEach(func() {
458458
deploy = &appsv1.Deployment{
459459
ObjectMeta: metav1.ObjectMeta{
460-
Name: fmt.Sprintf("deploy-%d", rand.Int31()), //nolint:gosec
460+
Name: fmt.Sprintf("deploy-%d", rand.Int31()),
461461
Namespace: "default",
462462
},
463463
}
@@ -606,7 +606,7 @@ var _ = Describe("Controllerutil", func() {
606606
BeforeEach(func() {
607607
deploy = &appsv1.Deployment{
608608
ObjectMeta: metav1.ObjectMeta{
609-
Name: fmt.Sprintf("deploy-%d", rand.Int31()), //nolint:gosec
609+
Name: fmt.Sprintf("deploy-%d", rand.Int31()),
610610
Namespace: "default",
611611
},
612612
}

‎pkg/controller/priorityqueue/priorityqueue_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ var _ = Describe("Controllerworkqueue", func() {
356356

357357
for range 20 {
358358
for i := range 1000 {
359-
rn := rand.N(100) //nolint:gosec // We don't need cryptographically secure entropy here
359+
rn := rand.N(100)
360360
if rn < 10 {
361361
q.AddWithOpts(AddOpts{After: time.Duration(rn) * time.Millisecond}, fmt.Sprintf("foo%d", i))
362362
} else {

‎pkg/envtest/webhook.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ func (o *WebhookInstallOptions) setupCA() error {
294294
return fmt.Errorf("unable to marshal webhook serving certs: %w", err)
295295
}
296296

297-
if err := os.WriteFile(filepath.Join(localServingCertsDir, "tls.crt"), certData, 0640); err != nil { //nolint:gosec
297+
if err := os.WriteFile(filepath.Join(localServingCertsDir, "tls.crt"), certData, 0640); err != nil {
298298
return fmt.Errorf("unable to write webhook serving cert to disk: %w", err)
299299
}
300-
if err := os.WriteFile(filepath.Join(localServingCertsDir, "tls.key"), keyData, 0640); err != nil { //nolint:gosec
300+
if err := os.WriteFile(filepath.Join(localServingCertsDir, "tls.key"), keyData, 0640); err != nil {
301301
return fmt.Errorf("unable to write webhook serving key to disk: %w", err)
302302
}
303303

‎pkg/internal/testing/controlplane/apiserver.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,10 @@ func (s *APIServer) populateAPIServerCerts() error {
384384
return err
385385
}
386386

387-
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.crt"), certData, 0640); err != nil { //nolint:gosec
387+
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.crt"), certData, 0640); err != nil {
388388
return err
389389
}
390-
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.key"), keyData, 0640); err != nil { //nolint:gosec
390+
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.key"), keyData, 0640); err != nil {
391391
return err
392392
}
393393

@@ -404,10 +404,10 @@ func (s *APIServer) populateAPIServerCerts() error {
404404
return err
405405
}
406406

407-
if err := os.WriteFile(filepath.Join(s.CertDir, saCertFile), saCert, 0640); err != nil { //nolint:gosec
407+
if err := os.WriteFile(filepath.Join(s.CertDir, saCertFile), saCert, 0640); err != nil {
408408
return err
409409
}
410-
return os.WriteFile(filepath.Join(s.CertDir, saKeyFile), saKey, 0640) //nolint:gosec
410+
return os.WriteFile(filepath.Join(s.CertDir, saKeyFile), saKey, 0640)
411411
}
412412

413413
// Stop stops this process gracefully, waits for its termination, and cleans up

‎pkg/internal/testing/controlplane/auth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (c *CertAuthn) Start() error {
128128
return fmt.Errorf("start called before configure")
129129
}
130130
caCrt := c.ca.CA.CertBytes()
131-
if err := os.WriteFile(c.caCrtPath(), caCrt, 0640); err != nil { //nolint:gosec
131+
if err := os.WriteFile(c.caCrtPath(), caCrt, 0640); err != nil {
132132
return fmt.Errorf("unable to save the client certificate CA to %s: %w", c.caCrtPath(), err)
133133
}
134134

‎pkg/internal/testing/process/process.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func pollURLUntilOK(url url.URL, interval time.Duration, ready chan bool, stopCh
215215
// there's probably certs *somewhere*,
216216
// but it's fine to just skip validating
217217
// them for health checks during testing
218-
InsecureSkipVerify: true, //nolint:gosec
218+
InsecureSkipVerify: true,
219219
},
220220
},
221221
}

‎pkg/log/zap/flags.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (ev *levelFlag) Set(flagValue string) error {
8585
}
8686
if logLevel > 0 {
8787
intLevel := -1 * logLevel
88-
ev.setFunc(zap.NewAtomicLevelAt(zapcore.Level(int8(intLevel)))) //nolint:gosec // We are not worried about integer overflows (G115) here.
88+
ev.setFunc(zap.NewAtomicLevelAt(zapcore.Level(int8(intLevel))))
8989
} else {
9090
return fmt.Errorf("invalid log level \"%s\"", flagValue)
9191
}

‎pkg/manager/internal/integration/manager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ func createConversionWebhook(mgr manager.Manager) *ConversionWebhook {
261261
// This is a hack but it's better than using a hard-coded port.
262262
v := reflect.ValueOf(mgr).Elem()
263263
field := v.FieldByName("healthProbeListener")
264-
healthProbeListener := *(*net.Listener)(unsafe.Pointer(field.UnsafeAddr())) //nolint:gosec
264+
healthProbeListener := *(*net.Listener)(unsafe.Pointer(field.UnsafeAddr()))
265265
readinessEndpoint := fmt.Sprint("http://", healthProbeListener.Addr().String(), "/readyz")
266266

267267
return &ConversionWebhook{

‎pkg/manager/manager_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ var _ = Describe("manger.Manager", func() {
572572
})
573573

574574
It("should return an error if the metrics bind address is already in use", func() {
575-
ln, err := net.Listen("tcp", ":0") //nolint:gosec
575+
ln, err := net.Listen("tcp", ":0")
576576
Expect(err).ShouldNot(HaveOccurred())
577577

578578
var srv metricsserver.Server
@@ -597,7 +597,7 @@ var _ = Describe("manger.Manager", func() {
597597
})
598598

599599
It("should return an error if the metrics bind address is already in use and secure serving enabled", func() {
600-
ln, err := net.Listen("tcp", ":0") //nolint:gosec
600+
ln, err := net.Listen("tcp", ":0")
601601
Expect(err).ShouldNot(HaveOccurred())
602602

603603
var srv metricsserver.Server

‎pkg/metrics/filters/filters_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ var _ = Describe("manger.Manager", func() {
7272
Elem().
7373
Set(reflect.ValueOf(newMetricsServer))
7474
httpClient = &http.Client{Transport: &http.Transport{
75-
TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, //nolint:gosec
75+
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
7676
}}
7777
})
7878

‎pkg/metrics/server/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ func (s *defaultServer) createListener(ctx context.Context, log logr.Logger) (ne
275275
return s.options.ListenConfig.Listen(ctx, "tcp", s.options.BindAddress)
276276
}
277277

278-
cfg := &tls.Config{ //nolint:gosec
278+
cfg := &tls.Config{
279279
NextProtos: []string{"h2"},
280280
}
281281
// fallback TLS config ready, will now mutate if passer wants full control over it

‎pkg/webhook/admission/response.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func ValidationResponse(allowed bool, message string) Response {
7171
AdmissionResponse: admissionv1.AdmissionResponse{
7272
Allowed: allowed,
7373
Result: &metav1.Status{
74-
Code: int32(code), //nolint:gosec // Integer overflows (G115) cannot occur here.
74+
Code: int32(code),
7575
Reason: reason,
7676
},
7777
},

‎pkg/webhook/example_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func ExampleStandaloneWebhook() {
145145
mux.Handle("/validating", validatingHookHandler)
146146

147147
// Run your handler
148-
if err := http.ListenAndServe(port, mux); err != nil { //nolint:gosec // it's fine to not set timeouts here
148+
if err := http.ListenAndServe(port, mux); err != nil {
149149
panic(err)
150150
}
151151
}

‎pkg/webhook/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func (s *DefaultServer) Start(ctx context.Context) error {
190190

191191
log.Info("Starting webhook server")
192192

193-
cfg := &tls.Config{ //nolint:gosec
193+
cfg := &tls.Config{
194194
NextProtos: []string{"h2"},
195195
}
196196
// fallback TLS config ready, will now mutate if passer wants full control over it
@@ -272,7 +272,7 @@ func (s *DefaultServer) Start(ctx context.Context) error {
272272
// server has been started.
273273
func (s *DefaultServer) StartedChecker() healthz.Checker {
274274
config := &tls.Config{
275-
InsecureSkipVerify: true, //nolint:gosec // config is used to connect to our own webhook port.
275+
InsecureSkipVerify: true,
276276
}
277277
return func(req *http.Request) error {
278278
s.mu.Lock()

‎tools/setup-envtest/remote/read_body.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package remote
55

66
import (
7-
//nolint:gosec // We're aware that md5 is a weak cryptographic primitive, but we don't have a choice here.
87
"crypto/md5"
98
"crypto/sha512"
109
"encoding/base64"
@@ -28,7 +27,7 @@ func readBody(resp *http.Response, out io.Writer, archiveName string, platform v
2827
case versions.SHA512HashType:
2928
hasher = sha512.New()
3029
case versions.MD5HashType:
31-
hasher = md5.New() //nolint:gosec // We're aware that md5 is a weak cryptographic primitive, but we don't have a choice here.
30+
hasher = md5.New()
3231
default:
3332
return fmt.Errorf("hash type %s not implemented", platform.Hash.Type)
3433
}

‎tools/setup-envtest/store/store.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,14 @@ func (s *Store) Add(ctx context.Context, item Item, contents io.Reader) (resErr
167167
// preferfing our own scheme.
168168
targetPath := filepath.Base(header.Name)
169169
log.V(1).Info("writing archive file to disk", "archive file", header.Name, "on-disk file", targetPath)
170-
perms := 0555 & header.Mode // make sure we're at most r+x
171-
binOut, err := itemPath.OpenFile(targetPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, os.FileMode(perms)) //nolint:gosec // Integer overflows (G115) seem unlikely here.
170+
perms := 0555 & header.Mode // make sure we're at most r+x
171+
binOut, err := itemPath.OpenFile(targetPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, os.FileMode(perms))
172172
if err != nil {
173173
return fmt.Errorf("unable to create file %s from archive to disk for version-platform pair %s", targetPath, itemName)
174174
}
175175
if err := func() error { // IIFE to get the defer properly in a loop
176176
defer binOut.Close()
177-
if _, err := io.Copy(binOut, tarReader); err != nil { //nolint:gosec
177+
if _, err := io.Copy(binOut, tarReader); err != nil {
178178
return fmt.Errorf("unable to write file %s from archive to disk for version-platform pair %s", targetPath, itemName)
179179
}
180180
return nil

0 commit comments

Comments
 (0)