Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fuzz: H1 capture fuzz test performance improvements. #10281

Merged
merged 1 commit into from
Mar 8, 2020
Merged

fuzz: H1 capture fuzz test performance improvements. #10281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,14 @@ build:asan-fuzzer --config=clang-asan
build:asan-fuzzer --define=FUZZING_ENGINE=libfuzzer
build:asan-fuzzer --copt=-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
build:asan-fuzzer --copt=-fsanitize=fuzzer-no-link
build:asan-fuzzer --copt=-fno-omit-frame-pointer
# Remove UBSAN halt_on_error to avoid crashing on protobuf errors.
build:asan-fuzzer --test_env=UBSAN_OPTIONS=print_stacktrace=1

# Fuzzing without ASAN. This is useful for profiling fuzzers without any ASAN artifacts.
build:plain-fuzzer --define=FUZZING_ENGINE=libfuzzer
build:plain-fuzzer --copt=-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
build:plain-fuzzer --copt=-fsanitize=fuzzer-no-link

try-import %workspace%/clang.bazelrc
try-import %workspace%/user.bazelrc
6 changes: 6 additions & 0 deletions test/fuzz/fuzz_runner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv);
// See https://llvm.org/docs/LibFuzzer.html#fuzz-target.
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size);

#ifdef PERSISTENT_FUZZER
#define PERSISTENT_FUZZ_VAR static
#else
#define PERSISTENT_FUZZ_VAR
#endif

#define DEFINE_TEST_ONE_INPUT_IMPL \
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { \
EnvoyTestOneInput(data, size); \
Expand Down
47 changes: 38 additions & 9 deletions test/integration/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,19 +975,29 @@ envoy_cc_test(
],
)

H1_FUZZ_LIB_DEPS = [
":capture_fuzz_proto_cc_proto",
":http_integration_lib",
"//source/common/common:assert_lib",
"//source/common/common:logger_lib",
"//test/fuzz:fuzz_runner_lib",
"//test/integration:integration_lib",
"//test/test_common:environment_lib",
]

envoy_cc_test_library(
name = "h1_fuzz_lib",
srcs = ["h1_fuzz.cc"],
hdrs = ["h1_fuzz.h"],
deps = [
":capture_fuzz_proto_cc_proto",
":http_integration_lib",
"//source/common/common:assert_lib",
"//source/common/common:logger_lib",
"//test/fuzz:fuzz_runner_lib",
"//test/integration:integration_lib",
"//test/test_common:environment_lib",
],
deps = H1_FUZZ_LIB_DEPS,
)

envoy_cc_test_library(
name = "h1_fuzz_persistent_lib",
srcs = ["h1_fuzz.cc"],
hdrs = ["h1_fuzz.h"],
copts = ["-DPERSISTENT_FUZZER"],
deps = H1_FUZZ_LIB_DEPS,
)

envoy_cc_fuzz_test(
Expand All @@ -997,6 +1007,14 @@ envoy_cc_fuzz_test(
deps = [":h1_fuzz_lib"],
)

envoy_cc_fuzz_test(
name = "h1_capture_persistent_fuzz_test",
srcs = ["h1_capture_fuzz_test.cc"],
copts = ["-DPERSISTENT_FUZZER"],
corpus = "h1_corpus",
deps = [":h1_fuzz_persistent_lib"],
)

envoy_cc_fuzz_test(
name = "h1_capture_direct_response_fuzz_test",
srcs = ["h1_capture_direct_response_fuzz_test.cc"],
Expand All @@ -1007,6 +1025,17 @@ envoy_cc_fuzz_test(
],
)

envoy_cc_fuzz_test(
name = "h1_capture_direct_response_persistent_fuzz_test",
srcs = ["h1_capture_direct_response_fuzz_test.cc"],
copts = ["-DPERSISTENT_FUZZER"],
corpus = "h1_corpus",
deps = [
":h1_fuzz_persistent_lib",
"@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto",
],
)

envoy_cc_test(
name = "scoped_rds_integration_test",
srcs = [
Expand Down
4 changes: 2 additions & 2 deletions test/integration/h1_capture_direct_response_fuzz_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ void H1FuzzIntegrationTest::initialize() {
DEFINE_PROTO_FUZZER(const test::integration::CaptureFuzzTestCase& input) {
RELEASE_ASSERT(!TestEnvironment::getIpVersionsForTest().empty(), "");
const auto ip_version = TestEnvironment::getIpVersionsForTest()[0];
H1FuzzIntegrationTest h1_fuzz_integration_test(ip_version);
h1_fuzz_integration_test.replay(input);
PERSISTENT_FUZZ_VAR H1FuzzIntegrationTest h1_fuzz_integration_test(ip_version);
h1_fuzz_integration_test.replay(input, true);
}

} // namespace Envoy
4 changes: 2 additions & 2 deletions test/integration/h1_capture_fuzz_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ DEFINE_PROTO_FUZZER(const test::integration::CaptureFuzzTestCase& input) {
// Pick an IP version to use for loopback, it doesn't matter which.
RELEASE_ASSERT(!TestEnvironment::getIpVersionsForTest().empty(), "");
const auto ip_version = TestEnvironment::getIpVersionsForTest()[0];
H1FuzzIntegrationTest h1_fuzz_integration_test(ip_version);
h1_fuzz_integration_test.replay(input);
PERSISTENT_FUZZ_VAR H1FuzzIntegrationTest h1_fuzz_integration_test(ip_version);
h1_fuzz_integration_test.replay(input, false);
}

} // namespace Envoy
14 changes: 11 additions & 3 deletions test/integration/h1_fuzz.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@

namespace Envoy {

void H1FuzzIntegrationTest::replay(const test::integration::CaptureFuzzTestCase& input) {
initialize();
fake_upstreams_[0]->set_allow_unexpected_disconnects(true);
void H1FuzzIntegrationTest::replay(const test::integration::CaptureFuzzTestCase& input,
bool ignore_response) {
PERSISTENT_FUZZ_VAR bool initialized = [this]() -> bool {
initialize();
fake_upstreams_[0]->set_allow_unexpected_disconnects(true);
return true;
}();
UNREFERENCED_PARAMETER(initialized);
IntegrationTcpClientPtr tcp_client = makeTcpConnection(lookupPort("http"));
FakeRawConnectionPtr fake_upstream_connection;
for (int i = 0; i < input.events().size(); ++i) {
Expand All @@ -31,6 +36,9 @@ void H1FuzzIntegrationTest::replay(const test::integration::CaptureFuzzTestCase&
// TODO(htuch): Should we wait for some data?
break;
case test::integration::Event::kUpstreamSendBytes:
if (ignore_response) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice.

break;
}
if (fake_upstream_connection == nullptr) {
if (!fake_upstreams_[0]->waitForRawConnection(fake_upstream_connection, max_wait_ms_)) {
// If we timed out, we fail out.
Expand Down
3 changes: 2 additions & 1 deletion test/integration/h1_fuzz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ class H1FuzzIntegrationTest : public HttpIntegrationTest {
: HttpIntegrationTest(Http::CodecClient::Type::HTTP1, version) {}

void initialize() override;
void replay(const test::integration::CaptureFuzzTestCase&);
void replay(const test::integration::CaptureFuzzTestCase&, bool ignore_response);
const std::chrono::milliseconds max_wait_ms_{10};
};

} // namespace Envoy