Skip to content

upstream: fix oss-fuzz issue #11095. #6220

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

Merged
htuch merged 5 commits into from
Mar 12, 2019
Merged

upstream: fix oss-fuzz issue #11095. #6220

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74b4c33
upstream: fix oss-fuzz issue #11095.
ipuustin Mar 8, 2019
21e7d1e
test: add fuzz test case to corpus.
ipuustin Mar 8, 2019
ba1e4d0
tests: add a test for HostDescriptionImpl constructor.
ipuustin Mar 8, 2019
d97a770
If health check address is misconfigured, throw exception.
ipuustin Mar 11, 2019
c7d08b6
Change non-null port -> non-zero port.
ipuustin Mar 11, 2019
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
3 changes: 2 additions & 1 deletion source/common/upstream/upstream_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ class HostDescriptionImpl : virtual public HostDescription {
const envoy::api::v2::endpoint::Endpoint::HealthCheckConfig& health_check_config,
uint32_t priority)
: cluster_(cluster), hostname_(hostname), address_(dest_address),
health_check_address_(health_check_config.port_value() == 0
health_check_address_(health_check_config.port_value() == 0 ||
dest_address->type() != Network::Address::Type::Ip
? dest_address
: Network::Utility::getAddressWithPort(
*dest_address, health_check_config.port_value())),
Expand Down
13 changes: 13 additions & 0 deletions test/common/upstream/upstream_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,19 @@ TEST(HostImplTest, HealthFlags) {
EXPECT_EQ(Host::Health::Unhealthy, host->health());
}

// Test that it's possible to do a HostDescriptionImpl with a unix
// domain socket host and a health check config with non-zero port.
// This is a regression test for oss-fuzz issue
// https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11095
TEST(HostImplTest, HealthPipeAddress) {
std::shared_ptr<MockClusterInfo> info{new NiceMock<MockClusterInfo>()};
envoy::api::v2::endpoint::Endpoint::HealthCheckConfig config;
config.set_port_value(8000);
HostDescriptionImpl descr(info, "", Network::Utility::resolveUrl("unix://foo"),
envoy::api::v2::core::Metadata::default_instance(),
envoy::api::v2::core::Locality().default_instance(), config, 1);
}

class StaticClusterImplTest : public testing::Test, public UpstreamImplTestBase {};

TEST_F(StaticClusterImplTest, InitialHosts) {
Expand Down
1 change: 1 addition & 0 deletions test/server/server_corpus/clusterfuzz-testcase-minimized-server_fuzz_test-5742573780467712
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
static_resources { clusters { name: " " connect_timeout { nanos: 4 } load_assignment { cluster_name: " " endpoints { lb_endpoints { endpoint { address { pipe { path: " " } } health_check_config { port_value: 2 } } } } } } }