rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-18 23:07:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2545 from alexander-hughes/custom_certdir_fix

Browse Source 
Update cert filename validation to *.pem
This commit is contained in:
Sebastiaan van Steenis 2021-05-21 11:10:21 +02:00 committed by GitHub
commit ad0b399a90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pki/util.go
View File

@ -592,7 +592,7 @@ func ReadCertsAndKeysFromDir(certDir string) (map[string]CertificatePKI, error)
for _, file := range files { for _, file := range files {
logrus.Debugf("[certificates] reading file %s from directory [%s]", file.Name(), certDir) logrus.Debugf("[certificates] reading file %s from directory [%s]", file.Name(), certDir)
if !strings.HasSuffix(file.Name(), "-key.pem") && !strings.HasSuffix(file.Name(), "-csr.pem") { if strings.HasSuffix(file.Name(), ".pem") && !strings.HasSuffix(file.Name(), "-key.pem") && !strings.HasSuffix(file.Name(), "-csr.pem") {
// fetching cert // fetching cert
cert, err := getCertFromFile(certDir, file.Name()) cert, err := getCertFromFile(certDir, file.Name())
if err != nil { if err != nil {