@marcel91200 / caddy Mirror · read-only / commits / d06d0e79
Fork 0

Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS

Mirrored from https://github.com/Slazee/caddy.git

Synced Nov 13, 20:30 UTC

go.mod: Upgrade CertMagic to v0.16.0

Includes several breaking changes; code base updated accordingly. - Added lots of context arguments - Use fs.ErrNotExist - Rename ACMEManager -> ACMEIssuer; CertificateManager -> Manager

Matthew Holt committed Mar 25, 2022 at 11:28 UTC d06d0e79f839a26ab2cf81b00ba2d180623c57a9
16 files changed +73 -62
admin.go
+1 -1
@@ -1000,7 +1000,7 @@ func handleStop(w http.ResponseWriter, r *http.Request) error {
1000 Log().Error("unable to notify stopping to service manager", zap.Error(err))
1001 }
1002
1003 - exitProcess(Log().Named("admin.api"))
1003 + exitProcess(context.Background(), Log().Named("admin.api"))
1004 return nil
1005 }
1006
caddy.go
+2 -2
@@ -621,7 +621,7 @@ func Validate(cfg *Config) error {
621 // PID file, and shuts down admin endpoint(s) in a goroutine.
622 // Errors are logged along the way, and an appropriate exit
623 // code is emitted.
624 -func exitProcess(logger *zap.Logger) {
624 +func exitProcess(ctx context.Context, logger *zap.Logger) {
625 if logger == nil {
626 logger = Log()
627 }
@@ -636,7 +636,7 @@ func exitProcess(logger *zap.Logger) {
636 }
637
638 // clean up certmagic locks
639 - certmagic.CleanUpOwnLocks(logger)
639 + certmagic.CleanUpOwnLocks(ctx, logger)
640
641 // remove pidfile
642 if pidfile != "" {
caddyconfig/httpcaddyfile/builtins.go
+2 -2
@@ -95,7 +95,7 @@ func parseTLS(h Helper) ([]ConfigValue, error) {
95 var keyType string
96 var internalIssuer *caddytls.InternalIssuer
97 var issuers []certmagic.Issuer
98 - var certManagers []certmagic.CertificateManager
98 + var certManagers []certmagic.Manager
99 var onDemand bool
100
101 for h.Next() {
@@ -320,7 +320,7 @@ func parseTLS(h Helper) ([]ConfigValue, error) {
320 if err != nil {
321 return nil, err
322 }
323 - certManager, ok := unm.(certmagic.CertificateManager)
323 + certManager, ok := unm.(certmagic.Manager)
324 if !ok {
325 return nil, h.Errf("module %s (%T) is not a certmagic.CertificateManager", modID, unm)
326 }
go.mod
+3 -3
@@ -8,7 +8,7 @@ require (
8 github.com/Masterminds/sprig/v3 v3.2.2
9 github.com/alecthomas/chroma v0.10.0
10 github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b
11 - github.com/caddyserver/certmagic v0.15.4
11 + github.com/caddyserver/certmagic v0.16.0
12 github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac
13 github.com/fsnotify/fsnotify v1.5.1 // indirect
14 github.com/go-chi/chi v4.1.2+incompatible
@@ -33,8 +33,8 @@ require (
33 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.0
34 go.opentelemetry.io/otel/sdk v1.4.0
35 go.uber.org/zap v1.21.0
36 - golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
37 - golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d
36 + golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2
37 + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
38 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
39 google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5
40 google.golang.org/protobuf v1.27.1
go.sum
+12 -12
@@ -184,8 +184,8 @@ github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl
184 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
185 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
186 github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw=
187 -github.com/caddyserver/certmagic v0.15.4 h1:kz//9+Z/xw197jtIBxxUDub8pQi9gcYvhXk5Ouw2EkM=
188 -github.com/caddyserver/certmagic v0.15.4/go.mod h1:qhkAOthf72ufAcp3Y5jF2RaGE96oip3UbEQRIzwe3/8=
187 +github.com/caddyserver/certmagic v0.16.0 h1:nM6Fm+OSnTpx/uRWmN++I2fYq006uhi6m6m3rD1Jjtg=
188 +github.com/caddyserver/certmagic v0.16.0/go.mod h1:jKQ5n+ViHAr6DbPwEGLTSM2vDwTO6EvCKBblBRUvvuQ=
189 github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo=
190 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
191 github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A=
@@ -634,7 +634,6 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
634 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
635 github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=
636 github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
637 -github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
637 github.com/klauspost/cpuid/v2 v2.0.11 h1:i2lw1Pm7Yi/4O6XCSyJWqEHI2MDw2FzUK6o/D21xn2A=
638 github.com/klauspost/cpuid/v2 v2.0.11/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
639 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -708,15 +707,14 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
707 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
708 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
709 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
711 -github.com/mholt/acmez v1.0.1/go.mod h1:8qnn8QA/Ewx8E3ZSsmscqsIjhhpxuy9vqdgbX2ceceM=
710 github.com/mholt/acmez v1.0.2 h1:C8wsEBIUVi6e0DYoxqCcFuXtwc4AWXL/jgcDjF7mjVo=
711 github.com/mholt/acmez v1.0.2/go.mod h1:8qnn8QA/Ewx8E3ZSsmscqsIjhhpxuy9vqdgbX2ceceM=
712 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
713 github.com/micromdm/scep/v2 v2.1.0 h1:2fS9Rla7qRR266hvUoEauBJ7J6FhgssEiq2OkSKXmaU=
714 github.com/micromdm/scep/v2 v2.1.0/go.mod h1:BkF7TkPPhmgJAMtHfP+sFTKXmgzNJgLQlvvGoOExBcc=
715 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
718 -github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
719 -github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
716 +github.com/miekg/dns v1.1.46 h1:uzwpxRtSVxtcIZmz/4Uz6/Rn7G11DvsaslXoy5LxQio=
717 +github.com/miekg/dns v1.1.46/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
718 github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
719 github.com/miekg/pkcs11 v1.0.3-0.20190429190417-a667d056470f/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
720 github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
@@ -1171,8 +1169,8 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
1169 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
1170 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
1171 golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
1174 -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
1175 -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
1172 +golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2 h1:XdAboW3BNMv9ocSCOk/u1MFioZGzCNkiJZ19v9Oe3Ig=
1173 +golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
1174 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
1175 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
1176 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1271,10 +1269,11 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
1269 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
1270 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1271 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1272 +golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1273 golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1274 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1276 -golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d h1:1n1fc535VhN8SYtD4cDUyNlfpAF2ROMM9+11equK3hs=
1277 -golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1275 +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
1276 +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
1277 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
1278 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
1279 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1379,7 +1378,6 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
1378 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1379 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1380 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1382 -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1381 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1382 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1383 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1403,6 +1401,7 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc
1401 golang.org/x/sys v0.0.0-20210915083310-ed5796bab164/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1402 golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1403 golang.org/x/sys v0.0.0-20211031064116-611d5d643895/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1404 +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1405 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
1406 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1407 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -1500,8 +1499,9 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
1499 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
1500 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
1501 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
1503 -golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
1502 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
1503 +golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 h1:BonxutuHCTL0rBDnZlKjpGIQFTjyUVTexFOdWkB6Fg0=
1504 +golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
1505 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1506 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1507 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
modules/caddyhttp/autohttps.go
+2 -2
@@ -480,7 +480,7 @@ func (app *App) createAutomationPolicies(ctx caddy.Context, internalNames []stri
480 if err != nil {
481 return err
482 }
483 - ap.Managers = []certmagic.CertificateManager{ts}
483 + ap.Managers = []certmagic.Manager{ts}
484 }
485
486 // while we're here, is this the catch-all/base policy?
@@ -497,7 +497,7 @@ func (app *App) createAutomationPolicies(ctx caddy.Context, internalNames []stri
497 return err
498 }
499 basePolicy = &caddytls.AutomationPolicy{
500 - Managers: []certmagic.CertificateManager{ts},
500 + Managers: []certmagic.Manager{ts},
501 }
502 }
503
modules/caddypki/ca.go
+14 -10
@@ -18,7 +18,9 @@ import (
18 "crypto"
19 "crypto/x509"
20 "encoding/json"
21 + "errors"
22 "fmt"
23 + "io/fs"
24 "path"
25 "sync"
26 "time"
@@ -76,12 +78,14 @@ type CA struct {
78
79 rootCertPath string // mainly used for logging purposes if trusting
80 log *zap.Logger
81 + ctx caddy.Context
82 }
83
84 // Provision sets up the CA.
85 func (ca *CA) Provision(ctx caddy.Context, id string, log *zap.Logger) error {
86 ca.mu = new(sync.RWMutex)
87 ca.log = log.Named("ca." + id)
88 + ca.ctx = ctx
89
90 if id == "" {
91 return fmt.Errorf("CA ID is required (use 'local' for the default CA)")
@@ -215,9 +219,9 @@ func (ca CA) NewAuthority(authorityConfig AuthorityConfig) (*authority.Authority
219 }
220
221 func (ca CA) loadOrGenRoot() (rootCert *x509.Certificate, rootKey interface{}, err error) {
218 - rootCertPEM, err := ca.storage.Load(ca.storageKeyRootCert())
222 + rootCertPEM, err := ca.storage.Load(ca.ctx, ca.storageKeyRootCert())
223 if err != nil {
220 - if _, ok := err.(certmagic.ErrNotExist); !ok {
224 + if !errors.Is(err, fs.ErrNotExist) {
225 return nil, nil, fmt.Errorf("loading root cert: %v", err)
226 }
227
@@ -235,7 +239,7 @@ func (ca CA) loadOrGenRoot() (rootCert *x509.Certificate, rootKey interface{}, e
239 }
240 }
241 if rootKey == nil {
238 - rootKeyPEM, err := ca.storage.Load(ca.storageKeyRootKey())
242 + rootKeyPEM, err := ca.storage.Load(ca.ctx, ca.storageKeyRootKey())
243 if err != nil {
244 return nil, nil, fmt.Errorf("loading root key: %v", err)
245 }
@@ -259,7 +263,7 @@ func (ca CA) genRoot() (rootCert *x509.Certificate, rootKey interface{}, err err
263 if err != nil {
264 return nil, nil, fmt.Errorf("encoding root certificate: %v", err)
265 }
262 - err = ca.storage.Store(ca.storageKeyRootCert(), rootCertPEM)
266 + err = ca.storage.Store(ca.ctx, ca.storageKeyRootCert(), rootCertPEM)
267 if err != nil {
268 return nil, nil, fmt.Errorf("saving root certificate: %v", err)
269 }
@@ -267,7 +271,7 @@ func (ca CA) genRoot() (rootCert *x509.Certificate, rootKey interface{}, err err
271 if err != nil {
272 return nil, nil, fmt.Errorf("encoding root key: %v", err)
273 }
270 - err = ca.storage.Store(ca.storageKeyRootKey(), rootKeyPEM)
274 + err = ca.storage.Store(ca.ctx, ca.storageKeyRootKey(), rootKeyPEM)
275 if err != nil {
276 return nil, nil, fmt.Errorf("saving root key: %v", err)
277 }
@@ -276,9 +280,9 @@ func (ca CA) genRoot() (rootCert *x509.Certificate, rootKey interface{}, err err
280 }
281
282 func (ca CA) loadOrGenIntermediate(rootCert *x509.Certificate, rootKey crypto.PrivateKey) (interCert *x509.Certificate, interKey crypto.PrivateKey, err error) {
279 - interCertPEM, err := ca.storage.Load(ca.storageKeyIntermediateCert())
283 + interCertPEM, err := ca.storage.Load(ca.ctx, ca.storageKeyIntermediateCert())
284 if err != nil {
281 - if _, ok := err.(certmagic.ErrNotExist); !ok {
285 + if !errors.Is(err, fs.ErrNotExist) {
286 return nil, nil, fmt.Errorf("loading intermediate cert: %v", err)
287 }
288
@@ -297,7 +301,7 @@ func (ca CA) loadOrGenIntermediate(rootCert *x509.Certificate, rootKey crypto.Pr
301 }
302
303 if interKey == nil {
300 - interKeyPEM, err := ca.storage.Load(ca.storageKeyIntermediateKey())
304 + interKeyPEM, err := ca.storage.Load(ca.ctx, ca.storageKeyIntermediateKey())
305 if err != nil {
306 return nil, nil, fmt.Errorf("loading intermediate key: %v", err)
307 }
@@ -321,7 +325,7 @@ func (ca CA) genIntermediate(rootCert *x509.Certificate, rootKey crypto.PrivateK
325 if err != nil {
326 return nil, nil, fmt.Errorf("encoding intermediate certificate: %v", err)
327 }
324 - err = ca.storage.Store(ca.storageKeyIntermediateCert(), interCertPEM)
328 + err = ca.storage.Store(ca.ctx, ca.storageKeyIntermediateCert(), interCertPEM)
329 if err != nil {
330 return nil, nil, fmt.Errorf("saving intermediate certificate: %v", err)
331 }
@@ -329,7 +333,7 @@ func (ca CA) genIntermediate(rootCert *x509.Certificate, rootKey crypto.PrivateK
333 if err != nil {
334 return nil, nil, fmt.Errorf("encoding intermediate key: %v", err)
335 }
332 - err = ca.storage.Store(ca.storageKeyIntermediateKey(), interKeyPEM)
336 + err = ca.storage.Store(ca.ctx, ca.storageKeyIntermediateKey(), interKeyPEM)
337 if err != nil {
338 return nil, nil, fmt.Errorf("saving intermediate key: %v", err)
339 }
modules/caddytls/acmeissuer.go
+7 -7
@@ -85,7 +85,7 @@ type ACMEIssuer struct {
85 PreferredChains *ChainPreference `json:"preferred_chains,omitempty"`
86
87 rootPool *x509.CertPool
88 - template certmagic.ACMEManager
88 + template certmagic.ACMEIssuer
89 magic *certmagic.Config
90 logger *zap.Logger
91 }
@@ -172,8 +172,8 @@ func (iss *ACMEIssuer) Provision(ctx caddy.Context) error {
172 return nil
173 }
174
175 -func (iss *ACMEIssuer) makeIssuerTemplate() (certmagic.ACMEManager, error) {
176 - template := certmagic.ACMEManager{
175 +func (iss *ACMEIssuer) makeIssuerTemplate() (certmagic.ACMEIssuer, error) {
176 + template := certmagic.ACMEIssuer{
177 CA: iss.CA,
178 TestCA: iss.TestCA,
179 Email: iss.Email,
@@ -224,22 +224,22 @@ func (iss *ACMEIssuer) SetConfig(cfg *certmagic.Config) {
224
225 // PreCheck implements the certmagic.PreChecker interface.
226 func (iss *ACMEIssuer) PreCheck(ctx context.Context, names []string, interactive bool) error {
227 - return certmagic.NewACMEManager(iss.magic, iss.template).PreCheck(ctx, names, interactive)
227 + return certmagic.NewACMEIssuer(iss.magic, iss.template).PreCheck(ctx, names, interactive)
228 }
229
230 // Issue obtains a certificate for the given csr.
231 func (iss *ACMEIssuer) Issue(ctx context.Context, csr *x509.CertificateRequest) (*certmagic.IssuedCertificate, error) {
232 - return certmagic.NewACMEManager(iss.magic, iss.template).Issue(ctx, csr)
232 + return certmagic.NewACMEIssuer(iss.magic, iss.template).Issue(ctx, csr)
233 }
234
235 // IssuerKey returns the unique issuer key for the configured CA endpoint.
236 func (iss *ACMEIssuer) IssuerKey() string {
237 - return certmagic.NewACMEManager(iss.magic, iss.template).IssuerKey()
237 + return certmagic.NewACMEIssuer(iss.magic, iss.template).IssuerKey()
238 }
239
240 // Revoke revokes the given certificate.
241 func (iss *ACMEIssuer) Revoke(ctx context.Context, cert certmagic.CertificateResource, reason int) error {
242 - return certmagic.NewACMEManager(iss.magic, iss.template).Revoke(ctx, cert, reason)
242 + return certmagic.NewACMEIssuer(iss.magic, iss.template).Revoke(ctx, cert, reason)
243 }
244
245 // GetACMEIssuer returns iss. This is useful when other types embed ACMEIssuer, because
modules/caddytls/automation.go
+3 -3
@@ -141,8 +141,8 @@ type AutomationPolicy struct {
141 // they are only used to populate an underlying certmagic.Config's
142 // fields during provisioning so that the modules can survive a
143 // re-provisioning.
144 - Issuers []certmagic.Issuer `json:"-"`
145 - Managers []certmagic.CertificateManager `json:"-"`
144 + Issuers []certmagic.Issuer `json:"-"`
145 + Managers []certmagic.Manager `json:"-"`
146
147 magic *certmagic.Config
148 storage certmagic.Storage
@@ -199,7 +199,7 @@ func (ap *AutomationPolicy) Provision(tlsApp *TLS) error {
199 return fmt.Errorf("loading external certificate manager modules: %v", err)
200 }
201 for _, getCertVal := range vals.([]interface{}) {
202 - ap.Managers = append(ap.Managers, getCertVal.(certmagic.CertificateManager))
202 + ap.Managers = append(ap.Managers, getCertVal.(certmagic.Manager))
203 }
204 }
205
modules/caddytls/certmanagers.go
+6 -6
@@ -198,11 +198,11 @@ func (hcg *HTTPCertGetter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
198
199 // Interface guards
200 var (
201 - _ certmagic.CertificateManager = (*Tailscale)(nil)
202 - _ caddy.Provisioner = (*Tailscale)(nil)
203 - _ caddyfile.Unmarshaler = (*Tailscale)(nil)
201 + _ certmagic.Manager = (*Tailscale)(nil)
202 + _ caddy.Provisioner = (*Tailscale)(nil)
203 + _ caddyfile.Unmarshaler = (*Tailscale)(nil)
204
205 - _ certmagic.CertificateManager = (*HTTPCertGetter)(nil)
206 - _ caddy.Provisioner = (*HTTPCertGetter)(nil)
207 - _ caddyfile.Unmarshaler = (*HTTPCertGetter)(nil)
205 + _ certmagic.Manager = (*HTTPCertGetter)(nil)
206 + _ caddy.Provisioner = (*HTTPCertGetter)(nil)
207 + _ caddyfile.Unmarshaler = (*HTTPCertGetter)(nil)
208 )
modules/caddytls/distributedstek/distributedstek.go
+6 -4
@@ -26,7 +26,9 @@ import (
26 "bytes"
27 "encoding/gob"
28 "encoding/json"
29 + "errors"
30 "fmt"
31 + "io/fs"
32 "log"
33 "runtime/debug"
34 "time"
@@ -115,7 +117,7 @@ func (s *Provider) Next(doneChan <-chan struct{}) <-chan [][32]byte {
117
118 func (s *Provider) loadSTEK() (distributedSTEK, error) {
119 var sg distributedSTEK
118 - gobBytes, err := s.storage.Load(stekFileName)
120 + gobBytes, err := s.storage.Load(s.ctx, stekFileName)
121 if err != nil {
122 return sg, err // don't wrap, in case error is certmagic.ErrNotExist
123 }
@@ -133,7 +135,7 @@ func (s *Provider) storeSTEK(dstek distributedSTEK) error {
135 if err != nil {
136 return fmt.Errorf("encoding STEK gob: %v", err)
137 }
136 - err = s.storage.Store(stekFileName, buf.Bytes())
138 + err = s.storage.Store(s.ctx, stekFileName, buf.Bytes())
139 if err != nil {
140 return fmt.Errorf("storing STEK gob: %v", err)
141 }
@@ -151,11 +153,11 @@ func (s *Provider) getSTEK() (distributedSTEK, error) {
153 }
154
155 //nolint:errcheck
154 - defer s.storage.Unlock(stekLockName)
156 + defer s.storage.Unlock(s.ctx, stekLockName)
157
158 // load the current STEKs from storage
159 dstek, err := s.loadSTEK()
158 - if _, isNotExist := err.(certmagic.ErrNotExist); isNotExist {
160 + if errors.Is(err, fs.ErrNotExist) {
161 // if there is none, then make some right away
162 dstek, err = s.rotateKeys(dstek)
163 if err != nil {
modules/caddytls/storageloader.go
+5 -2
@@ -35,6 +35,8 @@ type StorageLoader struct {
35
36 // Reference to the globally configured storage module.
37 storage certmagic.Storage
38 +
39 + ctx caddy.Context
40 }
41
42 // CaddyModule returns the Caddy module information.
@@ -48,6 +50,7 @@ func (StorageLoader) CaddyModule() caddy.ModuleInfo {
50 // Provision loads the storage module for sl.
51 func (sl *StorageLoader) Provision(ctx caddy.Context) error {
52 sl.storage = ctx.Storage()
53 + sl.ctx = ctx
54 return nil
55 }
56
@@ -55,11 +58,11 @@ func (sl *StorageLoader) Provision(ctx caddy.Context) error {
58 func (sl StorageLoader) LoadCertificates() ([]Certificate, error) {
59 certs := make([]Certificate, 0, len(sl.Pairs))
60 for _, pair := range sl.Pairs {
58 - certData, err := sl.storage.Load(pair.Certificate)
61 + certData, err := sl.storage.Load(sl.ctx, pair.Certificate)
62 if err != nil {
63 return nil, err
64 }
62 - keyData, err := sl.storage.Load(pair.Key)
65 + keyData, err := sl.storage.Load(sl.ctx, pair.Key)
66 if err != nil {
67 return nil, err
68 }
modules/caddytls/tls.go
+2 -2
@@ -199,7 +199,7 @@ func (t *TLS) Provision(ctx caddy.Context) error {
199 return fmt.Errorf("loading certificates: %v", err)
200 }
201 for _, cert := range certs {
202 - err := magic.CacheUnmanagedTLSCertificate(cert.Certificate, cert.Tags)
202 + err := magic.CacheUnmanagedTLSCertificate(ctx, cert.Certificate, cert.Tags)
203 if err != nil {
204 return fmt.Errorf("caching unmanaged certificate: %v", err)
205 }
@@ -336,7 +336,7 @@ func (t *TLS) HandleHTTPChallenge(w http.ResponseWriter, r *http.Request) bool {
336 for _, iss := range ap.magic.Issuers {
337 if am, ok := iss.(acmeCapable); ok {
338 iss := am.GetACMEIssuer()
339 - if certmagic.NewACMEManager(iss.magic, iss.template).HandleHTTPChallenge(w, r) {
339 + if certmagic.NewACMEIssuer(iss.magic, iss.template).HandleHTTPChallenge(w, r) {
340 return true
341 }
342 }
modules/caddytls/zerosslissuer.go
+4 -4
@@ -69,12 +69,12 @@ func (iss *ZeroSSLIssuer) Provision(ctx caddy.Context) error {
69 }
70
71 // newAccountCallback generates EAB if not already provided. It also sets a valid default contact on the account if not set.
72 -func (iss *ZeroSSLIssuer) newAccountCallback(ctx context.Context, am *certmagic.ACMEManager, acct acme.Account) (acme.Account, error) {
73 - if am.ExternalAccount != nil {
72 +func (iss *ZeroSSLIssuer) newAccountCallback(ctx context.Context, acmeIss *certmagic.ACMEIssuer, acct acme.Account) (acme.Account, error) {
73 + if acmeIss.ExternalAccount != nil {
74 return acct, nil
75 }
76 var err error
77 - am.ExternalAccount, acct, err = iss.generateEABCredentials(ctx, acct)
77 + acmeIss.ExternalAccount, acct, err = iss.generateEABCredentials(ctx, acct)
78 return acct, err
79 }
80
@@ -153,7 +153,7 @@ func (iss *ZeroSSLIssuer) generateEABCredentials(ctx context.Context, acct acme.
153 }, acct, nil
154 }
155
156 -// initialize modifies the template for the underlying ACMEManager
156 +// initialize modifies the template for the underlying ACMEIssuer
157 // values by setting the CA endpoint to the ZeroSSL directory and
158 // setting the NewAccountFunc callback to one which allows us to
159 // generate EAB credentials only if a new account is being made.
sigtrap.go
+2 -1
@@ -15,6 +15,7 @@
15 package caddy
16
17 import (
18 + "context"
19 "os"
20 "os/signal"
21
@@ -55,7 +56,7 @@ func trapSignalsCrossPlatform() {
56 // exitProcessFromSignal exits the process from a system signal.
57 func exitProcessFromSignal(sigName string) {
58 logger := Log().With(zap.String("signal", sigName))
58 - exitProcess(logger)
59 + exitProcess(context.TODO(), logger)
60 }
61
62 // Exit codes. Generally, you should NOT
sigtrap_posix.go
+2 -1
@@ -18,6 +18,7 @@
18 package caddy
19
20 import (
21 + "context"
22 "os"
23 "os/signal"
24 "syscall"
@@ -36,7 +37,7 @@ func trapSignalsPosix() {
37 switch sig {
38 case syscall.SIGQUIT:
39 Log().Info("quitting process immediately", zap.String("signal", "SIGQUIT"))
39 - certmagic.CleanUpOwnLocks(Log()) // try to clean up locks anyway, it's important
40 + certmagic.CleanUpOwnLocks(context.TODO(), Log()) // try to clean up locks anyway, it's important
41 os.Exit(ExitCodeForceQuit)
42
43 case syscall.SIGTERM: