Skip to content

fix use-after-free in extractHeader for multi-value headers #1017

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

Open
netliomax25-code wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −5
Open

fix use-after-free in extractHeader for multi-value headers #1017

Show file tree
Hide file tree
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
9 changes: 6 additions & 3 deletions src/envoy/utils/http_header_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,17 @@ absl::string_view readHeaderEntry(const Envoy::Http::HeaderEntry* entry) {
return Envoy::EMPTY_STRING;
}

absl::string_view extractHeader(const Envoy::Http::HeaderMap& headers,
const Envoy::Http::LowerCaseString& header) {
std::string extractHeader(const Envoy::Http::HeaderMap& headers,
const Envoy::Http::LowerCaseString& header) {
const auto result =
Envoy::Http::HeaderUtility::getAllOfHeaderAsString(headers, header);
if (!result.result().has_value()) {
return Envoy::EMPTY_STRING;
}
return result.result().value();
// When the header has multiple values, result().value() points into the
// local result's backing string, so it must be copied out before result
// goes out of scope.
return std::string(result.result().value());
}

bool handleHttpMethodOverride(Envoy::Http::RequestHeaderMap& headers) {
Expand Down
4 changes: 2 additions & 2 deletions src/envoy/utils/http_header_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ absl::string_view readHeaderEntry(const Envoy::Http::HeaderEntry* entry);
// better performance.
// For details, see
// https://github.com/envoyproxy/envoy/blob/c5f4302325223765b660f0f366ce25bf8570e7a5/include/envoy/http/header_map.h#L271
absl::string_view extractHeader(const Envoy::Http::HeaderMap& headers,
const Envoy::Http::LowerCaseString& header);
std::string extractHeader(const Envoy::Http::HeaderMap& headers,
const Envoy::Http::LowerCaseString& header);

// Get the HTTP method to be used for the request. This method understands the
// x-http-method-override header. If present, it will override the method
Expand Down