Skip to content

Fix gosec errors and enable gosec linter #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2024
Merged

Fix gosec errors and enable gosec linter #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
issues:
exclude-rules:
- linters:
- gosec
- nilnil
text: ".*"
linters:
Expand Down
1 change: 1 addition & 0 deletions internal/util/signal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ func testExitCode(
os.Exit(0)
}

// #nosec G204
cmd := exec.Command(os.Args[0], "-test.run="+t.Name())
cmd.Env = append(os.Environ(), "BE_CRASHER=1")
cmd.Stdout = os.Stdout
Expand Down
2 changes: 1 addition & 1 deletion internal/versionchecker/test/testdata/fetch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ func (inv *Inventory) write(manifestsPath string) error {
invBytes.WriteString("\n---\n")
}

if err := os.WriteFile(manifestsPath, invBytes.Bytes(), 0644); err != nil {
if err := os.WriteFile(manifestsPath, invBytes.Bytes(), 0600); err != nil {
return fmt.Errorf("failed to write inventory file: %v", err)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/create/certificaterequest/certificaterequest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ spec:

for name, test := range tests {
t.Run(name, func(t *testing.T) {
if err := os.WriteFile("testfile.yaml", []byte(test.inputFileContent), 0644); err != nil {
if err := os.WriteFile("testfile.yaml", []byte(test.inputFileContent), 0600); err != nil {
t.Fatalf("error creating test file %#v", err)
}
defer os.Remove("testfile.yaml")
Expand Down
3 changes: 1 addition & 2 deletions pkg/renew/renew.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,7 @@ func (o *Options) Run(ctx context.Context, args []string) error {
}

for _, crt := range crts {
// #nosec G601 -- False positive. See https://github.com/golang/go/discussions/56010
if err := o.renewCertificate(ctx, &crt); err != nil {
if err := o.renewCertificate(ctx, &crt); /* #nosec G601 -- Pointer does not outlive function scope */ err != nil {
return err
}
}
Expand Down
11 changes: 4 additions & 7 deletions pkg/status/certificate/certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,8 @@ func findMatchingCR(cmClient cmclient.Interface, ctx context.Context, crt *cmapi
nextRevision = *crt.Status.Revision + 1
}
for _, req := range reqs.Items {
// #nosec G601 -- False positive. See https://github.com/golang/go/discussions/56010
if predicate.CertificateRequestRevision(nextRevision)(&req) &&
predicate.ResourceOwnedBy(crt)(&req) {
if predicate.CertificateRequestRevision(nextRevision)(&req) && /* #nosec G601 -- Pointer does not outlive function scope */
predicate.ResourceOwnedBy(crt)(&req) /* #nosec G601 -- Pointer does not outlive function scope */ {
possibleMatches = append(possibleMatches, req.DeepCopy())
}
}
Expand All @@ -337,8 +336,7 @@ func findMatchingOrder(cmClient cmclient.Interface, ctx context.Context, req *cm

possibleMatches := []*cmacme.Order{}
for _, order := range orders.Items {
// #nosec G601 -- False positive. See https://github.com/golang/go/discussions/56010
if predicate.ResourceOwnedBy(req)(&order) {
if predicate.ResourceOwnedBy(req)(&order) /* #nosec G601 -- Pointer does not outlive function scope */ {
possibleMatches = append(possibleMatches, order.DeepCopy())
}
}
Expand Down Expand Up @@ -390,8 +388,7 @@ func findMatchingChallenges(cmClient cmclient.Interface, ctx context.Context, or

possibleMatches := []*cmacme.Challenge{}
for _, challenge := range challenges.Items {
// #nosec G601 -- False positive. See https://github.com/golang/go/discussions/56010
if predicate.ResourceOwnedBy(order)(&challenge) {
if predicate.ResourceOwnedBy(order)(&challenge) /* #nosec G601 -- Pointer does not outlive function scope */ {
possibleMatches = append(possibleMatches, challenge.DeepCopy())
}
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/status/certificate/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ func (secretStatus *SecretStatus) String() string {
return secretStatus.Error.Error()
}

secretFormat := `Secret:
detailsFormat := `Secret:
Name: %s
Issuer Country: %s
Issuer Organisation: %s
Expand All @@ -363,7 +363,7 @@ func (secretStatus *SecretStatus) String() string {
if err != nil {
extKeyUsageString = err.Error()
}
output := fmt.Sprintf(secretFormat, secretStatus.Name, strings.Join(secretStatus.IssuerCountry, ", "),
output := fmt.Sprintf(detailsFormat, secretStatus.Name, strings.Join(secretStatus.IssuerCountry, ", "),
strings.Join(secretStatus.IssuerOrganisation, ", "),
secretStatus.IssuerCommonName, keyUsageToString(secretStatus.KeyUsage),
extKeyUsageString, secretStatus.PublicKeyAlgorithm, secretStatus.SignatureAlgorithm,
Expand Down