[fuzz] fix filter crashes from OSS fuzz (envoyproxy#12152)

* fix filter fuzzer crash from OSS fuzz by checking for non-implemented proto fields This will raise an exception that will be caught and abort the test run when an unimplemented oneof field is hit by the fuzzer Signed-off-by: Sam Flattery <[email protected]> Signed-off-by: Kevin Baichoo <[email protected]>
KBaichoo · Jul 30, 2020 · c79eaad · c79eaad
1 parent 4373461
commit c79eaad
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 0 deletions.
diff --git a/api/envoy/config/tap/v3/common.proto b/api/envoy/config/tap/v3/common.proto
@@ -231,6 +231,7 @@ message OutputSink {
 
     // [#not-implemented-hide:]
     // GrpcService to stream data to. The format argument must be PROTO_BINARY.
+    // [#comment: TODO(samflattery): remove cleanup in uber_per_filter.cc once implemented]
     StreamingGrpcSink streaming_grpc = 4;
   }
 }

diff --git a/api/envoy/config/tap/v4alpha/common.proto b/api/envoy/config/tap/v4alpha/common.proto
diff --git a/generated_api_shadow/envoy/config/tap/v3/common.proto b/generated_api_shadow/envoy/config/tap/v3/common.proto
diff --git a/generated_api_shadow/envoy/config/tap/v4alpha/common.proto b/generated_api_shadow/envoy/config/tap/v4alpha/common.proto
diff --git a/...ommon/fuzz/filter_corpus/clusterfuzz-testcase-minimized-filter_fuzz_test-5635252589690880 b/...ommon/fuzz/filter_corpus/clusterfuzz-testcase-minimized-filter_fuzz_test-5635252589690880
diff --git a/test/extensions/filters/http/common/fuzz/uber_per_filter.cc b/test/extensions/filters/http/common/fuzz/uber_per_filter.cc
@@ -103,6 +103,19 @@ void cleanTapConfig(Protobuf::Message* message) {
     config.mutable_common_config()->mutable_static_config()->mutable_match_config()->set_any_match(
         true);
   }
+  // TODO(samflattery): remove once StreamingGrpcSink is implemented
+  else if (config.common_config().config_type_case() ==
+               envoy::extensions::common::tap::v3::CommonExtensionConfig::ConfigTypeCase::
+                   kStaticConfig &&
+           config.common_config()
+                   .static_config()
+                   .output_config()
+                   .sinks(0)
+                   .output_sink_type_case() ==
+               envoy::config::tap::v3::OutputSink::OutputSinkTypeCase::kStreamingGrpc) {
+    // will be caught in UberFilterFuzzer::fuzz
+    throw EnvoyException("received input with not implemented output_sink_type StreamingGrpcSink");
+  }
 }
 
 void UberFilterFuzzer::cleanFuzzedConfig(absl::string_view filter_name,

diff --git a/tools/spelling/spelling_dictionary.txt b/tools/spelling/spelling_dictionary.txt
@@ -1111,6 +1111,7 @@ tuples
 typedef
 typeid
 typesafe
+uber
 ucontext
 udpa
 uint
-Original file line number
+Diff line change
@@ Expand Up / @@ -1111,6 +1111,7 @@ tuples @@
     typedef
     typeid
     typesafe
+    uber
     ucontext
     udpa
     uint
@@ Expand Down @@