mirror of
				https://github.com/caddyserver/caddy.git
				synced 2025-11-04 03:27:23 -05:00 
			
		
		
		
	fuzz: Remove Caddyfile adapter from fuzz corpus (#2925)
The Caddyfile adapter does not need to be fuzzed, as all it really does is invoke the Caddyfile parser, which is already fuzzed
This commit is contained in:
		
							parent
							
								
									fab5e4372a
								
							
						
					
					
						commit
						2e0615270d
					
				@ -206,7 +206,6 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  - bash: |
 | 
					  - bash: |
 | 
				
			||||||
      declare -A fuzzers_funcs=(\
 | 
					      declare -A fuzzers_funcs=(\
 | 
				
			||||||
        ["./caddyconfig/httpcaddyfile/adapter_fuzz.go"]="FuzzHTTPCaddyfileAdapter" \
 | 
					 | 
				
			||||||
        ["./caddyconfig/httpcaddyfile/addresses_fuzz.go"]="FuzzParseAddress" \
 | 
					        ["./caddyconfig/httpcaddyfile/addresses_fuzz.go"]="FuzzParseAddress" \
 | 
				
			||||||
        ["./caddyconfig/caddyfile/parse_fuzz.go"]="FuzzParseCaddyfile" \
 | 
					        ["./caddyconfig/caddyfile/parse_fuzz.go"]="FuzzParseCaddyfile" \
 | 
				
			||||||
        ["./listeners_fuzz.go"]="FuzzParseNetworkAddress" \
 | 
					        ["./listeners_fuzz.go"]="FuzzParseNetworkAddress" \
 | 
				
			||||||
@ -214,7 +213,6 @@ jobs:
 | 
				
			|||||||
      )
 | 
					      )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      declare -A fuzzers_targets=(\
 | 
					      declare -A fuzzers_targets=(\
 | 
				
			||||||
        ["./caddyconfig/httpcaddyfile/adapter_fuzz.go"]="caddyfile-adapter" \
 | 
					 | 
				
			||||||
        ["./caddyconfig/httpcaddyfile/addresses_fuzz.go"]="parse-address" \
 | 
					        ["./caddyconfig/httpcaddyfile/addresses_fuzz.go"]="parse-address" \
 | 
				
			||||||
        ["./caddyconfig/caddyfile/parse_fuzz.go"]="parse-caddyfile" \
 | 
					        ["./caddyconfig/caddyfile/parse_fuzz.go"]="parse-caddyfile" \
 | 
				
			||||||
        ["./listeners_fuzz.go"]="parse-network-address" \
 | 
					        ["./listeners_fuzz.go"]="parse-network-address" \
 | 
				
			||||||
 | 
				
			|||||||
@ -1,43 +0,0 @@
 | 
				
			|||||||
// Copyright 2015 Matthew Holt and The Caddy Authors
 | 
					 | 
				
			||||||
//
 | 
					 | 
				
			||||||
// Licensed under the Apache License, Version 2.0 (the "License");
 | 
					 | 
				
			||||||
// you may not use this file except in compliance with the License.
 | 
					 | 
				
			||||||
// You may obtain a copy of the License at
 | 
					 | 
				
			||||||
//
 | 
					 | 
				
			||||||
//     http://www.apache.org/licenses/LICENSE-2.0
 | 
					 | 
				
			||||||
//
 | 
					 | 
				
			||||||
// Unless required by applicable law or agreed to in writing, software
 | 
					 | 
				
			||||||
// distributed under the License is distributed on an "AS IS" BASIS,
 | 
					 | 
				
			||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
					 | 
				
			||||||
// See the License for the specific language governing permissions and
 | 
					 | 
				
			||||||
// limitations under the License.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
// +build gofuzz
 | 
					 | 
				
			||||||
// +build gofuzz_libfuzzer
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
package httpcaddyfile
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import (
 | 
					 | 
				
			||||||
	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
 | 
					 | 
				
			||||||
)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
func FuzzHTTPCaddyfileAdapter(data []byte) int {
 | 
					 | 
				
			||||||
	adapter := caddyfile.Adapter{
 | 
					 | 
				
			||||||
		ServerType: ServerType{},
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	_, 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
 | 
					 | 
				
			||||||
	// errors or warnings as interesting in this case
 | 
					 | 
				
			||||||
	// 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) {
 | 
					 | 
				
			||||||
		return 0
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	return 1
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user