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

http: allow decoding/encoding a header only request/response #4885

Merged
merged 30 commits into from
Nov 24, 2018
Merged

http: allow decoding/encoding a header only request/response #4885

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ed6b15d
http: allow decoding/encoding a header only request/response
Oct 28, 2018
259cde2
Merge branch 'master' into header-only
Nov 6, 2018
7ea1664
continue header iteration instead of returning immediately
Nov 6, 2018
c8fb131
improve test coverage
Nov 6, 2018
0122b27
format
Nov 6, 2018
5eb4cd9
comment + make initializers consistent
Nov 8, 2018
1575210
rename enum value and add assert
Nov 10, 2018
3f4d517
reset idle timer even if we are not encoding data/trailers
Nov 10, 2018
c104aaa
add integration tests
Nov 11, 2018
cd98729
use return instead of invoke in mocks
Nov 11, 2018
4a82d5a
format
Nov 11, 2018
1ed28a7
fix build failure
Nov 11, 2018
d5d98c7
add explict type information to make unique calls
Nov 11, 2018
63b1847
run interleaved test for h1
Nov 11, 2018
ad59360
introduce makeHeaderMap to simplify make_unique TestHeaderMapImpl
Nov 12, 2018
b893e80
make test go green + format
Nov 12, 2018
f18361e
spelling
Nov 12, 2018
fd5f701
add test for encoding/decoding add headers with intermediate filters
Nov 14, 2018
0c92e8b
add files
Nov 14, 2018
24f2fec
format
Nov 14, 2018
82d0c44
clang-tidy and buildifier
Nov 15, 2018
6c0ea6b
untidy
Nov 15, 2018
e36e993
header order
Nov 15, 2018
5f3ff84
move idle timer up, move local_complete_ closer to filter eval
Nov 15, 2018
15d0c71
call maybeEndDecode and document fields
Nov 16, 2018
ec72f47
format
Nov 16, 2018
d0a771b
wait for reset in encoding tests
Nov 17, 2018
ddce29e
Merge branch 'header-only' of github.com:snowp/envoy into header-only
Nov 17, 2018
36c1f08
add debug log
Nov 17, 2018
7c14b69
remove unnecessary code, fix nit
Nov 19, 2018
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 include/envoy/http/filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ enum class FilterHeadersStatus {
StopIteration,
// Continue iteration to remaining filters, but ignore and subsequent data or trailers. This
Copy link
Member

Choose a reason for hiding this comment

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

s/and/any

// results in creating a header only request/response.
ContinueHeadersOnly
ContinueAndEndStream
};

