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

Signed-off-by: xin.li <xin.li@daocloud.io> Signed-off-by: xin.li <xin.li@daocloud.io>
argoproj · Aug 18, 2022 · 519448e · 519448e
1 parent 893a867
commit 519448e
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/util/cert/cert.go b/util/cert/cert.go
@@ -16,6 +16,7 @@ import (
 	"regexp"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"golang.org/x/crypto/ssh"
 
 	"github.com/argoproj/argo-cd/v2/common"
@@ -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)
 }
 
@@ -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)
 }