From bbad6931e30a2e74b3f53fff797d1115cc9dd491 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Wed, 2 Mar 2022 13:08:36 -0500 Subject: pki: Implement API endpoints for certs and `caddy trust` (#4443) * admin: Implement /pki/certificates/ API * pki: Lower "skip_install_trust" log level to INFO See https://github.com/caddyserver/caddy/issues/4058#issuecomment-976132935 It's not necessary to warn about this, because this was an option explicitly configured by the user. Still useful to log, but we don't need to be so loud about it. * cmd: Export functions needed for PKI app, return API response to caller * pki: Rewrite `caddy trust` command to use new admin endpoint instead * pki: Rewrite `caddy untrust` command to support using admin endpoint * Refactor cmd and pki packages for determining admin API endpoint --- context.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'context.go') diff --git a/context.go b/context.go index a6386aa..2a6f514 100644 --- a/context.go +++ b/context.go @@ -423,6 +423,17 @@ func (ctx Context) App(name string) (interface{}, error) { return modVal, nil } +// AppIsConfigured returns whether an app named name has been +// configured. Can be called before calling App() to avoid +// instantiating an empty app when that's not desirable. +func (ctx Context) AppIsConfigured(name string) bool { + if _, ok := ctx.cfg.apps[name]; ok { + return true + } + appRaw := ctx.cfg.AppsRaw[name] + return appRaw != nil +} + // Storage returns the configured Caddy storage implementation. func (ctx Context) Storage() certmagic.Storage { return ctx.cfg.storage -- cgit v1.2.3