mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-16 21:56:40 -05:00
6ca5828221
Certificate selection used to be a module, but this seems unnecessary, especially since the built-in CustomSelectionPolicy allows quite complex selection logic on a number of fields in certs. If we need to extend that logic, we can, but I don't think there are SO many possibilities that we need modules. This update also allows certificate selection to choose between multiple matching certs based on client compatibility and makes a number of other improvements in the default cert selection logic, both here and in the latest CertMagic. The hardest part of this was the conn policy consolidation logic (Caddyfile only, of course). We have to merge connection policies that we can easily combine, because if two certs are manually loaded in a Caddyfile site block, that produces two connection policies, and each cert is tagged with a different tag, meaning only the first would ever be selected. So given the same matchers, we can merge the two, but this required improving the Tag selection logic to support multiple tags to choose from, hence "tags" changed to "any_tag" or "all_tags" (but we use any_tag in our Caddyfile logic). Combining conn policies with conflicting settings is impossible, so that should return an error if two policies with the exact same matchers have non-empty settings that are not the same (the one exception being any_tag which we can merge because the logic for them is to OR them). It was a bit complicated. It seems to work in numerous tests I've conducted, but we'll see how it pans out in the release candidates.
91 lines
2.6 KiB
Go
91 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 caddyfile
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/caddyserver/caddy/v2"
|
|
"github.com/caddyserver/caddy/v2/caddyconfig"
|
|
)
|
|
|
|
// Adapter adapts Caddyfile to Caddy JSON.
|
|
type Adapter struct {
|
|
ServerType ServerType
|
|
}
|
|
|
|
// Adapt converts the Caddyfile config in body to Caddy JSON.
|
|
func (a Adapter) Adapt(body []byte, options map[string]interface{}) ([]byte, []caddyconfig.Warning, error) {
|
|
if a.ServerType == nil {
|
|
return nil, nil, fmt.Errorf("no server type")
|
|
}
|
|
if options == nil {
|
|
options = make(map[string]interface{})
|
|
}
|
|
|
|
filename, _ := options["filename"].(string)
|
|
if filename == "" {
|
|
filename = "Caddyfile"
|
|
}
|
|
|
|
serverBlocks, err := Parse(filename, body)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
cfg, warnings, err := a.ServerType.Setup(serverBlocks, options)
|
|
if err != nil {
|
|
return nil, warnings, err
|
|
}
|
|
|
|
marshalFunc := json.Marshal
|
|
if options["pretty"] == "true" {
|
|
marshalFunc = caddyconfig.JSONIndent
|
|
}
|
|
result, err := marshalFunc(cfg)
|
|
|
|
return result, warnings, err
|
|
}
|
|
|
|
// Unmarshaler is a type that can unmarshal
|
|
// Caddyfile tokens to set itself up for a
|
|
// JSON encoding. The goal of an unmarshaler
|
|
// is not to set itself up for actual use,
|
|
// but to set itself up for being marshaled
|
|
// into JSON. Caddyfile-unmarshaled values
|
|
// will not be used directly; they will be
|
|
// encoded as JSON and then used from that.
|
|
// Implementations must be able to support
|
|
// multiple segments (instances of their
|
|
// directive or batch of tokens); typically
|
|
// this means wrapping all token logic in
|
|
// a loop: `for d.Next() { ... }`.
|
|
type Unmarshaler interface {
|
|
UnmarshalCaddyfile(d *Dispenser) error
|
|
}
|
|
|
|
// ServerType is a type that can evaluate a Caddyfile and set up a caddy config.
|
|
type ServerType interface {
|
|
// Setup takes the server blocks which
|
|
// contain tokens, as well as options
|
|
// (e.g. CLI flags) and creates a Caddy
|
|
// config, along with any warnings or
|
|
// an error.
|
|
Setup([]ServerBlock, map[string]interface{}) (*caddy.Config, []caddyconfig.Warning, error)
|
|
}
|
|
|
|
// Interface guard
|
|
var _ caddyconfig.Adapter = (*Adapter)(nil)
|