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

[thrift][bugfix]try to fix thrift request overflow crash. #12890

Merged
merged 7 commits into from
Sep 10, 2020
Merged

[thrift][bugfix]try to fix thrift request overflow crash. #12890

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4207918
try to fix thrift request overflow crush.When request overflow ,the On
pyrl247 Aug 31, 2020
be4e192
change code format
pyrl247 Sep 1, 2020
e2eb4aa
add test case and change exception report in other poolFailure case.
pyrl247 Sep 5, 2020
d449d78
add new poolFailure with no host
pyrl247 Sep 5, 2020
a2102e6
change test case and add changelog
pyrl247 Sep 9, 2020
fcbc093
change doc format
pyrl247 Sep 9, 2020
9f2a550
Merge branch 'master' into master
zuercher Sep 10, 2020
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 docs/root/version_history/current.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Bug Fixes
* http: made the HeaderValues::prefix() method const.
* jwt_authn: supports jwt payload without "iss" field.
* rocketmq_proxy network-level filter: fixed an issue involving incorrect header lengths. In debug mode it causes crash and in release mode it causes underflow.

* thrift_proxy: fixed crashing bug on request overflow.
zuercher marked this conversation as resolved.
Show resolved Hide resolved
Removed Config or Runtime
-------------------------
*Normally occurs at the end of the* :ref:`deprecation period <deprecated>`
Expand Down
13 changes: 9 additions & 4 deletions source/extensions/filters/network/thrift_proxy/router/router_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,10 @@ FilterStatus Router::UpstreamRequest::start() {
return FilterStatus::StopIteration;
}

if (upstream_host_ == nullptr) {
return FilterStatus::StopIteration;
}

return FilterStatus::Continue;
}

Expand Down Expand Up @@ -502,9 +506,8 @@ void Router::UpstreamRequest::onResetStream(ConnectionPool::PoolFailureReason re
switch (reason) {
case ConnectionPool::PoolFailureReason::Overflow:
parent_.callbacks_->sendLocalReply(
AppException(
AppExceptionType::InternalError,
fmt::format("too many connections to '{}'", upstream_host_->address()->asString())),
AppException(AppExceptionType::InternalError,
"thrift upstream request: too many connections"),
true);
break;
case ConnectionPool::PoolFailureReason::LocalConnectionFailure:
Expand All @@ -519,7 +522,9 @@ void Router::UpstreamRequest::onResetStream(ConnectionPool::PoolFailureReason re
parent_.callbacks_->sendLocalReply(
AppException(
AppExceptionType::InternalError,
fmt::format("connection failure '{}'", upstream_host_->address()->asString())),
fmt::format("connection failure '{}'", (upstream_host_ != nullptr)
? upstream_host_->address()->asString()
: "to upstream")),
true);
return;
}
Expand Down
3 changes: 2 additions & 1 deletion test/extensions/filters/network/thrift_proxy/router_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,8 @@ TEST_F(ThriftRouterTest, PoolOverflowFailure) {
EXPECT_THAT(app_ex.what(), ContainsRegex(".*too many connections.*"));
EXPECT_TRUE(end_stream);
}));
context_.cluster_manager_.tcp_conn_pool_.poolFailure(ConnectionPool::PoolFailureReason::Overflow);
context_.cluster_manager_.tcp_conn_pool_.poolFailure(ConnectionPool::PoolFailureReason::Overflow,
true);
}

TEST_F(ThriftRouterTest, PoolConnectionFailureWithOnewayMessage) {
Expand Down
9 changes: 6 additions & 3 deletions test/mocks/tcp/mocks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,15 @@ Envoy::ConnectionPool::MockCancellable* MockInstance::newConnectionImpl(Callback
return &handles_.back();
}

void MockInstance::poolFailure(PoolFailureReason reason) {
void MockInstance::poolFailure(PoolFailureReason reason, bool host_null) {
Callbacks* cb = callbacks_.front();
callbacks_.pop_front();
handles_.pop_front();

cb->onPoolFailure(reason, host_);
if (host_null) {
cb->onPoolFailure(reason, nullptr);
} else {
cb->onPoolFailure(reason, host_);
}
}

void MockInstance::poolReady(Network::MockClientConnection& conn) {
Expand Down
2 changes: 1 addition & 1 deletion test/mocks/tcp/mocks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class MockInstance : public Instance {
MOCK_METHOD(Upstream::HostDescriptionConstSharedPtr, host, (), (const));

Envoy::ConnectionPool::MockCancellable* newConnectionImpl(Callbacks& cb);
void poolFailure(PoolFailureReason reason);
void poolFailure(PoolFailureReason reason, bool host_null = false);
void poolReady(Network::MockClientConnection& conn);

// Invoked when connection_data_, having been assigned via poolReady is released.
Expand Down