Drop project-id from threadcontext for CCS #136675
Merged
Conversation
This file contains hidden or 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
When making a request to a remote cluster, we don't want to include
the current project-id ("X-Elastic-Project-Id") header in the thread
context that we send to the remote cluster because the current
project-id is not relevant to the thread context for the remote
execution.
Backport of: elastic#136664
tvernum
added
>bug
:Security/Authorization
mamazzol
reviewed
Oct 16, 2025
| final Set<String> allRequestHeadersToCopy = new HashSet<>(HEADERS_TO_COPY); | ||
| if (headersFor == HeadersFor.REMOTE_CLUSTER) { | ||
| // Don't send the current project id to a remote cluster/project | ||
| allRequestHeadersToCopy.remove(Task.X_ELASTIC_PROJECT_ID_HTTP_HEADER); |
Contributor
There was a problem hiding this comment.
Just highlighting that if Task.X_ELASTIC_PROJECT_ID_HTTP_HEADER is in requestHeaders it will still keep coming. If that's okay, then it is fine, otherwise it's worth moving this logic below the addAll,
Contributor
There was a problem hiding this comment.
That's intentional. If you explicitly specify to preserve it in requestHeaders, then it will not be removed.
See comment here.
slobodanadamovic
approved these changes
Oct 16, 2025
This comment was marked as outdated.
This comment was marked as outdated.
tvernum
added a commit
to tvernum/elasticsearch
that referenced
this pull request
Oct 16, 2025
When making a request to a remote cluster, we don't want to include
the current project-id ("X-Elastic-Project-Id") header in the thread
context that we send to the remote cluster because the current
project-id is not relevant to the thread context for the remote
execution.
Backport of: elastic#136664,elastic#136675
This was referenced Oct 17, 2025
elasticsearchmachine
pushed a commit
that referenced
this pull request
Oct 17, 2025
When making a request to a remote cluster, we don't want to include
the current project-id ("X-Elastic-Project-Id") header in the thread
context that we send to the remote cluster because the current
project-id is not relevant to the thread context for the remote
execution.
Backport of: #136664,#136675
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
When making a request to a remote cluster, we don't want to include the current project-id ("X-Elastic-Project-Id") header in the thread context that we send to the remote cluster because the current project-id is not relevant to the thread context for the remote execution.
Backport of: #136664