2019-08-09 13:05:47 -05:00
// 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 httpcaddyfile
import (
2020-06-05 13:19:36 -05:00
"encoding/base64"
"encoding/pem"
2019-08-09 13:05:47 -05:00
"fmt"
"html"
2020-06-05 13:19:36 -05:00
"io/ioutil"
2019-08-09 13:05:47 -05:00
"net/http"
2019-08-21 11:46:35 -05:00
"reflect"
2020-01-22 11:24:49 -05:00
"strings"
2019-08-09 13:05:47 -05:00
2019-12-10 15:36:46 -05:00
"github.com/caddyserver/caddy/v2"
2019-08-22 13:26:48 -05:00
"github.com/caddyserver/caddy/v2/caddyconfig"
2020-02-26 00:00:33 -05:00
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
2019-08-22 13:26:48 -05:00
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
2019-08-09 13:05:47 -05:00
"github.com/caddyserver/caddy/v2/modules/caddytls"
caddytls: Add support for ZeroSSL; add Caddyfile support for issuers (#3633)
* caddytls: Add support for ZeroSSL; add Caddyfile support for issuers
Configuring issuers explicitly in a Caddyfile is not easily compatible
with existing ACME-specific parameters such as email or acme_ca which
infer the kind of issuer it creates (this is complicated now because
the ZeroSSL issuer wraps the ACME issuer)... oh well, we can revisit
that later if we need to.
New Caddyfile global option:
{
cert_issuer <name> ...
}
Or, alternatively, as a tls subdirective:
tls {
issuer <name> ...
}
For example, to use ZeroSSL with an API key:
{
cert_issuser zerossl API_KEY
}
For now, that still uses ZeroSSL's ACME endpoint; it fetches EAB
credentials for you. You can also provide the EAB credentials directly
just like any other ACME endpoint:
{
cert_issuer acme {
eab KEY_ID MAC_KEY
}
}
All these examples use the new global option (or tls subdirective). You
can still use traditional/existing options with ZeroSSL, since it's
just another ACME endpoint:
{
acme_ca https://acme.zerossl.com/v2/DV90
acme_eab KEY_ID MAC_KEY
}
That's all there is to it. You just can't mix-and-match acme_* options
with cert_issuer, because it becomes confusing/ambiguous/complicated to
merge the settings.
* Fix broken test
This test was asserting buggy behavior, oops - glad this branch both
discovers and fixes the bug at the same time!
* Fix broken test (post-merge)
* Update modules/caddytls/acmeissuer.go
Fix godoc comment
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
* Add support for ZeroSSL's EAB-by-email endpoint
Also transform the ACMEIssuer into ZeroSSLIssuer implicitly if set to
the ZeroSSL endpoint without EAB (the ZeroSSLIssuer is needed to
generate EAB if not already provided); this is now possible with either
an API key or an email address.
* go.mod: Use latest certmagic, acmez, and x/net
* Wrap underlying logic rather than repeating it
Oops, duh
* Form-encode email info into request body for EAB endpoint
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
2020-08-11 09:58:06 -05:00
"github.com/caddyserver/certmagic"
2020-07-30 16:18:14 -05:00
"github.com/mholt/acmez/acme"
2020-02-26 00:00:33 -05:00
"go.uber.org/zap/zapcore"
2019-08-09 13:05:47 -05:00
)
2019-08-21 11:46:35 -05:00
func init ( ) {
RegisterDirective ( "bind" , parseBind )
RegisterDirective ( "tls" , parseTLS )
2020-03-20 13:50:36 -05:00
RegisterHandlerDirective ( "root" , parseRoot )
2019-08-21 11:46:35 -05:00
RegisterHandlerDirective ( "redir" , parseRedir )
2019-09-16 12:04:18 -05:00
RegisterHandlerDirective ( "respond" , parseRespond )
2020-01-09 16:00:32 -05:00
RegisterHandlerDirective ( "route" , parseRoute )
2020-02-28 15:38:12 -05:00
RegisterHandlerDirective ( "handle" , parseHandle )
2020-02-17 00:24:20 -05:00
RegisterDirective ( "handle_errors" , parseHandleErrors )
2020-02-26 00:00:33 -05:00
RegisterDirective ( "log" , parseLog )
2019-08-21 11:46:35 -05:00
}
2019-08-09 13:05:47 -05:00
2020-01-22 11:32:38 -05:00
// parseBind parses the bind directive. Syntax:
//
// bind <addresses...>
//
2019-08-21 11:46:35 -05:00
func parseBind ( h Helper ) ( [ ] ConfigValue , error ) {
var lnHosts [ ] string
for h . Next ( ) {
lnHosts = append ( lnHosts , h . RemainingArgs ( ) ... )
2019-08-09 13:05:47 -05:00
}
2019-08-21 11:46:35 -05:00
return h . NewBindAddresses ( lnHosts ) , nil
2019-08-09 13:05:47 -05:00
}
2020-01-22 11:24:49 -05:00
// parseTLS parses the tls directive. Syntax:
//
2020-03-13 12:06:08 -05:00
// tls [<email>|internal]|[<cert_file> <key_file>] {
2020-01-22 11:24:49 -05:00
// protocols <min> [<max>]
// ciphers <cipher_suites...>
// curves <curves...>
2020-06-05 13:19:36 -05:00
// client_auth {
// mode [request|require|verify_if_given|require_and_verify]
// trusted_ca_cert <base64_der>
// trusted_ca_cert_file <filename>
// trusted_leaf_cert <base64_der>
// trusted_leaf_cert_file <filename>
// }
2020-01-22 11:24:49 -05:00
// alpn <values...>
// load <paths...>
// ca <acme_ca_endpoint>
2020-03-18 16:51:31 -05:00
// ca_root <pem_file>
2020-10-02 15:23:40 -05:00
// dns <provider_name> [...]
2020-03-17 22:00:45 -05:00
// on_demand
2020-08-11 12:26:19 -05:00
// eab <key_id> <mac_key>
2020-10-02 15:23:40 -05:00
// issuer <module_name> [...]
2020-01-22 11:24:49 -05:00
// }
//
2019-08-21 11:46:35 -05:00
func parseTLS ( h Helper ) ( [ ] ConfigValue , error ) {
2020-03-17 22:00:45 -05:00
cp := new ( caddytls . ConnectionPolicy )
2019-08-09 13:05:47 -05:00
var fileLoader caddytls . FileLoader
var folderLoader caddytls . FolderLoader
caddytls: Refactor certificate selection policies (close #1575)
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.
2020-04-01 21:49:35 -05:00
var certSelector caddytls . CustomCertSelectionPolicy
2020-03-13 12:06:08 -05:00
var acmeIssuer * caddytls . ACMEIssuer
var internalIssuer * caddytls . InternalIssuer
2020-11-16 13:05:55 -05:00
var issuers [ ] certmagic . Issuer
2020-03-17 22:00:45 -05:00
var onDemand bool
2019-09-30 10:11:30 -05:00
2019-08-21 11:46:35 -05:00
for h . Next ( ) {
// file certificate loader
firstLine := h . RemainingArgs ( )
switch len ( firstLine ) {
case 0 :
case 1 :
2020-03-13 12:06:08 -05:00
if firstLine [ 0 ] == "internal" {
internalIssuer = new ( caddytls . InternalIssuer )
} else if ! strings . Contains ( firstLine [ 0 ] , "@" ) {
return nil , h . Err ( "single argument must either be 'internal' or an email address" )
} else {
if acmeIssuer == nil {
acmeIssuer = new ( caddytls . ACMEIssuer )
}
acmeIssuer . Email = firstLine [ 0 ]
2019-08-21 11:46:35 -05:00
}
2020-03-13 12:06:08 -05:00
2019-08-21 11:46:35 -05:00
case 2 :
httpcaddyfile: tls: Load repeated cert files only once, with one tag
See end of issue #3004. Loading the same certificate file multiple times
with different tags will result in it being de-duplicated in the in-
memory cache, because of course they all have the same bytes. This
meant that any certs of the same filename loaded with different tags
would be overwritten by the next certificate of the same filename, and
any conn policies looking for the tags of the previous ones would never
find them, causing connections to fail.
So, now we remember cert filenames and their tags, instead of loading
them multiple times and overwriting previous ones.
A user crafting their own JSON might make this error too... maybe we
won't see it happen. But if it does, one possibility is, when loading
a duplicate cert, instead of discarding it completely, merge the tag
list into the one that's already stored in the cache, then discard.
2020-02-20 12:18:29 -05:00
certFilename := firstLine [ 0 ]
keyFilename := firstLine [ 1 ]
2020-02-06 14:55:26 -05:00
// tag this certificate so if multiple certs match, specifically
// this one that the user has provided will be used, see #2588:
httpcaddyfile: tls: Load repeated cert files only once, with one tag
See end of issue #3004. Loading the same certificate file multiple times
with different tags will result in it being de-duplicated in the in-
memory cache, because of course they all have the same bytes. This
meant that any certs of the same filename loaded with different tags
would be overwritten by the next certificate of the same filename, and
any conn policies looking for the tags of the previous ones would never
find them, causing connections to fail.
So, now we remember cert filenames and their tags, instead of loading
them multiple times and overwriting previous ones.
A user crafting their own JSON might make this error too... maybe we
won't see it happen. But if it does, one possibility is, when loading
a duplicate cert, instead of discarding it completely, merge the tag
list into the one that's already stored in the cache, then discard.
2020-02-20 12:18:29 -05:00
// https://github.com/caddyserver/caddy/issues/2588 ... but we
// must be careful about how we do this; being careless will
// lead to failed handshakes
2020-03-13 12:06:08 -05:00
//
httpcaddyfile: tls: Load repeated cert files only once, with one tag
See end of issue #3004. Loading the same certificate file multiple times
with different tags will result in it being de-duplicated in the in-
memory cache, because of course they all have the same bytes. This
meant that any certs of the same filename loaded with different tags
would be overwritten by the next certificate of the same filename, and
any conn policies looking for the tags of the previous ones would never
find them, causing connections to fail.
So, now we remember cert filenames and their tags, instead of loading
them multiple times and overwriting previous ones.
A user crafting their own JSON might make this error too... maybe we
won't see it happen. But if it does, one possibility is, when loading
a duplicate cert, instead of discarding it completely, merge the tag
list into the one that's already stored in the cache, then discard.
2020-02-20 12:18:29 -05:00
// we need to remember which cert files we've seen, since we
// must load each cert only once; otherwise, they each get a
// different tag... since a cert loaded twice has the same
// bytes, it will overwrite the first one in the cache, and
// only the last cert (and its tag) will survive, so a any conn
// policy that is looking for any tag but the last one to be
// loaded won't find it, and TLS handshakes will fail (see end)
// of issue #3004)
2020-03-13 12:06:08 -05:00
//
2020-03-04 11:58:49 -05:00
// tlsCertTags maps certificate filenames to their tag.
// This is used to remember which tag is used for each
// certificate files, since we need to avoid loading
// the same certificate files more than once, overwriting
// previous tags
tlsCertTags , ok := h . State [ "tlsCertTags" ] . ( map [ string ] string )
if ! ok {
tlsCertTags = make ( map [ string ] string )
h . State [ "tlsCertTags" ] = tlsCertTags
}
httpcaddyfile: tls: Load repeated cert files only once, with one tag
See end of issue #3004. Loading the same certificate file multiple times
with different tags will result in it being de-duplicated in the in-
memory cache, because of course they all have the same bytes. This
meant that any certs of the same filename loaded with different tags
would be overwritten by the next certificate of the same filename, and
any conn policies looking for the tags of the previous ones would never
find them, causing connections to fail.
So, now we remember cert filenames and their tags, instead of loading
them multiple times and overwriting previous ones.
A user crafting their own JSON might make this error too... maybe we
won't see it happen. But if it does, one possibility is, when loading
a duplicate cert, instead of discarding it completely, merge the tag
list into the one that's already stored in the cache, then discard.
2020-02-20 12:18:29 -05:00
tag , ok := tlsCertTags [ certFilename ]
if ! ok {
// haven't seen this cert file yet, let's give it a tag
// and add a loader for it
tag = fmt . Sprintf ( "cert%d" , len ( tlsCertTags ) )
fileLoader = append ( fileLoader , caddytls . CertKeyFilePair {
Certificate : certFilename ,
Key : keyFilename ,
Tags : [ ] string { tag } ,
} )
// remember this for next time we see this cert file
tlsCertTags [ certFilename ] = tag
}
caddytls: Refactor certificate selection policies (close #1575)
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.
2020-04-01 21:49:35 -05:00
certSelector . AnyTag = append ( certSelector . AnyTag , tag )
2019-08-21 11:46:35 -05:00
default :
return nil , h . ArgErr ( )
2019-08-09 13:05:47 -05:00
}
2019-08-21 11:46:35 -05:00
var hasBlock bool
2020-06-05 13:19:36 -05:00
for nesting := h . Nesting ( ) ; h . NextBlock ( nesting ) ; {
2019-08-21 11:46:35 -05:00
hasBlock = true
2019-08-09 13:05:47 -05:00
2019-08-21 11:46:35 -05:00
switch h . Val ( ) {
2019-08-09 13:05:47 -05:00
case "protocols" :
2019-08-21 11:46:35 -05:00
args := h . RemainingArgs ( )
2019-08-09 13:05:47 -05:00
if len ( args ) == 0 {
2019-08-21 11:46:35 -05:00
return nil , h . SyntaxErr ( "one or two protocols" )
2019-08-09 13:05:47 -05:00
}
if len ( args ) > 0 {
if _ , ok := caddytls . SupportedProtocols [ args [ 0 ] ] ; ! ok {
2019-08-21 11:46:35 -05:00
return nil , h . Errf ( "Wrong protocol name or protocol not supported: '%s'" , args [ 0 ] )
2019-08-09 13:05:47 -05:00
}
cp . ProtocolMin = args [ 0 ]
}
if len ( args ) > 1 {
if _ , ok := caddytls . SupportedProtocols [ args [ 1 ] ] ; ! ok {
2019-08-21 11:46:35 -05:00
return nil , h . Errf ( "Wrong protocol name or protocol not supported: '%s'" , args [ 1 ] )
2019-08-09 13:05:47 -05:00
}
cp . ProtocolMax = args [ 1 ]
}
2020-03-17 22:00:45 -05:00
2019-08-09 13:05:47 -05:00
case "ciphers" :
2019-08-21 11:46:35 -05:00
for h . NextArg ( ) {
2020-04-01 15:09:29 -05:00
if ! caddytls . CipherSuiteNameSupported ( h . Val ( ) ) {
2019-08-21 11:46:35 -05:00
return nil , h . Errf ( "Wrong cipher suite name or cipher suite not supported: '%s'" , h . Val ( ) )
2019-08-09 13:05:47 -05:00
}
2019-08-21 11:46:35 -05:00
cp . CipherSuites = append ( cp . CipherSuites , h . Val ( ) )
2019-08-09 13:05:47 -05:00
}
2020-03-17 22:00:45 -05:00
2019-08-09 13:05:47 -05:00
case "curves" :
2019-08-21 11:46:35 -05:00
for h . NextArg ( ) {
if _ , ok := caddytls . SupportedCurves [ h . Val ( ) ] ; ! ok {
return nil , h . Errf ( "Wrong curve name or curve not supported: '%s'" , h . Val ( ) )
2019-08-09 13:05:47 -05:00
}
2019-08-21 11:46:35 -05:00
cp . Curves = append ( cp . Curves , h . Val ( ) )
2019-08-09 13:05:47 -05:00
}
2020-03-17 22:00:45 -05:00
2020-06-05 13:19:36 -05:00
case "client_auth" :
cp . ClientAuthentication = & caddytls . ClientAuthentication { }
for nesting := h . Nesting ( ) ; h . NextBlock ( nesting ) ; {
subdir := h . Val ( )
switch subdir {
case "mode" :
if ! h . Args ( & cp . ClientAuthentication . Mode ) {
return nil , h . ArgErr ( )
}
if h . NextArg ( ) {
return nil , h . ArgErr ( )
}
case "trusted_ca_cert" ,
"trusted_leaf_cert" :
if ! h . NextArg ( ) {
return nil , h . ArgErr ( )
}
if subdir == "trusted_ca_cert" {
cp . ClientAuthentication . TrustedCACerts = append ( cp . ClientAuthentication . TrustedCACerts , h . Val ( ) )
} else {
cp . ClientAuthentication . TrustedLeafCerts = append ( cp . ClientAuthentication . TrustedLeafCerts , h . Val ( ) )
}
case "trusted_ca_cert_file" ,
"trusted_leaf_cert_file" :
if ! h . NextArg ( ) {
return nil , h . ArgErr ( )
}
filename := h . Val ( )
certDataPEM , err := ioutil . ReadFile ( filename )
if err != nil {
return nil , err
}
block , _ := pem . Decode ( certDataPEM )
if block == nil || block . Type != "CERTIFICATE" {
return nil , h . Errf ( "no CERTIFICATE pem block found in %s" , h . Val ( ) )
}
if subdir == "trusted_ca_cert_file" {
cp . ClientAuthentication . TrustedCACerts = append ( cp . ClientAuthentication . TrustedCACerts ,
base64 . StdEncoding . EncodeToString ( block . Bytes ) )
} else {
cp . ClientAuthentication . TrustedLeafCerts = append ( cp . ClientAuthentication . TrustedLeafCerts ,
base64 . StdEncoding . EncodeToString ( block . Bytes ) )
}
default :
return nil , h . Errf ( "unknown subdirective for client_auth: %s" , subdir )
}
}
2019-08-09 13:05:47 -05:00
case "alpn" :
2019-08-21 11:46:35 -05:00
args := h . RemainingArgs ( )
2019-08-09 13:05:47 -05:00
if len ( args ) == 0 {
2019-08-21 11:46:35 -05:00
return nil , h . ArgErr ( )
2019-08-09 13:05:47 -05:00
}
cp . ALPN = args
2019-08-21 11:46:35 -05:00
case "load" :
folderLoader = append ( folderLoader , h . RemainingArgs ( ) ... )
case "ca" :
arg := h . RemainingArgs ( )
if len ( arg ) != 1 {
return nil , h . ArgErr ( )
}
2020-03-13 12:06:08 -05:00
if acmeIssuer == nil {
acmeIssuer = new ( caddytls . ACMEIssuer )
}
acmeIssuer . CA = arg [ 0 ]
2019-08-21 11:46:35 -05:00
2020-07-30 16:18:14 -05:00
case "eab" :
arg := h . RemainingArgs ( )
if len ( arg ) != 2 {
return nil , h . ArgErr ( )
}
if acmeIssuer == nil {
acmeIssuer = new ( caddytls . ACMEIssuer )
}
acmeIssuer . ExternalAccount = & acme . EAB {
KeyID : arg [ 0 ] ,
MACKey : arg [ 1 ] ,
}
caddytls: Add support for ZeroSSL; add Caddyfile support for issuers (#3633)
* caddytls: Add support for ZeroSSL; add Caddyfile support for issuers
Configuring issuers explicitly in a Caddyfile is not easily compatible
with existing ACME-specific parameters such as email or acme_ca which
infer the kind of issuer it creates (this is complicated now because
the ZeroSSL issuer wraps the ACME issuer)... oh well, we can revisit
that later if we need to.
New Caddyfile global option:
{
cert_issuer <name> ...
}
Or, alternatively, as a tls subdirective:
tls {
issuer <name> ...
}
For example, to use ZeroSSL with an API key:
{
cert_issuser zerossl API_KEY
}
For now, that still uses ZeroSSL's ACME endpoint; it fetches EAB
credentials for you. You can also provide the EAB credentials directly
just like any other ACME endpoint:
{
cert_issuer acme {
eab KEY_ID MAC_KEY
}
}
All these examples use the new global option (or tls subdirective). You
can still use traditional/existing options with ZeroSSL, since it's
just another ACME endpoint:
{
acme_ca https://acme.zerossl.com/v2/DV90
acme_eab KEY_ID MAC_KEY
}
That's all there is to it. You just can't mix-and-match acme_* options
with cert_issuer, because it becomes confusing/ambiguous/complicated to
merge the settings.
* Fix broken test
This test was asserting buggy behavior, oops - glad this branch both
discovers and fixes the bug at the same time!
* Fix broken test (post-merge)
* Update modules/caddytls/acmeissuer.go
Fix godoc comment
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
* Add support for ZeroSSL's EAB-by-email endpoint
Also transform the ACMEIssuer into ZeroSSLIssuer implicitly if set to
the ZeroSSL endpoint without EAB (the ZeroSSLIssuer is needed to
generate EAB if not already provided); this is now possible with either
an API key or an email address.
* go.mod: Use latest certmagic, acmez, and x/net
* Wrap underlying logic rather than repeating it
Oops, duh
* Form-encode email info into request body for EAB endpoint
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
2020-08-11 09:58:06 -05:00
case "issuer" :
if ! h . NextArg ( ) {
return nil , h . ArgErr ( )
}
modName := h . Val ( )
mod , err := caddy . GetModule ( "tls.issuance." + modName )
if err != nil {
return nil , h . Errf ( "getting issuer module '%s': %v" , modName , err )
}
unm , ok := mod . New ( ) . ( caddyfile . Unmarshaler )
if ! ok {
return nil , h . Errf ( "issuer module '%s' is not a Caddyfile unmarshaler" , mod . ID )
}
err = unm . UnmarshalCaddyfile ( h . NewFromNextSegment ( ) )
if err != nil {
return nil , err
}
2020-11-16 13:05:55 -05:00
issuer , ok := unm . ( certmagic . Issuer )
caddytls: Add support for ZeroSSL; add Caddyfile support for issuers (#3633)
* caddytls: Add support for ZeroSSL; add Caddyfile support for issuers
Configuring issuers explicitly in a Caddyfile is not easily compatible
with existing ACME-specific parameters such as email or acme_ca which
infer the kind of issuer it creates (this is complicated now because
the ZeroSSL issuer wraps the ACME issuer)... oh well, we can revisit
that later if we need to.
New Caddyfile global option:
{
cert_issuer <name> ...
}
Or, alternatively, as a tls subdirective:
tls {
issuer <name> ...
}
For example, to use ZeroSSL with an API key:
{
cert_issuser zerossl API_KEY
}
For now, that still uses ZeroSSL's ACME endpoint; it fetches EAB
credentials for you. You can also provide the EAB credentials directly
just like any other ACME endpoint:
{
cert_issuer acme {
eab KEY_ID MAC_KEY
}
}
All these examples use the new global option (or tls subdirective). You
can still use traditional/existing options with ZeroSSL, since it's
just another ACME endpoint:
{
acme_ca https://acme.zerossl.com/v2/DV90
acme_eab KEY_ID MAC_KEY
}
That's all there is to it. You just can't mix-and-match acme_* options
with cert_issuer, because it becomes confusing/ambiguous/complicated to
merge the settings.
* Fix broken test
This test was asserting buggy behavior, oops - glad this branch both
discovers and fixes the bug at the same time!
* Fix broken test (post-merge)
* Update modules/caddytls/acmeissuer.go
Fix godoc comment
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
* Add support for ZeroSSL's EAB-by-email endpoint
Also transform the ACMEIssuer into ZeroSSLIssuer implicitly if set to
the ZeroSSL endpoint without EAB (the ZeroSSLIssuer is needed to
generate EAB if not already provided); this is now possible with either
an API key or an email address.
* go.mod: Use latest certmagic, acmez, and x/net
* Wrap underlying logic rather than repeating it
Oops, duh
* Form-encode email info into request body for EAB endpoint
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
2020-08-11 09:58:06 -05:00
if ! ok {
return nil , h . Errf ( "module %s is not a certmagic.Issuer" , mod . ID )
}
2020-11-16 13:05:55 -05:00
issuers = append ( issuers , issuer )
caddytls: Add support for ZeroSSL; add Caddyfile support for issuers (#3633)
* caddytls: Add support for ZeroSSL; add Caddyfile support for issuers
Configuring issuers explicitly in a Caddyfile is not easily compatible
with existing ACME-specific parameters such as email or acme_ca which
infer the kind of issuer it creates (this is complicated now because
the ZeroSSL issuer wraps the ACME issuer)... oh well, we can revisit
that later if we need to.
New Caddyfile global option:
{
cert_issuer <name> ...
}
Or, alternatively, as a tls subdirective:
tls {
issuer <name> ...
}
For example, to use ZeroSSL with an API key:
{
cert_issuser zerossl API_KEY
}
For now, that still uses ZeroSSL's ACME endpoint; it fetches EAB
credentials for you. You can also provide the EAB credentials directly
just like any other ACME endpoint:
{
cert_issuer acme {
eab KEY_ID MAC_KEY
}
}
All these examples use the new global option (or tls subdirective). You
can still use traditional/existing options with ZeroSSL, since it's
just another ACME endpoint:
{
acme_ca https://acme.zerossl.com/v2/DV90
acme_eab KEY_ID MAC_KEY
}
That's all there is to it. You just can't mix-and-match acme_* options
with cert_issuer, because it becomes confusing/ambiguous/complicated to
merge the settings.
* Fix broken test
This test was asserting buggy behavior, oops - glad this branch both
discovers and fixes the bug at the same time!
* Fix broken test (post-merge)
* Update modules/caddytls/acmeissuer.go
Fix godoc comment
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
* Add support for ZeroSSL's EAB-by-email endpoint
Also transform the ACMEIssuer into ZeroSSLIssuer implicitly if set to
the ZeroSSL endpoint without EAB (the ZeroSSLIssuer is needed to
generate EAB if not already provided); this is now possible with either
an API key or an email address.
* go.mod: Use latest certmagic, acmez, and x/net
* Wrap underlying logic rather than repeating it
Oops, duh
* Form-encode email info into request body for EAB endpoint
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
2020-08-11 09:58:06 -05:00
2020-02-08 18:52:54 -05:00
case "dns" :
2020-05-02 18:23:36 -05:00
if ! h . NextArg ( ) {
2020-02-08 18:52:54 -05:00
return nil , h . ArgErr ( )
}
2020-05-01 11:41:08 -05:00
provName := h . Val ( )
2020-03-13 12:06:08 -05:00
if acmeIssuer == nil {
acmeIssuer = new ( caddytls . ACMEIssuer )
}
if acmeIssuer . Challenges == nil {
acmeIssuer . Challenges = new ( caddytls . ChallengesConfig )
2020-04-30 17:15:20 -05:00
acmeIssuer . Challenges . DNS = new ( caddytls . DNSChallengeConfig )
2020-02-08 18:52:54 -05:00
}
2020-05-01 11:41:08 -05:00
dnsProvModule , err := caddy . GetModule ( "dns.providers." + provName )
2020-02-08 18:52:54 -05:00
if err != nil {
return nil , h . Errf ( "getting DNS provider module named '%s': %v" , provName , err )
}
2020-05-01 11:41:08 -05:00
dnsProvModuleInstance := dnsProvModule . New ( )
if unm , ok := dnsProvModuleInstance . ( caddyfile . Unmarshaler ) ; ok {
err = unm . UnmarshalCaddyfile ( h . NewFromNextSegment ( ) )
if err != nil {
return nil , err
}
}
acmeIssuer . Challenges . DNS . ProviderRaw = caddyconfig . JSONModuleObject ( dnsProvModuleInstance , "name" , provName , h . warnings )
2020-02-17 00:24:20 -05:00
2020-02-12 15:07:25 -05:00
case "ca_root" :
arg := h . RemainingArgs ( )
if len ( arg ) != 1 {
return nil , h . ArgErr ( )
}
2020-03-13 12:06:08 -05:00
if acmeIssuer == nil {
acmeIssuer = new ( caddytls . ACMEIssuer )
}
acmeIssuer . TrustedRootsPEMFiles = append ( acmeIssuer . TrustedRootsPEMFiles , arg [ 0 ] )
2020-02-08 18:52:54 -05:00
2020-03-17 22:00:45 -05:00
case "on_demand" :
if h . NextArg ( ) {
return nil , h . ArgErr ( )
}
onDemand = true
2019-09-30 10:11:30 -05:00
default :
return nil , h . Errf ( "unknown subdirective: %s" , h . Val ( ) )
2019-08-09 13:05:47 -05:00
}
}
2019-08-21 11:46:35 -05:00
// a naked tls directive is not allowed
if len ( firstLine ) == 0 && ! hasBlock {
return nil , h . ArgErr ( )
}
}
2020-03-13 12:06:08 -05:00
// begin building the final config values
var configVals [ ] ConfigValue
2019-08-21 11:46:35 -05:00
// certificate loaders
if len ( fileLoader ) > 0 {
configVals = append ( configVals , ConfigValue {
2020-05-29 12:49:21 -05:00
Class : "tls.cert_loader" ,
2019-08-21 11:46:35 -05:00
Value : fileLoader ,
} )
}
if len ( folderLoader ) > 0 {
configVals = append ( configVals , ConfigValue {
2020-05-29 12:49:21 -05:00
Class : "tls.cert_loader" ,
2019-08-21 11:46:35 -05:00
Value : folderLoader ,
} )
}
2020-11-16 13:05:55 -05:00
if len ( issuers ) > 0 && ( acmeIssuer != nil || internalIssuer != nil ) {
// some tls subdirectives are shortcuts that implicitly configure issuers, and the
// user can also configure issuers explicitly using the issuer subdirective; the
// logic to support both would likely be complex, or at least unintuitive
return nil , h . Err ( "cannot mix issuer subdirective (explicit issuers) with other issuer-specific subdirectives (implicit issuers)" )
2020-03-13 12:06:08 -05:00
}
2020-11-16 13:05:55 -05:00
for _ , issuer := range issuers {
caddytls: Add support for ZeroSSL; add Caddyfile support for issuers (#3633)
* caddytls: Add support for ZeroSSL; add Caddyfile support for issuers
Configuring issuers explicitly in a Caddyfile is not easily compatible
with existing ACME-specific parameters such as email or acme_ca which
infer the kind of issuer it creates (this is complicated now because
the ZeroSSL issuer wraps the ACME issuer)... oh well, we can revisit
that later if we need to.
New Caddyfile global option:
{
cert_issuer <name> ...
}
Or, alternatively, as a tls subdirective:
tls {
issuer <name> ...
}
For example, to use ZeroSSL with an API key:
{
cert_issuser zerossl API_KEY
}
For now, that still uses ZeroSSL's ACME endpoint; it fetches EAB
credentials for you. You can also provide the EAB credentials directly
just like any other ACME endpoint:
{
cert_issuer acme {
eab KEY_ID MAC_KEY
}
}
All these examples use the new global option (or tls subdirective). You
can still use traditional/existing options with ZeroSSL, since it's
just another ACME endpoint:
{
acme_ca https://acme.zerossl.com/v2/DV90
acme_eab KEY_ID MAC_KEY
}
That's all there is to it. You just can't mix-and-match acme_* options
with cert_issuer, because it becomes confusing/ambiguous/complicated to
merge the settings.
* Fix broken test
This test was asserting buggy behavior, oops - glad this branch both
discovers and fixes the bug at the same time!
* Fix broken test (post-merge)
* Update modules/caddytls/acmeissuer.go
Fix godoc comment
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
* Add support for ZeroSSL's EAB-by-email endpoint
Also transform the ACMEIssuer into ZeroSSLIssuer implicitly if set to
the ZeroSSL endpoint without EAB (the ZeroSSLIssuer is needed to
generate EAB if not already provided); this is now possible with either
an API key or an email address.
* go.mod: Use latest certmagic, acmez, and x/net
* Wrap underlying logic rather than repeating it
Oops, duh
* Form-encode email info into request body for EAB endpoint
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
2020-08-11 09:58:06 -05:00
configVals = append ( configVals , ConfigValue {
Class : "tls.cert_issuer" ,
Value : issuer ,
} )
2020-11-16 13:05:55 -05:00
}
if acmeIssuer != nil {
caddytls: Add support for ZeroSSL; add Caddyfile support for issuers (#3633)
* caddytls: Add support for ZeroSSL; add Caddyfile support for issuers
Configuring issuers explicitly in a Caddyfile is not easily compatible
with existing ACME-specific parameters such as email or acme_ca which
infer the kind of issuer it creates (this is complicated now because
the ZeroSSL issuer wraps the ACME issuer)... oh well, we can revisit
that later if we need to.
New Caddyfile global option:
{
cert_issuer <name> ...
}
Or, alternatively, as a tls subdirective:
tls {
issuer <name> ...
}
For example, to use ZeroSSL with an API key:
{
cert_issuser zerossl API_KEY
}
For now, that still uses ZeroSSL's ACME endpoint; it fetches EAB
credentials for you. You can also provide the EAB credentials directly
just like any other ACME endpoint:
{
cert_issuer acme {
eab KEY_ID MAC_KEY
}
}
All these examples use the new global option (or tls subdirective). You
can still use traditional/existing options with ZeroSSL, since it's
just another ACME endpoint:
{
acme_ca https://acme.zerossl.com/v2/DV90
acme_eab KEY_ID MAC_KEY
}
That's all there is to it. You just can't mix-and-match acme_* options
with cert_issuer, because it becomes confusing/ambiguous/complicated to
merge the settings.
* Fix broken test
This test was asserting buggy behavior, oops - glad this branch both
discovers and fixes the bug at the same time!
* Fix broken test (post-merge)
* Update modules/caddytls/acmeissuer.go
Fix godoc comment
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
* Add support for ZeroSSL's EAB-by-email endpoint
Also transform the ACMEIssuer into ZeroSSLIssuer implicitly if set to
the ZeroSSL endpoint without EAB (the ZeroSSLIssuer is needed to
generate EAB if not already provided); this is now possible with either
an API key or an email address.
* go.mod: Use latest certmagic, acmez, and x/net
* Wrap underlying logic rather than repeating it
Oops, duh
* Form-encode email info into request body for EAB endpoint
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
2020-08-11 09:58:06 -05:00
configVals = append ( configVals , ConfigValue {
Class : "tls.cert_issuer" ,
2020-11-16 13:05:55 -05:00
Value : disambiguateACMEIssuer ( acmeIssuer ) ,
caddytls: Add support for ZeroSSL; add Caddyfile support for issuers (#3633)
* caddytls: Add support for ZeroSSL; add Caddyfile support for issuers
Configuring issuers explicitly in a Caddyfile is not easily compatible
with existing ACME-specific parameters such as email or acme_ca which
infer the kind of issuer it creates (this is complicated now because
the ZeroSSL issuer wraps the ACME issuer)... oh well, we can revisit
that later if we need to.
New Caddyfile global option:
{
cert_issuer <name> ...
}
Or, alternatively, as a tls subdirective:
tls {
issuer <name> ...
}
For example, to use ZeroSSL with an API key:
{
cert_issuser zerossl API_KEY
}
For now, that still uses ZeroSSL's ACME endpoint; it fetches EAB
credentials for you. You can also provide the EAB credentials directly
just like any other ACME endpoint:
{
cert_issuer acme {
eab KEY_ID MAC_KEY
}
}
All these examples use the new global option (or tls subdirective). You
can still use traditional/existing options with ZeroSSL, since it's
just another ACME endpoint:
{
acme_ca https://acme.zerossl.com/v2/DV90
acme_eab KEY_ID MAC_KEY
}
That's all there is to it. You just can't mix-and-match acme_* options
with cert_issuer, because it becomes confusing/ambiguous/complicated to
merge the settings.
* Fix broken test
This test was asserting buggy behavior, oops - glad this branch both
discovers and fixes the bug at the same time!
* Fix broken test (post-merge)
* Update modules/caddytls/acmeissuer.go
Fix godoc comment
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
* Add support for ZeroSSL's EAB-by-email endpoint
Also transform the ACMEIssuer into ZeroSSLIssuer implicitly if set to
the ZeroSSL endpoint without EAB (the ZeroSSLIssuer is needed to
generate EAB if not already provided); this is now possible with either
an API key or an email address.
* go.mod: Use latest certmagic, acmez, and x/net
* Wrap underlying logic rather than repeating it
Oops, duh
* Form-encode email info into request body for EAB endpoint
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
2020-08-11 09:58:06 -05:00
} )
2020-11-16 13:05:55 -05:00
}
if internalIssuer != nil {
2019-08-21 11:46:35 -05:00
configVals = append ( configVals , ConfigValue {
2020-03-07 01:15:25 -05:00
Class : "tls.cert_issuer" ,
2020-11-16 13:05:55 -05:00
Value : internalIssuer ,
2019-08-21 11:46:35 -05:00
} )
}
2020-03-17 22:00:45 -05:00
// on-demand TLS
if onDemand {
configVals = append ( configVals , ConfigValue {
Class : "tls.on_demand" ,
Value : true ,
} )
}
caddytls: Refactor certificate selection policies (close #1575)
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.
2020-04-01 21:49:35 -05:00
// custom certificate selection
if len ( certSelector . AnyTag ) > 0 {
cp . CertSelection = & certSelector
}
2020-03-17 22:00:45 -05:00
// connection policy -- always add one, to ensure that TLS
// is enabled, because this directive was used (this is
// needed, for instance, when a site block has a key of
// just ":5000" - i.e. no hostname, and only on-demand TLS
// is enabled)
configVals = append ( configVals , ConfigValue {
Class : "tls.connection_policy" ,
Value : cp ,
} )
2019-08-21 11:46:35 -05:00
return configVals , nil
}
2020-03-20 13:50:36 -05:00
// parseRoot parses the root directive. Syntax:
//
// root [<matcher>] <path>
//
func parseRoot ( h Helper ) ( caddyhttp . MiddlewareHandler , error ) {
var root string
for h . Next ( ) {
2020-03-23 00:13:08 -05:00
if ! h . NextArg ( ) {
2020-03-20 13:50:36 -05:00
return nil , h . ArgErr ( )
}
root = h . Val ( )
if h . NextArg ( ) {
return nil , h . ArgErr ( )
}
}
return caddyhttp . VarsMiddleware { "root" : root } , nil
}
2020-01-22 11:32:38 -05:00
// parseRedir parses the redir directive. Syntax:
//
// redir [<matcher>] <to> [<code>]
//
2019-08-21 11:46:35 -05:00
func parseRedir ( h Helper ) ( caddyhttp . MiddlewareHandler , error ) {
if ! h . Next ( ) {
return nil , h . ArgErr ( )
}
if ! h . NextArg ( ) {
return nil , h . ArgErr ( )
}
to := h . Val ( )
var code string
if h . NextArg ( ) {
code = h . Val ( )
}
if code == "permanent" {
code = "301"
}
if code == "temporary" || code == "" {
2020-01-22 11:32:38 -05:00
code = "302"
2019-08-21 11:46:35 -05:00
}
var body string
2020-01-22 11:32:38 -05:00
if code == "html" {
2019-08-21 11:46:35 -05:00
// Script tag comes first since that will better imitate a redirect in the browser's
// history, but the meta tag is a fallback for most non-JS clients.
const metaRedir = ` < ! DOCTYPE html >
< html >
< head >
< title > Redirecting ... < / title >
< script > window . location . replace ( "%s" ) ; < / script >
< meta http - equiv = "refresh" content = "0; URL='%s'" >
< / head >
< body > Redirecting to < a href = "%s" > % s < / a > ... < / body >
< / html >
`
safeTo := html . EscapeString ( to )
body = fmt . Sprintf ( metaRedir , safeTo , safeTo , safeTo , safeTo )
2019-08-09 13:05:47 -05:00
}
2019-08-21 11:46:35 -05:00
return caddyhttp . StaticResponse {
StatusCode : caddyhttp . WeakString ( code ) ,
Headers : http . Header { "Location" : [ ] string { to } } ,
Body : body ,
} , nil
2019-08-09 13:05:47 -05:00
}
2019-09-16 12:04:18 -05:00
2020-01-22 11:32:38 -05:00
// parseRespond parses the respond directive.
2019-09-16 12:04:18 -05:00
func parseRespond ( h Helper ) ( caddyhttp . MiddlewareHandler , error ) {
sr := new ( caddyhttp . StaticResponse )
err := sr . UnmarshalCaddyfile ( h . Dispenser )
if err != nil {
return nil , err
}
return sr , nil
}
2020-01-09 16:00:32 -05:00
2020-01-22 11:32:38 -05:00
// parseRoute parses the route directive.
2020-01-09 16:00:32 -05:00
func parseRoute ( h Helper ) ( caddyhttp . MiddlewareHandler , error ) {
sr := new ( caddyhttp . Subroute )
2020-08-05 14:42:29 -05:00
allResults , err := parseSegmentAsConfig ( h )
if err != nil {
return nil , err
}
2020-01-09 16:00:32 -05:00
2020-08-05 14:42:29 -05:00
for _ , result := range allResults {
switch handler := result . Value . ( type ) {
case caddyhttp . Route :
sr . Routes = append ( sr . Routes , handler )
case caddyhttp . Subroute :
// directives which return a literal subroute instead of a route
// means they intend to keep those handlers together without
// them being reordered; we're doing that anyway since we're in
// the route directive, so just append its handlers
sr . Routes = append ( sr . Routes , handler . Routes ... )
default :
return nil , h . Errf ( "%s directive returned something other than an HTTP route or subroute: %#v (only handler directives can be used in routes)" , result . directive , result . Value )
2020-01-09 16:00:32 -05:00
}
}
return sr , nil
}
2020-01-16 19:08:52 -05:00
func parseHandle ( h Helper ) ( caddyhttp . MiddlewareHandler , error ) {
2020-05-26 16:27:51 -05:00
return ParseSegmentAsSubroute ( h )
2020-02-17 00:24:20 -05:00
}
2020-01-16 19:08:52 -05:00
2020-02-17 00:24:20 -05:00
func parseHandleErrors ( h Helper ) ( [ ] ConfigValue , error ) {
2020-05-26 16:27:51 -05:00
subroute , err := ParseSegmentAsSubroute ( h )
2020-02-17 00:24:20 -05:00
if err != nil {
return nil , err
2020-01-16 19:08:52 -05:00
}
2020-02-17 00:24:20 -05:00
return [ ] ConfigValue {
{
Class : "error_route" ,
Value : subroute ,
} ,
} , nil
2020-01-16 19:08:52 -05:00
}
2020-02-06 14:55:26 -05:00
2020-02-26 00:00:33 -05:00
// parseLog parses the log directive. Syntax:
//
// log {
// output <writer_module> ...
// format <encoder_module> ...
// level <level>
// }
//
func parseLog ( h Helper ) ( [ ] ConfigValue , error ) {
var configValues [ ] ConfigValue
for h . Next ( ) {
2020-05-15 16:57:16 -05:00
// log does not currently support any arguments
if h . NextArg ( ) {
return nil , h . ArgErr ( )
}
2020-02-26 00:00:33 -05:00
cl := new ( caddy . CustomLog )
for h . NextBlock ( 0 ) {
switch h . Val ( ) {
case "output" :
if ! h . NextArg ( ) {
return nil , h . ArgErr ( )
}
moduleName := h . Val ( )
// can't use the usual caddyfile.Unmarshaler flow with the
// standard writers because they are in the caddy package
// (because they are the default) and implementing that
// interface there would unfortunately create circular import
var wo caddy . WriterOpener
switch moduleName {
case "stdout" :
wo = caddy . StdoutWriter { }
case "stderr" :
wo = caddy . StderrWriter { }
case "discard" :
wo = caddy . DiscardWriter { }
default :
mod , err := caddy . GetModule ( "caddy.logging.writers." + moduleName )
if err != nil {
return nil , h . Errf ( "getting log writer module named '%s': %v" , moduleName , err )
}
unm , ok := mod . New ( ) . ( caddyfile . Unmarshaler )
if ! ok {
return nil , h . Errf ( "log writer module '%s' is not a Caddyfile unmarshaler" , mod )
}
err = unm . UnmarshalCaddyfile ( h . NewFromNextSegment ( ) )
if err != nil {
return nil , err
}
wo , ok = unm . ( caddy . WriterOpener )
if ! ok {
return nil , h . Errf ( "module %s is not a WriterOpener" , mod )
}
}
cl . WriterRaw = caddyconfig . JSONModuleObject ( wo , "output" , moduleName , h . warnings )
case "format" :
if ! h . NextArg ( ) {
return nil , h . ArgErr ( )
}
moduleName := h . Val ( )
mod , err := caddy . GetModule ( "caddy.logging.encoders." + moduleName )
if err != nil {
return nil , h . Errf ( "getting log encoder module named '%s': %v" , moduleName , err )
}
unm , ok := mod . New ( ) . ( caddyfile . Unmarshaler )
if ! ok {
return nil , h . Errf ( "log encoder module '%s' is not a Caddyfile unmarshaler" , mod )
}
err = unm . UnmarshalCaddyfile ( h . NewFromNextSegment ( ) )
if err != nil {
return nil , err
}
enc , ok := unm . ( zapcore . Encoder )
if ! ok {
return nil , h . Errf ( "module %s is not a zapcore.Encoder" , mod )
}
cl . EncoderRaw = caddyconfig . JSONModuleObject ( enc , "format" , moduleName , h . warnings )
case "level" :
if ! h . NextArg ( ) {
return nil , h . ArgErr ( )
}
cl . Level = h . Val ( )
if h . NextArg ( ) {
return nil , h . ArgErr ( )
}
default :
return nil , h . Errf ( "unrecognized subdirective: %s" , h . Val ( ) )
}
}
var val namedCustomLog
if ! reflect . DeepEqual ( cl , new ( caddy . CustomLog ) ) {
2020-03-04 11:58:49 -05:00
logCounter , ok := h . State [ "logCounter" ] . ( int )
if ! ok {
logCounter = 0
}
2020-02-26 00:00:33 -05:00
val . name = fmt . Sprintf ( "log%d" , logCounter )
2020-03-20 13:02:37 -05:00
cl . Include = [ ] string { "http.log.access." + val . name }
2020-02-26 00:00:33 -05:00
val . log = cl
logCounter ++
2020-03-04 11:58:49 -05:00
h . State [ "logCounter" ] = logCounter
2020-02-26 00:00:33 -05:00
}
configValues = append ( configValues , ConfigValue {
Class : "custom_log" ,
Value : val ,
} )
}
return configValues , nil
}