mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-23 22:27:38 -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.
131 lines
3.6 KiB
Go
131 lines
3.6 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 standardstek
|
|
|
|
import (
|
|
"log"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/caddyserver/caddy/v2"
|
|
"github.com/caddyserver/caddy/v2/modules/caddytls"
|
|
)
|
|
|
|
func init() {
|
|
caddy.RegisterModule(standardSTEKProvider{})
|
|
}
|
|
|
|
type standardSTEKProvider struct {
|
|
stekConfig *caddytls.SessionTicketService
|
|
timer *time.Timer
|
|
}
|
|
|
|
// CaddyModule returns the Caddy module information.
|
|
func (standardSTEKProvider) CaddyModule() caddy.ModuleInfo {
|
|
return caddy.ModuleInfo{
|
|
ID: "tls.stek.standard",
|
|
New: func() caddy.Module { return new(standardSTEKProvider) },
|
|
}
|
|
}
|
|
|
|
// Initialize sets the configuration for s and returns the starting keys.
|
|
func (s *standardSTEKProvider) Initialize(config *caddytls.SessionTicketService) ([][32]byte, error) {
|
|
// keep a reference to the config; we'll need it when rotating keys
|
|
s.stekConfig = config
|
|
|
|
itvl := time.Duration(s.stekConfig.RotationInterval)
|
|
|
|
mutex.Lock()
|
|
defer mutex.Unlock()
|
|
|
|
// if this is our first rotation or we are overdue
|
|
// for one, perform a rotation immediately; otherwise,
|
|
// we assume that the keys are non-empty and fresh
|
|
since := time.Since(lastRotation)
|
|
if lastRotation.IsZero() || since > itvl {
|
|
var err error
|
|
keys, err = s.stekConfig.RotateSTEKs(keys)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
since = 0 // since this is overdue or is the first rotation, use full interval
|
|
lastRotation = time.Now()
|
|
}
|
|
|
|
// create timer for the remaining time on the interval;
|
|
// this timer is cleaned up only when Next() returns
|
|
s.timer = time.NewTimer(itvl - since)
|
|
|
|
return keys, nil
|
|
}
|
|
|
|
// Next returns a channel which transmits the latest session ticket keys.
|
|
func (s *standardSTEKProvider) Next(doneChan <-chan struct{}) <-chan [][32]byte {
|
|
keysChan := make(chan [][32]byte)
|
|
go s.rotate(doneChan, keysChan)
|
|
return keysChan
|
|
}
|
|
|
|
// rotate rotates keys on a regular basis, sending each updated set of
|
|
// keys down keysChan, until doneChan is closed.
|
|
func (s *standardSTEKProvider) rotate(doneChan <-chan struct{}, keysChan chan<- [][32]byte) {
|
|
for {
|
|
select {
|
|
case now := <-s.timer.C:
|
|
// copy the slice header to avoid races
|
|
mutex.RLock()
|
|
keysCopy := keys
|
|
mutex.RUnlock()
|
|
|
|
// generate a new key, rotating old ones
|
|
var err error
|
|
keysCopy, err = s.stekConfig.RotateSTEKs(keysCopy)
|
|
if err != nil {
|
|
// TODO: improve this handling
|
|
log.Printf("[ERROR] Generating STEK: %v", err)
|
|
continue
|
|
}
|
|
|
|
// replace keys slice with updated value and
|
|
// record the timestamp of rotation
|
|
mutex.Lock()
|
|
keys = keysCopy
|
|
lastRotation = now
|
|
mutex.Unlock()
|
|
|
|
// send the updated keys to the service
|
|
keysChan <- keysCopy
|
|
|
|
// timer channel is already drained, so reset directly (see godoc)
|
|
s.timer.Reset(time.Duration(s.stekConfig.RotationInterval))
|
|
|
|
case <-doneChan:
|
|
// again, see godocs for why timer is stopped this way
|
|
if !s.timer.Stop() {
|
|
<-s.timer.C
|
|
}
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
var (
|
|
lastRotation time.Time
|
|
keys [][32]byte
|
|
mutex sync.RWMutex // protects keys and lastRotation
|
|
)
|
|
|
|
// Interface guard
|
|
var _ caddytls.STEKProvider = (*standardSTEKProvider)(nil)
|