Skip to content

[1.17] apple dns: fix crash on invalid dns name (#16028) #16663

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
alyssawilk merged 1 commit into from
Jun 3, 2021
Merged

[1.17] apple dns: fix crash on invalid dns name (#16028) #16663

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
2 changes: 0 additions & 2 deletions source/common/network/apple_dns_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,6 @@ void AppleDnsResolverImpl::PendingResolution::onDNSServiceGetAddrInfoReply(
"error_code={}, hostname={}",
dns_name_, flags, flags & kDNSServiceFlagsMoreComing ? "yes" : "no",
flags & kDNSServiceFlagsAdd ? "yes" : "no", interface_index, error_code, hostname);
RELEASE_ASSERT(interface_index == 0,
fmt::format("unexpected interface_index={}", interface_index));

if (!pending_cb_) {
pending_cb_ = {ResolutionStatus::Success, {}};
Expand Down
32 changes: 1 addition & 31 deletions test/common/network/apple_dns_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ TEST_F(AppleDnsImplTest, DestructPending) {
TEST_F(AppleDnsImplTest, LocalLookup) {
EXPECT_NE(nullptr, resolveWithExpectations("localhost", DnsLookupFamily::Auto,
DnsResolver::ResolutionStatus::Success, true));
dispatcher_->run(Event::Dispatcher::RunType::Block);
}

TEST_F(AppleDnsImplTest, DnsIpAddressVersion) {
Expand Down Expand Up @@ -400,37 +401,6 @@ TEST_F(AppleDnsImplFakeApiTest, QuerySynchronousCompletion) {
dns_callback_executed.WaitForNotification();
}

TEST_F(AppleDnsImplFakeApiTest, IncorrectInterfaceIndexReturned) {
createResolver();

const std::string hostname = "foo.com";
sockaddr_in addr4;
addr4.sin_family = AF_INET;
EXPECT_EQ(1, inet_pton(AF_INET, "1.2.3.4", &addr4.sin_addr));
addr4.sin_port = htons(6502);

Network::Address::Ipv4Instance address(&addr4);

EXPECT_CALL(*initialize_failure_timer_, enabled()).WillOnce(Return(false));
EXPECT_CALL(dns_service_,
dnsServiceGetAddrInfo(_, kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout, 0,
kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6,
StrEq(hostname.c_str()), _, _))
.WillOnce(DoAll(
// Have the API call synchronously call the provided callback. Notice the incorrect
// interface_index "2". This will cause an assertion failure.
WithArgs<5, 6>(Invoke([&](DNSServiceGetAddrInfoReply callback, void* context) -> void {
EXPECT_DEATH(callback(nullptr, kDNSServiceFlagsAdd, 2, kDNSServiceErr_NoError,
hostname.c_str(), address.sockAddr(), 30, context),
"unexpected interface_index=2");
})),
Return(kDNSServiceErr_NoError)));

resolver_->resolve(
hostname, Network::DnsLookupFamily::Auto,
[](DnsResolver::ResolutionStatus, std::list<DnsResponse> &&) -> void { FAIL(); });
}

TEST_F(AppleDnsImplFakeApiTest, QueryCompletedWithError) {
createResolver();

Expand Down