serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 22:23:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fuzz: Don't call Load() in HTTP caddyfile adapter fuzz tests

Browse source 
Doing so has a tendency to request certificates...
This commit is contained in:
Matthew Holt 2019-10-30 11:48:21 -06:00
parent dccba71276
commit 1be121cec7
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
caddyconfig/httpcaddyfile/adapter_fuzz.go
View file

@ -18,9 +18,6 @@
package httpcaddyfile package httpcaddyfile
import ( import (
"bytes"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
) )
@ -28,7 +25,9 @@ func FuzzHTTPCaddyfileAdapter(data []byte) int {
adapter := caddyfile.Adapter{ adapter := caddyfile.Adapter{
ServerType: ServerType{}, ServerType: ServerType{},
} }
b, warns, err := adapter.Adapt(data, nil)
_, warns, err := adapter.Adapt(data, nil)
// Adapt func calls the Setup() func of the ServerType, // Adapt func calls the Setup() func of the ServerType,
// thus it's going across multiple layers, each can // thus it's going across multiple layers, each can
// return warnings or errors. Marking the presence of // return warnings or errors. Marking the presence of
@ -36,14 +35,9 @@ func FuzzHTTPCaddyfileAdapter(data []byte) int {
// could push the fuzzer towards a path where we only // could push the fuzzer towards a path where we only
// catch errors. Let's push the fuzzer to where it passes // catch errors. Let's push the fuzzer to where it passes
// but breaks. // but breaks.
if (err != nil) || (warns != nil && len(warns) > 0) { if err != nil || (warns != nil && len(warns) > 0) {
return 0 return 0
} }
// adapted Caddyfile should be parseable by the configuration loader in admin.go
err = caddy.Load(bytes.NewReader(b))
if err != nil {
return 0
}
return 1 return 1
} }