/**
Expand Down
10 changes: 6 additions & 4 deletions source/common/http/conn_manager_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,9 +720,11 @@ void ConnectionManagerImpl::ActiveStream::decodeHeaders(ActiveStreamDecoderFilte
for (; entry != decoder_filters_.end(); entry++) {
ASSERT(!(state_.filter_call_state_ & FilterCallState::DecodeHeaders));
state_.filter_call_state_ |= FilterCallState::DecodeHeaders;
FilterHeadersStatus status = (*entry)->decodeHeaders(
headers,
decoding_headers_only_ || (end_stream && continue_data_entry == decoder_filters_.end()));
const auto current_filter_end_stream =
decoding_headers_only_ || (end_stream && continue_data_entry == decoder_filters_.end());
FilterHeadersStatus status = (*entry)->decodeHeaders(headers, current_filter_end_stream);

ASSERT(!(status == FilterHeadersStatus::ContinueAndEndStream && current_filter_end_stream));
state_.filter_call_state_ &= ~FilterCallState::DecodeHeaders;
ENVOY_STREAM_LOG(trace, "decode headers called: filter={} status={}", *this,
static_cast<const void*>((*entry).get()), static_cast<uint64_t>(status));
Expand Down Expand Up @@ -1393,7 +1395,7 @@ bool ConnectionManagerImpl::ActiveStreamFilterBase::commonHandleAfterHeadersCall
if (status == FilterHeadersStatus::StopIteration) {
stopped_ = true;
return false;
} else if (status == FilterHeadersStatus::ContinueHeadersOnly) {
} else if (status == FilterHeadersStatus::ContinueAndEndStream) {
// Set headers_only to true so we know to end early if necessary,
// but continue filter iteration so we actually write the headers/run the cleanup code.
headers_only = true;
Copy link
Contributor

Choose a reason for hiding this comment

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

Consider a debug log here - we're pretty consistent about logging headers/body/trailers so logging that we'll be swallowing them is probably helpful for debugging

Expand Down
22 changes: 11 additions & 11 deletions test/common/http/conn_manager_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2701,22 +2701,22 @@ TEST_F(HttpConnectionManagerImplTest, FilterHeadReply) {
conn_manager_->onData(fake_input, false);
}

TEST_F(HttpConnectionManagerImplTest, FilterContinueHeadersOnlyHeaders) {
TEST_F(HttpConnectionManagerImplTest, FilterContinueAndEndStreamHeaders) {
InSequence s;
setup(false, "");

EXPECT_CALL(*codec_, dispatch(_)).WillOnce(Invoke([&](Buffer::Instance&) -> void {
StreamDecoder* decoder = &conn_manager_->newStream(response_encoder_);
HeaderMapPtr headers{
Copy link
Member

Choose a reason for hiding this comment

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

make_unique wherever possible

new TestHeaderMapImpl{{":authority", "host"}, {":path", "/"}, {":method", "GET"}}};
decoder->decodeHeaders(std::move(headers), true);
decoder->decodeHeaders(std::move(headers), false);
}));

setupFilterChain(2, 2);

EXPECT_CALL(*decoder_filters_[0], decodeHeaders(_, true))
EXPECT_CALL(*decoder_filters_[0], decodeHeaders(_, false))
.WillOnce(InvokeWithoutArgs(
[&]() -> FilterHeadersStatus { return FilterHeadersStatus::ContinueHeadersOnly; }));
[&]() -> FilterHeadersStatus { return FilterHeadersStatus::ContinueAndEndStream; }));
EXPECT_CALL(*decoder_filters_[1], decodeHeaders(_, true))
.WillOnce(Return(FilterHeadersStatus::Continue));

Expand All @@ -2725,7 +2725,7 @@ TEST_F(HttpConnectionManagerImplTest, FilterContinueHeadersOnlyHeaders) {
conn_manager_->onData(fake_input, true);

EXPECT_CALL(*encoder_filters_[1], encodeHeaders(_, true))
.WillOnce(Return(FilterHeadersStatus::ContinueHeadersOnly));
.WillOnce(Return(FilterHeadersStatus::ContinueAndEndStream));
EXPECT_CALL(*encoder_filters_[0], encodeHeaders(_, true))
.WillOnce(Return(FilterHeadersStatus::Continue));
EXPECT_CALL(response_encoder_, encodeHeaders(_, true));
Expand All @@ -2739,7 +2739,7 @@ TEST_F(HttpConnectionManagerImplTest, FilterContinueHeadersOnlyHeaders) {
decoder_filters_[1]->callbacks_->encodeData(response_body, true);
}

TEST_F(HttpConnectionManagerImplTest, FilterContinueHeadersOnlyData) {
TEST_F(HttpConnectionManagerImplTest, FilterContinueAndEndStreamData) {
InSequence s;
setup(false, "");

Expand All @@ -2757,7 +2757,7 @@ TEST_F(HttpConnectionManagerImplTest, FilterContinueHeadersOnlyData) {

EXPECT_CALL(*decoder_filters_[0], decodeHeaders(_, false))
.WillOnce(InvokeWithoutArgs(
[&]() -> FilterHeadersStatus { return FilterHeadersStatus::ContinueHeadersOnly; }));
[&]() -> FilterHeadersStatus { return FilterHeadersStatus::ContinueAndEndStream; }));
Copy link
Member

Choose a reason for hiding this comment

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

Return(FilterHeadersStatus::ContinueAndEndStream) instead of InvokeWithoutArgs (throughout)

EXPECT_CALL(*decoder_filters_[1], decodeHeaders(_, true))
.WillOnce(Return(FilterHeadersStatus::Continue));

Expand All @@ -2766,7 +2766,7 @@ TEST_F(HttpConnectionManagerImplTest, FilterContinueHeadersOnlyData) {
conn_manager_->onData(fake_input, false);

EXPECT_CALL(*encoder_filters_[1], encodeHeaders(_, false))
.WillOnce(Return(FilterHeadersStatus::ContinueHeadersOnly));
.WillOnce(Return(FilterHeadersStatus::ContinueAndEndStream));
EXPECT_CALL(*encoder_filters_[0], encodeHeaders(_, true))
.WillOnce(Return(FilterHeadersStatus::Continue));
EXPECT_CALL(response_encoder_, encodeHeaders(_, true));
Expand All @@ -2780,7 +2780,7 @@ TEST_F(HttpConnectionManagerImplTest, FilterContinueHeadersOnlyData) {
decoder_filters_[1]->callbacks_->encodeData(response_body, true);
}

TEST_F(HttpConnectionManagerImplTest, FilterContinueHeadersOnlyTrailers) {
TEST_F(HttpConnectionManagerImplTest, FilterContinueAndEndStreamTrailers) {
InSequence s;
setup(false, "");

Expand All @@ -2801,7 +2801,7 @@ TEST_F(HttpConnectionManagerImplTest, FilterContinueHeadersOnlyTrailers) {

EXPECT_CALL(*decoder_filters_[0], decodeHeaders(_, false))
.WillOnce(InvokeWithoutArgs(
[&]() -> FilterHeadersStatus { return FilterHeadersStatus::ContinueHeadersOnly; }));
[&]() -> FilterHeadersStatus { return FilterHeadersStatus::ContinueAndEndStream; }));
EXPECT_CALL(*decoder_filters_[1], decodeHeaders(_, true))
.WillOnce(Return(FilterHeadersStatus::Continue));

Expand All @@ -2810,7 +2810,7 @@ TEST_F(HttpConnectionManagerImplTest, FilterContinueHeadersOnlyTrailers) {
conn_manager_->onData(fake_input, false);

EXPECT_CALL(*encoder_filters_[1], encodeHeaders(_, false))
.WillOnce(Return(FilterHeadersStatus::ContinueHeadersOnly));
.WillOnce(Return(FilterHeadersStatus::ContinueAndEndStream));
EXPECT_CALL(*encoder_filters_[0], encodeHeaders(_, true))
.WillOnce(Return(FilterHeadersStatus::Continue));
EXPECT_CALL(response_encoder_, encodeHeaders(_, true));
Expand Down