github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-27 02:33:48 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Francis Lavoie 2022-04-26 00:00:39 -04:00 committed by GitHub
parent a8bb4a665a
commit d543ad1ffd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/caddypki/command.go
View File

@ -133,7 +133,7 @@ func cmdTrust(fl caddycmd.Flags) (int, error) {
ca := CA{ ca := CA{
log: caddy.Log(), log: caddy.Log(),
root: rootCert, root: rootCert,
rootCertPath: adminAddr + path.Join(adminPKIEndpointBase, caID, "certificates"), rootCertPath: adminAddr + path.Join(adminPKIEndpointBase, "ca", caID),
} }
// Install the cert! // 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. // 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) { 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 // Make the request to fetch the CA info
resp, err := caddycmd.AdminAPIRequest(adminAddr, http.MethodGet, uri, make(http.Header), nil) resp, err := caddycmd.AdminAPIRequest(adminAddr, http.MethodGet, uri, make(http.Header), nil)