Skip to content

ext_authz: Make sure initiateCall only called once #6949

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
mattklein123 merged 2 commits into from
May 20, 2019
Merged

ext_authz: Make sure initiateCall only called once #6949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e501e1
Make sure initiateCall only called once
dio May 15, 2019
c6b9334
Review comments
dio May 16, 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
10 changes: 8 additions & 2 deletions source/extensions/filters/http/ext_authz/ext_authz.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ void FilterConfigPerRoute::merge(const FilterConfigPerRoute& other) {
}

void Filter::initiateCall(const Http::HeaderMap& headers) {
if (filter_return_ == FilterReturn::StopDecoding) {
Copy link
Member

@gsagula gsagula May 17, 2019

Choose a reason for hiding this comment

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

👍

return;
}

Router::RouteConstSharedPtr route = callbacks_->route();
if (route == nullptr || route->routeEntry() == nullptr) {
return;
Expand Down Expand Up @@ -96,8 +100,10 @@ Http::FilterHeadersStatus Filter::decodeHeaders(Http::HeaderMap& headers, bool e

Http::FilterDataStatus Filter::decodeData(Buffer::Instance&, bool end_stream) {
if (buffer_data_) {
if (end_stream || isBufferFull()) {
ENVOY_STREAM_LOG(debug, "ext_authz filter finished buffering the request", *callbacks_);
const bool buffer_is_full = isBufferFull();
Copy link
Member

@lizan lizan May 16, 2019

Choose a reason for hiding this comment

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

shall we guard this in initiateCall?

Copy link
Member Author

@dio dio May 16, 2019

Choose a reason for hiding this comment

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

Let me try.

Copy link
Member Author

@dio dio May 16, 2019

Choose a reason for hiding this comment

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

Modified in c6b9334.

if (end_stream || buffer_is_full) {
ENVOY_STREAM_LOG(debug, "ext_authz filter finished buffering the request since {}",
*callbacks_, buffer_is_full ? "buffer is full" : "stream is ended");
initiateCall(*request_headers_);
return filter_return_ == FilterReturn::StopDecoding
? Http::FilterDataStatus::StopIterationAndWatermark
Expand Down
4 changes: 4 additions & 0 deletions test/extensions/filters/http/ext_authz/ext_authz_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,11 @@ TEST_F(HttpFilterTest, RequestDataWithPartialMessage) {
EXPECT_EQ(Http::FilterDataStatus::StopIterationAndBuffer, filter_->decodeData(data_, false));

data_.add("barfoo");
EXPECT_EQ(Http::FilterDataStatus::StopIterationAndWatermark, filter_->decodeData(data_, false));

data_.add("more data after watermark is set is possible");
EXPECT_EQ(Http::FilterDataStatus::StopIterationAndWatermark, filter_->decodeData(data_, true));

EXPECT_EQ(Http::FilterTrailersStatus::StopIteration, filter_->decodeTrailers(request_headers_));
}

Expand Down