mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-23 22:27:38 -05:00
ac4fa2c3a9
These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
184 lines
4.1 KiB
Go
184 lines
4.1 KiB
Go
package caddyfile
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
const filename = "Caddyfile"
|
|
|
|
// ToJSON converts caddyfile to its JSON representation.
|
|
func ToJSON(caddyfile []byte) ([]byte, error) {
|
|
var j EncodedCaddyfile
|
|
|
|
serverBlocks, err := ServerBlocks(filename, bytes.NewReader(caddyfile), nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
for _, sb := range serverBlocks {
|
|
block := EncodedServerBlock{
|
|
Keys: sb.Keys,
|
|
Body: [][]interface{}{},
|
|
}
|
|
|
|
// Extract directives deterministically by sorting them
|
|
var directives = make([]string, len(sb.Tokens))
|
|
for dir := range sb.Tokens {
|
|
directives = append(directives, dir)
|
|
}
|
|
sort.Strings(directives)
|
|
|
|
// Convert each directive's tokens into our JSON structure
|
|
for _, dir := range directives {
|
|
disp := NewDispenserTokens(filename, sb.Tokens[dir])
|
|
for disp.Next() {
|
|
block.Body = append(block.Body, constructLine(&disp))
|
|
}
|
|
}
|
|
|
|
// tack this block onto the end of the list
|
|
j = append(j, block)
|
|
}
|
|
|
|
result, err := json.Marshal(j)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return result, nil
|
|
}
|
|
|
|
// constructLine transforms tokens into a JSON-encodable structure;
|
|
// but only one line at a time, to be used at the top-level of
|
|
// a server block only (where the first token on each line is a
|
|
// directive) - not to be used at any other nesting level.
|
|
func constructLine(d *Dispenser) []interface{} {
|
|
var args []interface{}
|
|
|
|
args = append(args, d.Val())
|
|
|
|
for d.NextArg() {
|
|
if d.Val() == "{" {
|
|
args = append(args, constructBlock(d))
|
|
continue
|
|
}
|
|
args = append(args, d.Val())
|
|
}
|
|
|
|
return args
|
|
}
|
|
|
|
// constructBlock recursively processes tokens into a
|
|
// JSON-encodable structure. To be used in a directive's
|
|
// block. Goes to end of block.
|
|
func constructBlock(d *Dispenser) [][]interface{} {
|
|
block := [][]interface{}{}
|
|
|
|
for d.Next() {
|
|
if d.Val() == "}" {
|
|
break
|
|
}
|
|
block = append(block, constructLine(d))
|
|
}
|
|
|
|
return block
|
|
}
|
|
|
|
// FromJSON converts JSON-encoded jsonBytes to Caddyfile text
|
|
func FromJSON(jsonBytes []byte) ([]byte, error) {
|
|
var j EncodedCaddyfile
|
|
var result string
|
|
|
|
err := json.Unmarshal(jsonBytes, &j)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
for sbPos, sb := range j {
|
|
if sbPos > 0 {
|
|
result += "\n\n"
|
|
}
|
|
for i, key := range sb.Keys {
|
|
if i > 0 {
|
|
result += ", "
|
|
}
|
|
//result += standardizeScheme(key)
|
|
result += key
|
|
}
|
|
result += jsonToText(sb.Body, 1)
|
|
}
|
|
|
|
return []byte(result), nil
|
|
}
|
|
|
|
// jsonToText recursively transforms a scope of JSON into plain
|
|
// Caddyfile text.
|
|
func jsonToText(scope interface{}, depth int) string {
|
|
var result string
|
|
|
|
switch val := scope.(type) {
|
|
case string:
|
|
if strings.ContainsAny(val, "\" \n\t\r") {
|
|
result += `"` + strings.Replace(val, "\"", "\\\"", -1) + `"`
|
|
} else {
|
|
result += val
|
|
}
|
|
case int:
|
|
result += strconv.Itoa(val)
|
|
case float64:
|
|
result += fmt.Sprintf("%v", val)
|
|
case bool:
|
|
result += fmt.Sprintf("%t", val)
|
|
case [][]interface{}:
|
|
result += " {\n"
|
|
for _, arg := range val {
|
|
result += strings.Repeat("\t", depth) + jsonToText(arg, depth+1) + "\n"
|
|
}
|
|
result += strings.Repeat("\t", depth-1) + "}"
|
|
case []interface{}:
|
|
for i, v := range val {
|
|
if block, ok := v.([]interface{}); ok {
|
|
result += "{\n"
|
|
for _, arg := range block {
|
|
result += strings.Repeat("\t", depth) + jsonToText(arg, depth+1) + "\n"
|
|
}
|
|
result += strings.Repeat("\t", depth-1) + "}"
|
|
continue
|
|
}
|
|
result += jsonToText(v, depth)
|
|
if i < len(val)-1 {
|
|
result += " "
|
|
}
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// TODO: Will this function come in handy somewhere else?
|
|
/*
|
|
// standardizeScheme turns an address like host:https into https://host,
|
|
// or "host:" into "host".
|
|
func standardizeScheme(addr string) string {
|
|
if hostname, port, err := net.SplitHostPort(addr); err == nil {
|
|
if port == "http" || port == "https" {
|
|
addr = port + "://" + hostname
|
|
}
|
|
}
|
|
return strings.TrimSuffix(addr, ":")
|
|
}
|
|
*/
|
|
|
|
// EncodedCaddyfile encapsulates a slice of EncodedServerBlocks.
|
|
type EncodedCaddyfile []EncodedServerBlock
|
|
|
|
// EncodedServerBlock represents a server block ripe for encoding.
|
|
type EncodedServerBlock struct {
|
|
Keys []string `json:"keys"`
|
|
Body [][]interface{} `json:"body"`
|
|
}
|