summaryrefslogtreecommitdiff
path: root/modules/caddytls
diff options
context:
space:
mode:
Diffstat (limited to 'modules/caddytls')
-rw-r--r--modules/caddytls/distributedstek/distributedstek.go6
-rw-r--r--modules/caddytls/sessiontickets.go8
-rw-r--r--modules/caddytls/standardstek/stek.go6
-rw-r--r--modules/caddytls/tls.go7
4 files changed, 27 insertions, 0 deletions
diff --git a/modules/caddytls/distributedstek/distributedstek.go b/modules/caddytls/distributedstek/distributedstek.go
index 6fc48a2..807f2bb 100644
--- a/modules/caddytls/distributedstek/distributedstek.go
+++ b/modules/caddytls/distributedstek/distributedstek.go
@@ -28,6 +28,7 @@ import (
"encoding/json"
"fmt"
"log"
+ "runtime/debug"
"time"
"github.com/caddyserver/caddy/v2"
@@ -193,6 +194,11 @@ func (s *Provider) rotateKeys(oldSTEK distributedSTEK) (distributedSTEK, error)
// rotate rotates keys on a regular basis, sending each updated set of
// keys down keysChan, until doneChan is closed.
func (s *Provider) rotate(doneChan <-chan struct{}, keysChan chan<- [][32]byte) {
+ defer func() {
+ if err := recover(); err != nil {
+ log.Printf("[PANIC] distributed STEK rotation: %v\n%s", err, debug.Stack())
+ }
+ }()
for {
select {
case <-s.timer.C:
diff --git a/modules/caddytls/sessiontickets.go b/modules/caddytls/sessiontickets.go
index 258c135..bfc5628 100644
--- a/modules/caddytls/sessiontickets.go
+++ b/modules/caddytls/sessiontickets.go
@@ -20,6 +20,8 @@ import (
"encoding/json"
"fmt"
"io"
+ "log"
+ "runtime/debug"
"sync"
"time"
@@ -118,6 +120,12 @@ func (s *SessionTicketService) start() error {
// the keys whenever new ones are sent. It reads
// from keysChan until s.stop() is called.
func (s *SessionTicketService) stayUpdated() {
+ defer func() {
+ if err := recover(); err != nil {
+ log.Printf("[PANIC] session ticket service: %v\n%s", err, debug.Stack())
+ }
+ }()
+
// this call is essential when Initialize()
// returns without error, because the stop
// channel is the only way the key source
diff --git a/modules/caddytls/standardstek/stek.go b/modules/caddytls/standardstek/stek.go
index eb609ca..61cab0e 100644
--- a/modules/caddytls/standardstek/stek.go
+++ b/modules/caddytls/standardstek/stek.go
@@ -16,6 +16,7 @@ package standardstek
import (
"log"
+ "runtime/debug"
"sync"
"time"
@@ -81,6 +82,11 @@ func (s *standardSTEKProvider) Next(doneChan <-chan struct{}) <-chan [][32]byte
// 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) {
+ defer func() {
+ if err := recover(); err != nil {
+ log.Printf("[PANIC] standard STEK rotation: %v\n%s", err, debug.Stack())
+ }
+ }()
for {
select {
case now := <-s.timer.C:
diff --git a/modules/caddytls/tls.go b/modules/caddytls/tls.go
index 0e92f05..7f2d23e 100644
--- a/modules/caddytls/tls.go
+++ b/modules/caddytls/tls.go
@@ -19,9 +19,11 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
+ "log"
"net/http"
"os"
"path/filepath"
+ "runtime/debug"
"strings"
"sync"
"time"
@@ -367,6 +369,11 @@ func (t *TLS) keepStorageClean() {
t.storageCleanTicker = time.NewTicker(storageCleanInterval)
t.storageCleanStop = make(chan struct{})
go func() {
+ defer func() {
+ if err := recover(); err != nil {
+ log.Printf("[PANIC] storage cleaner: %v\n%s", err, debug.Stack())
+ }
+ }()
for {
select {
case <-t.storageCleanStop: