aboutsummaryrefslogtreecommitdiffhomepage
path: root/modules/caddypki
diff options
context:
space:
mode:
authorMatthew Holt <[email protected]>2021-06-03 12:18:25 -0600
committerMatthew Holt <[email protected]>2021-06-03 12:18:25 -0600
commitecd5eeab3857a0d6903a85bf52183171bda1920c (patch)
treed585c6168741855f6647759f63f6fa820ded1c73 /modules/caddypki
parentb4cef492cc2b4c6ee0e43b083488823cbf5e3a48 (diff)
downloadcaddy-ecd5eeab3857a0d6903a85bf52183171bda1920c.tar.gz
caddy-ecd5eeab3857a0d6903a85bf52183171bda1920c.zip
go.mod: Update direct dependencies
Diffstat (limited to 'modules/caddypki')
-rw-r--r--modules/caddypki/acmeserver/acmeserver.go23
1 files changed, 15 insertions, 8 deletions
diff --git a/modules/caddypki/acmeserver/acmeserver.go b/modules/caddypki/acmeserver/acmeserver.go
index f5c013b02..e6399eaa9 100644
--- a/modules/caddypki/acmeserver/acmeserver.go
+++ b/modules/caddypki/acmeserver/acmeserver.go
@@ -29,6 +29,7 @@ import (
"github.com/go-chi/chi"
"github.com/smallstep/certificates/acme"
acmeAPI "github.com/smallstep/certificates/acme/api"
+ acmeNoSQL "github.com/smallstep/certificates/acme/db/nosql"
"github.com/smallstep/certificates/authority"
"github.com/smallstep/certificates/authority/provisioner"
"github.com/smallstep/certificates/db"
@@ -138,17 +139,23 @@ func (ash *Handler) Provision(ctx caddy.Context) error {
return err
}
- acmeAuth, err := acme.New(auth, acme.AuthorityOptions{
- DB: auth.GetDatabase().(nosql.DB), // stores all the server state
- DNS: ash.Host, // used for directory links; TODO: not needed
- Prefix: strings.Trim(ash.PathPrefix, "/"), // used for directory links
- })
- if err != nil {
- return err
+ var acmeDB acme.DB
+ if authorityConfig.DB != nil {
+ acmeDB, err = acmeNoSQL.New(auth.GetDatabase().(nosql.DB))
+ if err != nil {
+ return fmt.Errorf("configuring ACME DB: %v", err)
+ }
}
// create the router for the ACME endpoints
- acmeRouterHandler := acmeAPI.New(acmeAuth)
+ acmeRouterHandler := acmeAPI.NewHandler(acmeAPI.HandlerOptions{
+ CA: auth,
+ DB: acmeDB, // stores all the server state
+ DNS: ash.Host, // used for directory links; TODO: not needed (follow-up upstream with step-ca)
+ Prefix: ash.PathPrefix, // used for directory links
+ })
+
+ // extract its http.Handler so we can use it directly
r := chi.NewRouter()
r.Route(ash.PathPrefix, func(r chi.Router) {
acmeRouterHandler.Route(r)