mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-16 17:43:37 +08:00
3ae07a73dc
* 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>
77 lines
2.2 KiB
Go
77 lines
2.2 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"
|
|
|
|
"github.com/caddyserver/caddy/v2"
|
|
)
|
|
|
|
func init() {
|
|
caddy.RegisterModule(LeafPEMLoader{})
|
|
}
|
|
|
|
// LeafPEMLoader loads leaf certificates by
|
|
// decoding their PEM blocks directly. This has the advantage
|
|
// of not needing to store them on disk at all.
|
|
type LeafPEMLoader struct {
|
|
Certificates []string `json:"certificates,omitempty"`
|
|
}
|
|
|
|
// Provision implements caddy.Provisioner.
|
|
func (pl *LeafPEMLoader) Provision(ctx caddy.Context) error {
|
|
repl, ok := ctx.Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
|
|
if !ok {
|
|
repl = caddy.NewReplacer()
|
|
}
|
|
for i, cert := range pl.Certificates {
|
|
pl.Certificates[i] = repl.ReplaceKnown(cert, "")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// CaddyModule returns the Caddy module information.
|
|
func (LeafPEMLoader) CaddyModule() caddy.ModuleInfo {
|
|
return caddy.ModuleInfo{
|
|
ID: "tls.leaf_cert_loader.pem",
|
|
New: func() caddy.Module { return new(LeafPEMLoader) },
|
|
}
|
|
}
|
|
|
|
// LoadLeafCertificates returns the certificates contained in pl.
|
|
func (pl LeafPEMLoader) LoadLeafCertificates() ([]*x509.Certificate, error) {
|
|
certs := make([]*x509.Certificate, 0, len(pl.Certificates))
|
|
for i, cert := range pl.Certificates {
|
|
derBytes, err := convertPEMToDER([]byte(cert))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("PEM leaf certificate loader, cert %d: %v", i, err)
|
|
}
|
|
cert, err := x509.ParseCertificate(derBytes)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("PEM cert %d: %v", i, err)
|
|
}
|
|
certs = append(certs, cert)
|
|
}
|
|
return certs, nil
|
|
}
|
|
|
|
// Interface guard
|
|
var (
|
|
_ LeafCertificateLoader = (*LeafPEMLoader)(nil)
|
|
_ caddy.Provisioner = (*LeafPEMLoader)(nil)
|
|
)
|