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

ext_authz: fix body buffering feature on ExtAuthZ per-route filter #31437

Merged
merged 5 commits into from
Jan 3, 2024
Merged

ext_authz: fix body buffering feature on ExtAuthZ per-route filter #31437

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52c4edb
ext_authz: fix body buffering feature on ExtAuthZ per-route filer
agrawroh Dec 19, 2023
0e69426
Resolved comments from @tyxia
agrawroh Dec 23, 2023
9d7e050
Merge branch 'main' of github.com:envoyproxy/envoy into extauthz-fix
agrawroh Dec 23, 2023
10023c9
Merge branch 'main' of github.com:envoyproxy/envoy into extauthz-fix
agrawroh Jan 2, 2024
6f8f35f
Add Release Notes
agrawroh Jan 2, 2024
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
27 changes: 13 additions & 14 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 @@ -104,9 +104,9 @@ void Filter::initiateCall(const Http::RequestHeaderMap& headers) {

Filters::Common::ExtAuthz::CheckRequestUtils::createHttpCheck(
decoder_callbacks_, headers, std::move(context_extensions), std::move(metadata_context),
std::move(route_metadata_context), check_request_, config_->maxRequestBytes(),
config_->packAsBytes(), config_->includePeerCertificate(), config_->includeTLSSession(),
config_->destinationLabels(), config_->requestHeaderMatchers());
std::move(route_metadata_context), check_request_, max_request_bytes_, config_->packAsBytes(),
config_->includePeerCertificate(), config_->includeTLSSession(), config_->destinationLabels(),
config_->requestHeaderMatchers());

ENVOY_STREAM_LOG(trace, "ext_authz filter calling authorization server", *decoder_callbacks_);
// Store start time of ext_authz filter call
Expand Down Expand Up @@ -155,16 +155,15 @@ Http::FilterHeadersStatus Filter::decodeHeaders(Http::RequestHeaderMap& headers,
if (buffer_data_) {
ENVOY_STREAM_LOG(debug, "ext_authz filter is buffering the request", *decoder_callbacks_);

const auto allow_partial_message =
check_settings.has_with_request_body()
? check_settings.with_request_body().allow_partial_message()
: config_->allowPartialMessage();
const auto max_request_bytes = check_settings.has_with_request_body()
? check_settings.with_request_body().max_request_bytes()
: config_->maxRequestBytes();
allow_partial_message_ = check_settings.has_with_request_body()
? check_settings.with_request_body().allow_partial_message()
: config_->allowPartialMessage();
max_request_bytes_ = check_settings.has_with_request_body()
? check_settings.with_request_body().max_request_bytes()
: config_->maxRequestBytes();

if (!allow_partial_message) {
decoder_callbacks_->setDecoderBufferLimit(max_request_bytes);
if (!allow_partial_message_) {
decoder_callbacks_->setDecoderBufferLimit(max_request_bytes_);
}
return Http::FilterHeadersStatus::StopIteration;
}
Expand Down Expand Up @@ -479,7 +478,7 @@ void Filter::onComplete(Filters::Common::ExtAuthz::ResponsePtr&& response) {
}

bool Filter::isBufferFull(uint64_t num_bytes_processing) const {
if (!config_->allowPartialMessage()) {
if (!allow_partial_message_) {
return false;
}

Expand All @@ -489,7 +488,7 @@ bool Filter::isBufferFull(uint64_t num_bytes_processing) const {
num_bytes_buffered += buffer->length();
}

return num_bytes_buffered >= config_->maxRequestBytes();
return num_bytes_buffered >= max_request_bytes_;
}

void Filter::continueDecoding() {
Expand Down
4 changes: 4 additions & 0 deletions source/extensions/filters/http/ext_authz/ext_authz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,10 @@ class Filter : public Logger::Loggable<Logger::Id::ext_authz>,
// The stats for the filter.
ExtAuthzFilterStats stats_;

// This is used to hold the final configs after we merge them with per-route configs.
bool allow_partial_message_{};
uint32_t max_request_bytes_;

// Used to identify if the callback to onComplete() is synchronous (on the stack) or asynchronous.
bool initiating_call_{};
bool buffer_data_{};
Expand Down
8 changes: 4 additions & 4 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 @@ -2974,7 +2974,7 @@ TEST_P(HttpFilterTestParam, NoCluster) {

// Check that config validation for per-route filter works as expected.
TEST_F(HttpFilterTest, PerRouteCheckSettingsConfigCheck) {
// Set allow_partial_message to true and max_request_bytes to 10 on the per-route filter.
// Set allow_partial_message to true and max_request_bytes to 5 on the per-route filter.
envoy::extensions::filters::http::ext_authz::v3::BufferSettings buffer_settings;
buffer_settings.set_max_request_bytes(5); // Set the max_request_bytes value
buffer_settings.set_allow_partial_message(true); // Set the allow_partial_message value
Expand Down Expand Up @@ -3004,7 +3004,7 @@ TEST_F(HttpFilterTest, PerRouteCheckSettingsWorks) {
failure_mode_allow: false
)EOF");

// Set allow_partial_message to true and max_request_bytes to 10 on the per-route filter.
// Set allow_partial_message to true and max_request_bytes to 5 on the per-route filter.
agrawroh marked this conversation as resolved.
Show resolved Hide resolved
envoy::extensions::filters::http::ext_authz::v3::BufferSettings buffer_settings;
buffer_settings.set_max_request_bytes(5); // Set the max_request_bytes value
buffer_settings.set_allow_partial_message(true); // Set the allow_partial_message value
Expand Down Expand Up @@ -3036,7 +3036,7 @@ TEST_F(HttpFilterTest, PerRouteCheckSettingsWorks) {
data_.add(buffer1.toString());

Buffer::OwnedImpl buffer2("bar");
EXPECT_EQ(Http::FilterDataStatus::StopIterationAndBuffer, filter_->decodeData(buffer2, false));
EXPECT_EQ(Http::FilterDataStatus::StopIterationAndWatermark, filter_->decodeData(buffer2, true));
data_.add(buffer2.toString());

Buffer::OwnedImpl buffer3("barfoo");
Expand Down Expand Up @@ -3066,7 +3066,7 @@ TEST_F(HttpFilterTest, PerRouteCheckSettingsOverrideWorks) {

// Set allow_partial_message to true and max_request_bytes to 10 on the per-route filter.
envoy::extensions::filters::http::ext_authz::v3::BufferSettings buffer_settings;
buffer_settings.set_max_request_bytes(5); // Set the max_request_bytes value
buffer_settings.set_max_request_bytes(10); // Set the max_request_bytes value
buffer_settings.set_allow_partial_message(true); // Set the allow_partial_message value
// Set the per-route filter config.
envoy::extensions::filters::http::ext_authz::v3::CheckSettings check_settings;
Expand Down