Skip to content

fix(#9963):Add logic to handle for fileHandle.Close() #10361

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
crenshaw-dev merged 1 commit into from
Aug 18, 2022
Merged

fix(#9963):Add logic to handle for fileHandle.Close() #10361

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
19 changes: 17 additions & 2 deletions util/cert/cert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"regexp"
"strings"

log "github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"

"github.com/argoproj/argo-cd/v2/common"
Expand Down Expand Up @@ -130,7 +131,14 @@ func ParseTLSCertificatesFromPath(sourceFile string) ([]string, error) {
if err != nil {
return nil, err
}
defer fileHandle.Close()
defer func() {
if err = fileHandle.Close(); err != nil {
log.WithFields(log.Fields{
common.SecurityField: common.SecurityMedium,
common.SecurityCWEField: 775,
}).Errorf("error closing file %q: %v", fileHandle.Name(), err)
}
}()
return ParseTLSCertificatesFromStream(fileHandle)
}

Expand Down Expand Up @@ -187,7 +195,14 @@ func ParseSSHKnownHostsFromPath(sourceFile string) ([]string, error) {
if err != nil {
return nil, err
}
defer fileHandle.Close()
defer func() {
if err = fileHandle.Close(); err != nil {
log.WithFields(log.Fields{
common.SecurityField: common.SecurityMedium,
common.SecurityCWEField: 775,
}).Errorf("error closing file %q: %v", fileHandle.Name(), err)
}
}()
return ParseSSHKnownHostsFromStream(fileHandle)
}

Expand Down