From 1be121cec7f4f43bd82001d4e5ee770005e42d52 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Wed, 30 Oct 2019 11:48:21 -0600 Subject: fuzz: Don't call Load() in HTTP caddyfile adapter fuzz tests Doing so has a tendency to request certificates... --- caddyconfig/httpcaddyfile/adapter_fuzz.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'caddyconfig') diff --git a/caddyconfig/httpcaddyfile/adapter_fuzz.go b/caddyconfig/httpcaddyfile/adapter_fuzz.go index 1748b66..2aaead7 100644 --- a/caddyconfig/httpcaddyfile/adapter_fuzz.go +++ b/caddyconfig/httpcaddyfile/adapter_fuzz.go @@ -18,9 +18,6 @@ package httpcaddyfile import ( - "bytes" - - "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" ) @@ -28,7 +25,9 @@ func FuzzHTTPCaddyfileAdapter(data []byte) int { adapter := caddyfile.Adapter{ ServerType: ServerType{}, } - b, warns, err := adapter.Adapt(data, nil) + + _, warns, err := adapter.Adapt(data, nil) + // Adapt func calls the Setup() func of the ServerType, // thus it's going across multiple layers, each can // 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 // catch errors. Let's push the fuzzer to where it passes // but breaks. - if (err != nil) || (warns != nil && len(warns) > 0) { + if err != nil || (warns != nil && len(warns) > 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 } -- cgit v1.2.3