Skip to content

Fix header corruption in sendLocalResponse (#606) #253

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
istio-testing merged 1 commit into from
Aug 6, 2020
Merged

Fix header corruption in sendLocalResponse (#606) #253

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
16 changes: 12 additions & 4 deletions source/extensions/common/wasm/context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,13 +1371,21 @@ WasmResult Context::closeStream(WasmStreamType stream_type) {
WasmResult Context::sendLocalResponse(uint32_t response_code, absl::string_view body_text,
Pairs additional_headers, uint32_t grpc_status,
absl::string_view details) {
// "additional_headers" is a collection of string_views. These will no longer
// be valid when "modify_headers" is finally called below, so we must
// make copies of all the headers.
std::vector<std::pair<Http::LowerCaseString, std::string>> additional_headers_copy;
for (auto& p : additional_headers) {
const Http::LowerCaseString lower_key{std::string(p.first)};
additional_headers_copy.emplace_back(lower_key, std::string(p.second));
}

auto modify_headers = [additional_headers](Http::HeaderMap& headers) {
for (auto& p : additional_headers) {
const Http::LowerCaseString lower_key{std::string(p.first)};
headers.addCopy(lower_key, std::string(p.second));
auto modify_headers = [additional_headers_copy](Http::HeaderMap& headers) {
for (auto& p : additional_headers_copy) {
headers.addCopy(p.first, p.second);
}
};

if (decoder_callbacks_) {
// This is a bit subtle because proxy_on_delete() does call DeferAfterCallActions(),
// so in theory it could call this and the Context in the VM would be invalid,
Expand Down