opensource/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-11-04 10:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: Fix bug in AppIfConfigured (fix #6336)

Browse Source
This commit is contained in:
Matthew Holt
2024-05-22 18:47:03 -06:00
parent 61917c3443
commit 2ce5c65269
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
context.go
View File

@ -455,20 +455,27 @@ func (ctx Context) App(name string) (any, error) {
// AppIfConfigured is like App, but it returns an error if the // AppIfConfigured is like App, but it returns an error if the
// app has not been configured. This is useful when the app is // app has not been configured. This is useful when the app is
// required and its absence is a configuration error, or when // required and its absence is a configuration error; or when
// the app is optional and you don't want to instantiate a // the app is optional and you don't want to instantiate a
// new one that hasn't been explicitly configured. // new one that hasn't been explicitly configured. If the app
// is not in the configuration, the error wraps ErrNotConfigured.
func (ctx Context) AppIfConfigured(name string) (any, error) { func (ctx Context) AppIfConfigured(name string) (any, error) {
if ctx.cfg == nil {
return nil, fmt.Errorf("app module %s: %w", name, ErrNotConfigured)
}
if app, ok := ctx.cfg.apps[name]; ok { if app, ok := ctx.cfg.apps[name]; ok {
return app, nil return app, nil
} }
appRaw := ctx.cfg.AppsRaw[name] appRaw := ctx.cfg.AppsRaw[name]
if appRaw == nil { if appRaw == nil {
return nil, fmt.Errorf("app module %s is not configured", name) return nil, fmt.Errorf("app module %s: %w", name, ErrNotConfigured)
} }
return ctx.App(name) return ctx.App(name)
} }
// ErrNotConfigured indicates a module is not configured.
var ErrNotConfigured = fmt.Errorf("module not configured")
// Storage returns the configured Caddy storage implementation. // Storage returns the configured Caddy storage implementation.
func (ctx Context) Storage() certmagic.Storage { func (ctx Context) Storage() certmagic.Storage {
return ctx.cfg.storage return ctx.cfg.storage