github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-25 09:40:13 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix error handling with Validate when loading modules (fixes #2658)

Browse Source 
The return statement was improperly nested in context.go
This commit is contained in:
Matthew Holt 2019-07-07 14:12:22 -06:00
parent 84f9f7cd60
commit 42acdad9e5
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
context.go
View File

@ -138,8 +138,8 @@ func (ctx Context) LoadModule(name string, rawMsg json.RawMessage) (interface{},
if err2 != nil { if err2 != nil {
err = fmt.Errorf("%v; additionally, cleanup: %v", err, err2) err = fmt.Errorf("%v; additionally, cleanup: %v", err, err2)
} }
return nil, fmt.Errorf("%s: invalid configuration: %v", mod.Name, err)
} }
return nil, fmt.Errorf("%s: invalid configuration: %v", mod.Name, err)
} }
} }

10
modules/caddyhttp/caddyhttp.go
View File

@ -102,7 +102,7 @@ func (app *App) Validate() error {
} }
for _, a := range expanded { for _, a := range expanded {
if sn, ok := lnAddrs[netw+a]; ok { if sn, ok := lnAddrs[netw+a]; ok {
return fmt.Errorf("listener address repeated: %s (already claimed by server '%s')", a, sn) return fmt.Errorf("server %s: listener address repeated: %s (already claimed by server '%s')", srvName, a, sn)
} }
lnAddrs[netw+a] = srvName lnAddrs[netw+a] = srvName
} }
@ -486,5 +486,9 @@ const (
DefaultHTTPSPort = 443 DefaultHTTPSPort = 443
) )
// Interface guard // Interface guards
var _ caddy.App = (*App)(nil) var (
_ caddy.App = (*App)(nil)
_ caddy.Provisioner = (*App)(nil)
_ caddy.Validator = (*App)(nil)
)

8
modules/caddyhttp/fileserver/staticfiles.go
View File

@ -450,5 +450,9 @@ var defaultIndexNames = []string{"index.html"}
const minBackoff, maxBackoff = 2, 5 const minBackoff, maxBackoff = 2, 5
// Interface guard // Interface guards
var _ caddyhttp.Handler = (*FileServer)(nil) var (
_ caddy.Provisioner = (*FileServer)(nil)
_ caddy.Validator = (*FileServer)(nil)
_ caddyhttp.Handler = (*FileServer)(nil)
)