mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-03 06:16:10 +08:00
160d199999
Previous commit improved the Caddyfile adapter so it doesn't unnecessarily add names to "skip" in "auto_https" when the server is already HTTP-only. This commit updates the tests to reflect that change, while also fixing the Caddyfile formatting in many of the tests. We also print the line number of the divergence between input and formatted version in Caddyfile adapt warnings - very useful for finding initial formatting problems.
147 lines
4.4 KiB
Go
147 lines
4.4 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 (
|
|
"bytes"
|
|
"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
|
|
}
|
|
|
|
// lint check: see if input was properly formatted; sometimes messy files files parse
|
|
// successfully but result in logical errors (the Caddyfile is a bad format, I'm sorry)
|
|
if warning, different := formattingDifference(filename, body); different {
|
|
warnings = append(warnings, warning)
|
|
}
|
|
|
|
result, err := json.Marshal(cfg)
|
|
|
|
return result, warnings, err
|
|
}
|
|
|
|
// formattingDifference returns a warning and true if the formatted version
|
|
// is any different from the input; empty warning and false otherwise.
|
|
// TODO: also perform this check on imported files
|
|
func formattingDifference(filename string, body []byte) (caddyconfig.Warning, bool) {
|
|
formatted := Format(body)
|
|
if bytes.Equal(formatted, body) {
|
|
return caddyconfig.Warning{}, false
|
|
}
|
|
|
|
// find where the difference is
|
|
line := 1
|
|
for i, ch := range body {
|
|
if i >= len(formatted) || ch != formatted[i] {
|
|
break
|
|
}
|
|
if ch == '\n' {
|
|
line++
|
|
}
|
|
}
|
|
return caddyconfig.Warning{
|
|
File: filename,
|
|
Line: line,
|
|
Message: "input is not formatted with 'caddy fmt'",
|
|
}, true
|
|
}
|
|
|
|
// 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)
|
|
}
|
|
|
|
// UnmarshalModule instantiates a module with the given ID and invokes
|
|
// UnmarshalCaddyfile on the new value using the immediate next segment
|
|
// of d as input. In other words, d's next token should be the first
|
|
// token of the module's Caddyfile input.
|
|
//
|
|
// This function is used when the next segment of Caddyfile tokens
|
|
// belongs to another Caddy module. The returned value is often
|
|
// type-asserted to the module's associated type for practical use
|
|
// when setting up a config.
|
|
func UnmarshalModule(d *Dispenser, moduleID string) (Unmarshaler, error) {
|
|
mod, err := caddy.GetModule(moduleID)
|
|
if err != nil {
|
|
return nil, d.Errf("getting module named '%s': %v", moduleID, err)
|
|
}
|
|
inst := mod.New()
|
|
unm, ok := inst.(Unmarshaler)
|
|
if !ok {
|
|
return nil, d.Errf("module %s is not a Caddyfile unmarshaler; is %T", mod.ID, inst)
|
|
}
|
|
err = unm.UnmarshalCaddyfile(d.NewFromNextSegment())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return unm, nil
|
|
}
|
|
|
|
// Interface guard
|
|
var _ caddyconfig.Adapter = (*Adapter)(nil)
|