mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-16 21:56:40 -05:00
3c90e370a4
This commit goes a long way toward making automated documentation of Caddy config and Caddy modules possible. It's a broad, sweeping change, but mostly internal. It allows us to automatically generate docs for all Caddy modules (including future third-party ones) and make them viewable on a web page; it also doubles as godoc comments. As such, this commit makes significant progress in migrating the docs from our temporary wiki page toward our new website which is still under construction. With this change, all host modules will use ctx.LoadModule() and pass in both the struct pointer and the field name as a string. This allows the reflect package to read the struct tag from that field so that it can get the necessary information like the module namespace and the inline key. This has the nice side-effect of unifying the code and documentation. It also simplifies module loading, and handles several variations on field types for raw module fields (i.e. variations on json.RawMessage, such as arrays and maps). I also renamed ModuleInfo.Name -> ModuleInfo.ID, to make it clear that the ID is the "full name" which includes both the module namespace and the name. This clarity is helpful when describing module hierarchy. As of this change, Caddy modules are no longer an experimental design. I think the architecture is good enough to go forward.
238 lines
7.1 KiB
Go
238 lines
7.1 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 caddytls
|
|
|
|
import (
|
|
"crypto/rand"
|
|
"crypto/tls"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/caddyserver/caddy/v2"
|
|
)
|
|
|
|
// SessionTicketService configures and manages TLS session tickets.
|
|
type SessionTicketService struct {
|
|
// KeySource is the method by which Caddy produces or obtains
|
|
// TLS session ticket keys (STEKs). By default, Caddy generates
|
|
// them internally using a secure pseudorandom source.
|
|
KeySource json.RawMessage `json:"key_source,omitempty" caddy:"namespace=tls.stek inline_key=provider"`
|
|
|
|
// How often Caddy rotates STEKs. Default: 12h.
|
|
RotationInterval caddy.Duration `json:"rotation_interval,omitempty"`
|
|
|
|
// The maximum number of keys to keep in rotation. Default: 4.
|
|
MaxKeys int `json:"max_keys,omitempty"`
|
|
|
|
// Disables STEK rotation.
|
|
DisableRotation bool `json:"disable_rotation,omitempty"`
|
|
|
|
// Disables TLS session resumption by tickets.
|
|
Disabled bool `json:"disabled,omitempty"`
|
|
|
|
keySource STEKProvider
|
|
configs map[*tls.Config]struct{}
|
|
stopChan chan struct{}
|
|
currentKeys [][32]byte
|
|
mu *sync.Mutex
|
|
}
|
|
|
|
func (s *SessionTicketService) provision(ctx caddy.Context) error {
|
|
s.configs = make(map[*tls.Config]struct{})
|
|
s.mu = new(sync.Mutex)
|
|
|
|
// establish sane defaults
|
|
if s.RotationInterval == 0 {
|
|
s.RotationInterval = caddy.Duration(defaultSTEKRotationInterval)
|
|
}
|
|
if s.MaxKeys <= 0 {
|
|
s.MaxKeys = defaultMaxSTEKs
|
|
}
|
|
if s.KeySource == nil {
|
|
s.KeySource = json.RawMessage(`{"provider":"standard"}`)
|
|
}
|
|
|
|
// load the STEK module, which will provide keys
|
|
val, err := ctx.LoadModule(s, "KeySource")
|
|
if err != nil {
|
|
return fmt.Errorf("loading TLS session ticket ephemeral keys provider module: %s", err)
|
|
}
|
|
s.keySource = val.(STEKProvider)
|
|
|
|
// if session tickets or just rotation are
|
|
// disabled, no need to start service
|
|
if s.Disabled || s.DisableRotation {
|
|
return nil
|
|
}
|
|
|
|
// start the STEK module; this ensures we have
|
|
// a starting key before any config needs one
|
|
return s.start()
|
|
}
|
|
|
|
// start loads the starting STEKs and spawns a goroutine
|
|
// which loops to rotate the STEKs, which continues until
|
|
// stop() is called. If start() was already called, this
|
|
// is a no-op.
|
|
func (s *SessionTicketService) start() error {
|
|
if s.stopChan != nil {
|
|
return nil
|
|
}
|
|
s.stopChan = make(chan struct{})
|
|
|
|
// initializing the key source gives us our
|
|
// initial key(s) to start with; if successful,
|
|
// we need to be sure to call Next() so that
|
|
// the key source can know when it is done
|
|
initialKeys, err := s.keySource.Initialize(s)
|
|
if err != nil {
|
|
return fmt.Errorf("setting STEK module configuration: %v", err)
|
|
}
|
|
|
|
s.mu.Lock()
|
|
s.currentKeys = initialKeys
|
|
s.mu.Unlock()
|
|
|
|
// keep the keys rotated
|
|
go s.stayUpdated()
|
|
|
|
return nil
|
|
}
|
|
|
|
// stayUpdated is a blocking function which rotates
|
|
// the keys whenever new ones are sent. It reads
|
|
// from keysChan until s.stop() is called.
|
|
func (s *SessionTicketService) stayUpdated() {
|
|
// this call is essential when Initialize()
|
|
// returns without error, because the stop
|
|
// channel is the only way the key source
|
|
// will know when to clean up
|
|
keysChan := s.keySource.Next(s.stopChan)
|
|
|
|
for {
|
|
select {
|
|
case newKeys := <-keysChan:
|
|
s.mu.Lock()
|
|
s.currentKeys = newKeys
|
|
configs := s.configs
|
|
s.mu.Unlock()
|
|
for cfg := range configs {
|
|
cfg.SetSessionTicketKeys(newKeys)
|
|
}
|
|
case <-s.stopChan:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// stop terminates the key rotation goroutine.
|
|
func (s *SessionTicketService) stop() {
|
|
if s.stopChan != nil {
|
|
close(s.stopChan)
|
|
}
|
|
}
|
|
|
|
// register sets the session ticket keys on cfg
|
|
// and keeps them updated. Any values registered
|
|
// must be unregistered, or they will not be
|
|
// garbage-collected. s.start() must have been
|
|
// called first. If session tickets are disabled
|
|
// or if ticket key rotation is disabled, this
|
|
// function is a no-op.
|
|
func (s *SessionTicketService) register(cfg *tls.Config) {
|
|
if s.Disabled || s.DisableRotation {
|
|
return
|
|
}
|
|
s.mu.Lock()
|
|
cfg.SetSessionTicketKeys(s.currentKeys)
|
|
s.configs[cfg] = struct{}{}
|
|
s.mu.Unlock()
|
|
}
|
|
|
|
// unregister stops session key management on cfg and
|
|
// removes the internal stored reference to cfg. If
|
|
// session tickets are disabled or if ticket key rotation
|
|
// is disabled, this function is a no-op.
|
|
func (s *SessionTicketService) unregister(cfg *tls.Config) {
|
|
if s.Disabled || s.DisableRotation {
|
|
return
|
|
}
|
|
s.mu.Lock()
|
|
delete(s.configs, cfg)
|
|
s.mu.Unlock()
|
|
}
|
|
|
|
// RotateSTEKs rotates the keys in keys by producing a new key and eliding
|
|
// the oldest one. The new slice of keys is returned.
|
|
func (s SessionTicketService) RotateSTEKs(keys [][32]byte) ([][32]byte, error) {
|
|
// produce a new key
|
|
newKey, err := s.generateSTEK()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("generating STEK: %v", err)
|
|
}
|
|
|
|
// we need to prepend this new key to the list of
|
|
// keys so that it is preferred, but we need to be
|
|
// careful that we do not grow the slice larger
|
|
// than MaxKeys, otherwise we'll be storing one
|
|
// more key in memory than we expect; so be sure
|
|
// that the slice does not grow beyond the limit
|
|
// even for a brief period of time, since there's
|
|
// no guarantee when that extra allocation will
|
|
// be overwritten; this is why we first trim the
|
|
// length to one less the max, THEN prepend the
|
|
// new key
|
|
if len(keys) >= s.MaxKeys {
|
|
keys[len(keys)-1] = [32]byte{} // zero-out memory of oldest key
|
|
keys = keys[:s.MaxKeys-1] // trim length of slice
|
|
}
|
|
keys = append([][32]byte{newKey}, keys...) // prepend new key
|
|
|
|
return keys, nil
|
|
}
|
|
|
|
// generateSTEK generates key material suitable for use as a
|
|
// session ticket ephemeral key.
|
|
func (s *SessionTicketService) generateSTEK() ([32]byte, error) {
|
|
var newTicketKey [32]byte
|
|
_, err := io.ReadFull(rand.Reader, newTicketKey[:])
|
|
return newTicketKey, err
|
|
}
|
|
|
|
// STEKProvider is a type that can provide session ticket ephemeral
|
|
// keys (STEKs).
|
|
type STEKProvider interface {
|
|
// Initialize provides the STEK configuration to the STEK
|
|
// module so that it can obtain and manage keys accordingly.
|
|
// It returns the initial key(s) to use. Implementations can
|
|
// rely on Next() being called if Initialize() returns
|
|
// without error, so that it may know when it is done.
|
|
Initialize(config *SessionTicketService) ([][32]byte, error)
|
|
|
|
// Next returns the channel through which the next session
|
|
// ticket keys will be transmitted until doneChan is closed.
|
|
// Keys should be sent on keysChan as they are updated.
|
|
// When doneChan is closed, any resources allocated in
|
|
// Initialize() must be cleaned up.
|
|
Next(doneChan <-chan struct{}) (keysChan <-chan [][32]byte)
|
|
}
|
|
|
|
const (
|
|
defaultSTEKRotationInterval = 12 * time.Hour
|
|
defaultMaxSTEKs = 4
|
|
)
|