ensure that the inline cookie header will be folded correctly #17560
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: wbpcode <wbphub@live.com>
Signed-off-by: wbpcode <wbphub@live.com>
|
cc @alyssawilk |
alyssawilk
reviewed
Aug 3, 2021
source/common/http/header_map_impl.h
Outdated
| @@ -319,6 +319,8 @@ class HeaderMapImpl : NonCopyable { | |||
| void insertByKey(HeaderString&& key, HeaderString&& value); | |||
| static uint64_t appendToHeader(HeaderString& header, absl::string_view data, | |||
| absl::string_view delimiter = ","); | |||
| static absl::string_view delimiterByHeader(const LowerCaseString& key, | |||
There was a problem hiding this comment.
If this is not used outside of the cc file it can be a helper function in empty namespace
| bool correctly_coalesce_cookies) { | ||
| // TODO(wbpcode): 'correctly_coalesce_cookies' feature is enabled by default and is allowed to be | ||
| // disabled via runtime. But I doubt if any user will actually disable it. The comma separator is | ||
| // obviously problematic for cookies. Maybe we can consider removing it. |
There was a problem hiding this comment.
It'll be removed in a few months per the process documented in CONTRIBUTING.md so I think you can take this TODO out.
Signed-off-by: wbpcode <wbphub@live.com>
mattklein123
requested changes
Aug 4, 2021
Comment on lines
51
to
53
| return "; "; | ||
| } | ||
| return ","; |
There was a problem hiding this comment.
perf nit: I don't know if the compiler is smart enough to make the string_view ahead of time, so this might require a strlen each time. I would define constant string_view and then return them.
| @@ -368,8 +375,10 @@ void HeaderMapImpl::insertByKey(HeaderString&& key, HeaderString&& value) { | |||
| if (*lookup.value().entry_ == nullptr) { | |||
| maybeCreateInline(lookup.value().entry_, *lookup.value().key_, std::move(value)); | |||
| } else { | |||
| auto delimiter = | |||
| const uint64_t added_size = header_map_correctly_coalesce_cookies_ | ||
| ? appendToHeader(entry[0]->value(), value, delimiter) | ||
| : appendToHeader(entry[0]->value(), value); | ||
| auto delimiter = delimiterByHeader(key, header_map_correctly_coalesce_cookies_); |
Signed-off-by: wbpcode <wbphub@live.com>
|
/retest |
|
Retrying Azure Pipelines: |
|
(Will defer to @alyssawilk to merge on Monday in case she has further comments.) |
alyssawilk
approved these changes
Aug 10, 2021
mpuncel
added a commit
to mpuncel/envoy
that referenced
this pull request
Aug 11, 2021
* main: (687 commits) ci: set build debug information from env (envoyproxy#17635) ext_authz: do the authentication even the direct response is set (envoyproxy#17546) upstream: various cleanups in connection pool code (envoyproxy#17644) owners: promote Dmitry to maintainer (envoyproxy#17642) quiche: client session supports creating bidi stream (envoyproxy#17543) Update HTTP/2 METADATA documentation. (envoyproxy#17637) ext_proc: Check validity of the :status header (envoyproxy#17596) test: add ASSERT indicating that gRPC stream has not been started yet (envoyproxy#17614) ensure that the inline cookie header will be folded correctly (envoyproxy#17560) cluster_manager: Make ClusterEntry a class instead of a struct (envoyproxy#17616) owners: make Raúl a Thrift senior extension maintainer (envoyproxy#17641) quiche: update QUICHE dependency (envoyproxy#17618) Delete mock for removed RouteEntry::perFilterConfig() method (envoyproxy#17623) REPO_LAYOUT.md: fix outdated link (envoyproxy#17626) hcm: forbid use of detection extensions with use_remote_addr/xff_num_trusted_hops (envoyproxy#17558) thrift proxy: add request shadowing support (envoyproxy#17544) ext_proc: Ensure that timer is always cancelled (envoyproxy#17569) Proposal: Add CachePolicy interface to allow for custom cache behavior (envoyproxy#17362) proto: fix verify to point at v3 only (envoyproxy#17622) api: move generic matcher proto to its own package (envoyproxy#17096) ...
mpuncel
added a commit
to mpuncel/envoy
that referenced
this pull request
Aug 16, 2021
* main: (687 commits) ci: set build debug information from env (envoyproxy#17635) ext_authz: do the authentication even the direct response is set (envoyproxy#17546) upstream: various cleanups in connection pool code (envoyproxy#17644) owners: promote Dmitry to maintainer (envoyproxy#17642) quiche: client session supports creating bidi stream (envoyproxy#17543) Update HTTP/2 METADATA documentation. (envoyproxy#17637) ext_proc: Check validity of the :status header (envoyproxy#17596) test: add ASSERT indicating that gRPC stream has not been started yet (envoyproxy#17614) ensure that the inline cookie header will be folded correctly (envoyproxy#17560) cluster_manager: Make ClusterEntry a class instead of a struct (envoyproxy#17616) owners: make Raúl a Thrift senior extension maintainer (envoyproxy#17641) quiche: update QUICHE dependency (envoyproxy#17618) Delete mock for removed RouteEntry::perFilterConfig() method (envoyproxy#17623) REPO_LAYOUT.md: fix outdated link (envoyproxy#17626) hcm: forbid use of detection extensions with use_remote_addr/xff_num_trusted_hops (envoyproxy#17558) thrift proxy: add request shadowing support (envoyproxy#17544) ext_proc: Ensure that timer is always cancelled (envoyproxy#17569) Proposal: Add CachePolicy interface to allow for custom cache behavior (envoyproxy#17362) proto: fix verify to point at v3 only (envoyproxy#17622) api: move generic matcher proto to its own package (envoyproxy#17096) ... Signed-off-by: Michael Puncel <mpuncel@squareup.com>
leyao-daily
pushed a commit
to leyao-daily/envoy
that referenced
this pull request
Sep 30, 2021
…roxy#17560) Commit Message: ensure that the inline cookie header will be folded correctly Additional Description: This PR is a supplement to envoyproxy#17330 and envoyproxy#14969 and will finally close envoyproxy#17234. This PR mainly did following works: update insertByKey to choose suitable delimiter for inline header. update parseCookie to avoid unnecessary iteration for parsing cookie value. Risk Level: Low. Testing: Add. Docs Changes: N/A. Release Notes: N/A. Signed-off-by: wbpcode <wbphub@live.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: wbpcode wbphub@live.com
Commit Message: ensure that the inline cookie header will be folded correctly
Additional Description:
This PR is a supplement to #17330 and #14969 and will finally close #17234. This PR mainly did following works:
insertByKeyto choose suitable delimiter for inline header.parseCookieto avoid unnecessary iteration for parsing cookie value.Risk Level: Low.
Testing: Add.
Docs Changes: N/A.
Release Notes: N/A.