Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

httpcaddyfile: Get rid of 'tls off' parameter; probably not useful

Browse source
This commit is contained in:
Matthew Holt 2020-01-22 09:24:49 -07:00
parent aad9f90cad
commit 5d3ccf1eb7
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
caddyconfig/httpcaddyfile/builtins.go
View file

@ -20,6 +20,7 @@ import (
"html" "html"
"net/http" "net/http"
"reflect" "reflect"
"strings"
"github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig" "github.com/caddyserver/caddy/v2/caddyconfig"
@ -80,6 +81,17 @@ func parseRoot(h Helper) ([]ConfigValue, error) {
return []ConfigValue{{Class: "route", Value: route}}, nil return []ConfigValue{{Class: "route", Value: route}}, nil
} }
// parseTLS parses the tls directive. Syntax:
//
// tls [<email>]|[<cert_file> <key_file>] {
// protocols <min> [<max>]
// ciphers <cipher_suites...>
// curves <curves...>
// alpn <values...>
// load <paths...>
// ca <acme_ca_endpoint>
// }
//
func parseTLS(h Helper) ([]ConfigValue, error) { func parseTLS(h Helper) ([]ConfigValue, error) {
var configVals []ConfigValue var configVals []ConfigValue
@ -87,7 +99,6 @@ func parseTLS(h Helper) ([]ConfigValue, error) {
var fileLoader caddytls.FileLoader var fileLoader caddytls.FileLoader
var folderLoader caddytls.FolderLoader var folderLoader caddytls.FolderLoader
var mgr caddytls.ACMEManagerMaker var mgr caddytls.ACMEManagerMaker
var off bool
// fill in global defaults, if configured // fill in global defaults, if configured
if email := h.Option("email"); email != nil { if email := h.Option("email"); email != nil {
@ -103,16 +114,15 @@ func parseTLS(h Helper) ([]ConfigValue, error) {
switch len(firstLine) { switch len(firstLine) {
case 0: case 0:
case 1: case 1:
if firstLine[0] == "off" { if !strings.Contains(firstLine[0], "@") {
off = true return nil, h.Err("single argument must be an email address")
} else {
mgr.Email = firstLine[0]
} }
mgr.Email = firstLine[0]
case 2: case 2:
fileLoader = append(fileLoader, caddytls.CertKeyFilePair{ fileLoader = append(fileLoader, caddytls.CertKeyFilePair{
Certificate: firstLine[0], Certificate: firstLine[0],
Key: firstLine[1], Key: firstLine[1],
// TODO: add tags, for enterprise module's certificate selection // TODO: add tags, to ensure this certificate is always used for this server name
}) })
default: default:
return nil, h.ArgErr() return nil, h.ArgErr()
@ -231,12 +241,7 @@ func parseTLS(h Helper) ([]ConfigValue, error) {
} }
// automation policy // automation policy
if off { if !reflect.DeepEqual(mgr, caddytls.ACMEManagerMaker{}) {
configVals = append(configVals, ConfigValue{
Class: "tls.off",
Value: true,
})
} else if !reflect.DeepEqual(mgr, caddytls.ACMEManagerMaker{}) {
configVals = append(configVals, ConfigValue{ configVals = append(configVals, ConfigValue{
Class: "tls.automation_manager", Class: "tls.automation_manager",
Value: mgr, Value: mgr,