mirror of
				https://github.com/caddyserver/caddy.git
				synced 2025-10-26 08:12:43 -04:00 
			
		
		
		
	* Made trusted leaf certificates pluggable into the tls.client_auth.leaf module * Added leaf loaders modules: file, folder, pem aand storage * Cleaned implementation of leaf cert loader modules * Added tests for leaf certs file and folder loaders * cmd: fix the output of the `Usage` section (#6138) * core: OnExit hooks (#6128) * core: OnExit callbacks * core: Process-global OnExit callbacks * ci: bump golangci/golangci-lint-action from 3 to 4 (#6141) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3 to 4. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v3...v4) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Added more leaf certificate loaders tests and cleaned up code * Modified leaf cert loaders json field names and cleaned up storage loader comment * Update modules/caddytls/leaffileloader.go * Update LeafStorageLoader certificates field name * Upgraded protobuf version --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
		
			
				
	
	
		
			98 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			98 lines
		
	
	
		
			2.6 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 (
 | |
| 	"crypto/x509"
 | |
| 	"fmt"
 | |
| 	"os"
 | |
| 	"path/filepath"
 | |
| 	"strings"
 | |
| 
 | |
| 	"github.com/caddyserver/caddy/v2"
 | |
| )
 | |
| 
 | |
| func init() {
 | |
| 	caddy.RegisterModule(LeafFolderLoader{})
 | |
| }
 | |
| 
 | |
| // LeafFolderLoader 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 LeafFolderLoader struct {
 | |
| 	Folders []string `json:"folders,omitempty"`
 | |
| }
 | |
| 
 | |
| // CaddyModule returns the Caddy module information.
 | |
| func (LeafFolderLoader) CaddyModule() caddy.ModuleInfo {
 | |
| 	return caddy.ModuleInfo{
 | |
| 		ID:  "tls.leaf_cert_loader.folder",
 | |
| 		New: func() caddy.Module { return new(LeafFolderLoader) },
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // Provision implements caddy.Provisioner.
 | |
| func (fl *LeafFolderLoader) Provision(ctx caddy.Context) error {
 | |
| 	repl, ok := ctx.Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
 | |
| 	if !ok {
 | |
| 		repl = caddy.NewReplacer()
 | |
| 	}
 | |
| 	for k, path := range fl.Folders {
 | |
| 		fl.Folders[k] = repl.ReplaceKnown(path, "")
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // LoadLeafCertificates loads all the leaf certificates in the directories
 | |
| // listed in fl from all files ending with .pem.
 | |
| func (fl LeafFolderLoader) LoadLeafCertificates() ([]*x509.Certificate, error) {
 | |
| 	var certs []*x509.Certificate
 | |
| 	for _, dir := range fl.Folders {
 | |
| 		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
 | |
| 			}
 | |
| 
 | |
| 			certData, err := convertPEMFilesToDERBytes(fpath)
 | |
| 			if err != nil {
 | |
| 				return err
 | |
| 			}
 | |
| 			cert, err := x509.ParseCertificate(certData)
 | |
| 			if err != nil {
 | |
| 				return fmt.Errorf("%s: %w", fpath, err)
 | |
| 			}
 | |
| 
 | |
| 			certs = append(certs, cert)
 | |
| 
 | |
| 			return nil
 | |
| 		})
 | |
| 		if err != nil {
 | |
| 			return nil, err
 | |
| 		}
 | |
| 	}
 | |
| 	return certs, nil
 | |
| }
 | |
| 
 | |
| var (
 | |
| 	_ LeafCertificateLoader = (*LeafFolderLoader)(nil)
 | |
| 	_ caddy.Provisioner     = (*LeafFolderLoader)(nil)
 | |
| )
 |