Skip to content

Dns resolve fuzz bug #17107

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
ggreenway merged 7 commits into from
Aug 17, 2021
Merged

Dns resolve fuzz bug #17107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e758737
add test corpus
Jun 23, 2021
f2ec599
copy param to member
Jun 23, 2021
6a12107
clean up corpus
Jun 23, 2021
01d9797
clean up corpus
Jun 23, 2021
93f6524
Merge branch 'main' of https://github.com/envoyproxy/envoy into dns_r…
Aug 11, 2021
f069f85
add regression test for asan build
Aug 11, 2021
a0691e0
add comment
Aug 12, 2021
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
2 changes: 1 addition & 1 deletion source/common/network/dns_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class DnsResolverImpl : public DnsResolver, protected Logger::Loggable<Logger::I
Event::TimerPtr timer_;
ares_channel channel_;
bool dirty_channel_{};
const envoy::config::core::v3::DnsResolverOptions& dns_resolver_options_;
envoy::config::core::v3::DnsResolverOptions dns_resolver_options_;

absl::node_hash_map<int, Event::FileEventPtr> events_;
const absl::optional<std::string> resolvers_csv_;
Expand Down
6 changes: 4 additions & 2 deletions test/common/network/dns_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,11 +441,13 @@ class DnsImplTest : public testing::TestWithParam<Address::IpVersion> {
Network::Test::getCanonicalLoopbackAddress(GetParam()));
listener_ = dispatcher_->createListener(socket_, *server_, true);
updateDnsResolverOptions();
// Create a resolver options on stack here to emulate what actually happens in envoy bootstrap.
envoy::config::core::v3::DnsResolverOptions dns_resolver_options = dns_resolver_options_;
Copy link
Member

@ggreenway ggreenway Aug 12, 2021

Choose a reason for hiding this comment

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

Can you add a comment here explaining what we're testing by putting this on the stack?

Copy link
Contributor Author

@chaoqin-li1123 chaoqin-li1123 Aug 12, 2021

Choose a reason for hiding this comment

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

makes sense.

if (setResolverInConstructor()) {
resolver_ = dispatcher_->createDnsResolver({socket_->addressProvider().localAddress()},
dns_resolver_options_);
dns_resolver_options);
} else {
resolver_ = dispatcher_->createDnsResolver({}, dns_resolver_options_);
resolver_ = dispatcher_->createDnsResolver({}, dns_resolver_options);
}

// Point c-ares at the listener with no search domains and TCP-only.
Expand Down
197 changes: 197 additions & 0 deletions test/server/server_corpus/dns_resolver_refresh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.