mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-27 14:13:48 +03:00
bd17eb205d
* ci: Use golangci's github action for linting Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix most of the staticcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the prealloc lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the misspell lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the varcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the errcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the bodyclose lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the deadcode lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the unused lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the gosec lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the gosimple lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the ineffassign lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the staticcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Revert the misspell change, use a neutral English Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Remove broken golangci-lint CI job Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Re-add errantly-removed weakrand initialization Signed-off-by: Dave Henderson <dhenderson@gmail.com> * don't break the loop and return * Removing extra handling for null rootKey * unignore RegisterModule/RegisterAdapter Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> * single-line log message Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Fix lint after a1808b0dbf209c615e438a496d257ce5e3acdce2 was merged Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Revert ticker change, ignore it instead Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Ignore some of the write errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Remove blank line Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Use lifetime Signed-off-by: Dave Henderson <dhenderson@gmail.com> * close immediately Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Preallocate configVals Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Update modules/caddytls/distributedstek/distributedstek.go Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
155 lines
4.3 KiB
Go
155 lines
4.3 KiB
Go
// Copyright 2015 Matthew Holt and The Caddy Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package caddytls
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/tls"
|
|
"encoding/pem"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/caddyserver/caddy/v2"
|
|
)
|
|
|
|
func init() {
|
|
caddy.RegisterModule(FolderLoader{})
|
|
}
|
|
|
|
// FolderLoader loads certificates and their associated keys from disk
|
|
// by recursively walking the specified directories, looking for PEM
|
|
// files which contain both a certificate and a key.
|
|
type FolderLoader []string
|
|
|
|
// CaddyModule returns the Caddy module information.
|
|
func (FolderLoader) CaddyModule() caddy.ModuleInfo {
|
|
return caddy.ModuleInfo{
|
|
ID: "tls.certificates.load_folders",
|
|
New: func() caddy.Module { return new(FolderLoader) },
|
|
}
|
|
}
|
|
|
|
// LoadCertificates loads all the certificates+keys in the directories
|
|
// listed in fl from all files ending with .pem. This method of loading
|
|
// certificates expects the certificate and key to be bundled into the
|
|
// same file.
|
|
func (fl FolderLoader) LoadCertificates() ([]Certificate, error) {
|
|
var certs []Certificate
|
|
for _, dir := range fl {
|
|
err := filepath.Walk(dir, func(fpath string, info os.FileInfo, err error) error {
|
|
if err != nil {
|
|
return fmt.Errorf("unable to traverse into path: %s", fpath)
|
|
}
|
|
if info.IsDir() {
|
|
return nil
|
|
}
|
|
if !strings.HasSuffix(strings.ToLower(info.Name()), ".pem") {
|
|
return nil
|
|
}
|
|
|
|
cert, err := x509CertFromCertAndKeyPEMFile(fpath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
certs = append(certs, Certificate{Certificate: cert})
|
|
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return certs, nil
|
|
}
|
|
|
|
func x509CertFromCertAndKeyPEMFile(fpath string) (tls.Certificate, error) {
|
|
bundle, err := ioutil.ReadFile(fpath)
|
|
if err != nil {
|
|
return tls.Certificate{}, err
|
|
}
|
|
|
|
certBuilder, keyBuilder := new(bytes.Buffer), new(bytes.Buffer)
|
|
var foundKey bool // use only the first key in the file
|
|
|
|
for {
|
|
// Decode next block so we can see what type it is
|
|
var derBlock *pem.Block
|
|
derBlock, bundle = pem.Decode(bundle)
|
|
if derBlock == nil {
|
|
break
|
|
}
|
|
|
|
if derBlock.Type == "CERTIFICATE" {
|
|
// Re-encode certificate as PEM, appending to certificate chain
|
|
err = pem.Encode(certBuilder, derBlock)
|
|
if err != nil {
|
|
return tls.Certificate{}, err
|
|
}
|
|
} else if derBlock.Type == "EC PARAMETERS" {
|
|
// EC keys generated from openssl can be composed of two blocks:
|
|
// parameters and key (parameter block should come first)
|
|
if !foundKey {
|
|
// Encode parameters
|
|
err = pem.Encode(keyBuilder, derBlock)
|
|
if err != nil {
|
|
return tls.Certificate{}, err
|
|
}
|
|
|
|
// Key must immediately follow
|
|
derBlock, bundle = pem.Decode(bundle)
|
|
if derBlock == nil || derBlock.Type != "EC PRIVATE KEY" {
|
|
return tls.Certificate{}, fmt.Errorf("%s: expected elliptic private key to immediately follow EC parameters", fpath)
|
|
}
|
|
err = pem.Encode(keyBuilder, derBlock)
|
|
if err != nil {
|
|
return tls.Certificate{}, err
|
|
}
|
|
foundKey = true
|
|
}
|
|
} else if derBlock.Type == "PRIVATE KEY" || strings.HasSuffix(derBlock.Type, " PRIVATE KEY") {
|
|
// RSA key
|
|
if !foundKey {
|
|
err = pem.Encode(keyBuilder, derBlock)
|
|
if err != nil {
|
|
return tls.Certificate{}, err
|
|
}
|
|
foundKey = true
|
|
}
|
|
} else {
|
|
return tls.Certificate{}, fmt.Errorf("%s: unrecognized PEM block type: %s", fpath, derBlock.Type)
|
|
}
|
|
}
|
|
|
|
certPEMBytes, keyPEMBytes := certBuilder.Bytes(), keyBuilder.Bytes()
|
|
if len(certPEMBytes) == 0 {
|
|
return tls.Certificate{}, fmt.Errorf("%s: failed to parse PEM data", fpath)
|
|
}
|
|
if len(keyPEMBytes) == 0 {
|
|
return tls.Certificate{}, fmt.Errorf("%s: no private key block found", fpath)
|
|
}
|
|
|
|
cert, err := tls.X509KeyPair(certPEMBytes, keyPEMBytes)
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("%s: making X509 key pair: %v", fpath, err)
|
|
}
|
|
|
|
return cert, nil
|
|
}
|
|
|
|
var _ CertificateLoader = (FolderLoader)(nil)
|