Validate Watcher Proxy Allowlist#144759
Merged
jfreden merged 12 commits intoelastic:mainfrom Apr 1, 2026
Merged
Conversation
elasticsearchmachine
added
v9.4.0
Team:Distributed
Collaborator
|
Pinging @elastic/es-distributed (Team:Distributed) |
Collaborator
|
Hi @jfreden, I've created a changelog YAML for you. |
jfreden
commented
Mar 23, 2026
| } | ||
|
|
||
| RequestConfig.Builder config = RequestConfig.custom(); | ||
| validateProxyAgainstWhitelist(request.proxy); |
Contributor
Author
There was a problem hiding this comment.
Slightly worried about BWC here since it's been around for a while.
Contributor
There was a problem hiding this comment.
Agreed. This could be an unwelcome surprise for users with a watcher proxy config not covered by the allowlist.
You might consider targeting the next minor version only rather than patch versions. But that leaves 8.19.x, 9.2.x, and 9.3.x systems vulnerable.
Contributor
Author
There was a problem hiding this comment.
Yes, it's a tricky tradeoff. After thinking some more about this I think targeting all branches makes the most sense. Here is my reasoning:
- The default is no allow list (anything is allowed), so users with the default won't be impacted (probably most users)
- If an explicit allow list is configured the user is worried about the vulnerability and want full protection, including checking the proxy host against the allow list.
- The allow list is almost useless without this fix and it's a bug.
WDYT?
Contributor
There was a problem hiding this comment.
Agreed, that sounds reasonable to me.
elasticsearchmachine
added
v9.3.3
v8.19.14
v9.2.8
and removed
branch:9.2
branch:8.19
branch:9.3
labels
ebarlas
approved these changes
Mar 23, 2026
This was referenced Apr 2, 2026
Contributor
Author
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
jfreden
added a commit
to jfreden/elasticsearch
that referenced
this pull request
Apr 2, 2026
* Validate Watcher Proxy Allowlist * Update docs/changelog/144759.yaml (cherry picked from commit 9b6d5a2)
jfreden
added a commit
to jfreden/elasticsearch
that referenced
this pull request
Apr 2, 2026
* Validate Watcher Proxy Allowlist * Update docs/changelog/144759.yaml (cherry picked from commit 9b6d5a2)
jfreden
added a commit
to jfreden/elasticsearch
that referenced
this pull request
Apr 2, 2026
* Validate Watcher Proxy Allowlist * Update docs/changelog/144759.yaml (cherry picked from commit 9b6d5a2)
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 2, 2026
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 2, 2026
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 2, 2026
mromaios
pushed a commit
to mromaios/elasticsearch
that referenced
this pull request
Apr 9, 2026
* Validate Watcher Proxy Allowlist * Update docs/changelog/144759.yaml
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Validates that a per-request proxy host is whitelisted. System-wide proxies configured via
xpack.http.proxy.hostare exempt.