Browse Source

caddypki: Fix `caddy trust` command to use the correct API endpoint (#4730)

master
Francis Lavoie 3 years ago
committed by GitHub
parent
commit
d543ad1ffd
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      modules/caddypki/command.go

4
modules/caddypki/command.go

@ -133,7 +133,7 @@ func cmdTrust(fl caddycmd.Flags) (int, error) {
ca := CA{
log: caddy.Log(),
root: rootCert,
rootCertPath: adminAddr + path.Join(adminPKIEndpointBase, caID, "certificates"),
rootCertPath: adminAddr + path.Join(adminPKIEndpointBase, "ca", caID),
}
// Install the cert!
@ -207,7 +207,7 @@ func cmdUntrust(fl caddycmd.Flags) (int, error) {
// rootCertFromAdmin makes the API request to fetch the root certificate for the named CA via admin API.
func rootCertFromAdmin(adminAddr string, caID string) (*x509.Certificate, error) {
uri := path.Join(adminPKIEndpointBase, caID, "certificates")
uri := path.Join(adminPKIEndpointBase, "ca", caID)
// Make the request to fetch the CA info
resp, err := caddycmd.AdminAPIRequest(adminAddr, http.MethodGet, uri, make(http.Header), nil)

Loading…
Cancel
Save