Skip to content
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.

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

[3.5] Backport disable redirects in peer communication to release-3.5 #17070

Merged
merged 1 commit into from
Dec 6, 2023

Conversation

ivanvc
Copy link
Member

@ivanvc ivanvc commented Dec 5, 2023

This PR backports SSRF from #17066 to the release-3.5 branch.

Disable following redirects from peer HTTP communication on the client's side. Etcd server may run into SSRF (Server-side request forgery) when adding a new member. If users provide a malicious peer URL, the existing etcd members may be redirected to another unexpected internal URL when getting the new member's version.

Related to #16969

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

Disable following redirects from peer HTTP communication on the client's side.
Etcd server may run into SSRF (Server-side request forgery) when adding a new
member. If users provide a malicious peer URL, the existing etcd members may be
redirected to another unexpected internal URL when getting the new member's
version.

Signed-off-by: Ivan Valdes <ivan@vald.es>
@k8s-ci-robot
Copy link

Hi @ivanvc. Thanks for your PR.

I'm waiting for a etcd-io member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@jmhbnz
Copy link
Member

jmhbnz commented Dec 5, 2023

/ok-to-test

@jmhbnz
Copy link
Member

jmhbnz commented Dec 5, 2023

/retest

@ivanvc ivanvc changed the title Backprort disable redirects in peer communication to release-3.5 Backport disable redirects in peer communication to release-3.5 Dec 5, 2023
Copy link
Member

@jmhbnz jmhbnz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - Thanks for sorting out the backport @ivanvc

@ahrtr ahrtr merged commit 7df2e90 into etcd-io:release-3.5 Dec 6, 2023
15 checks passed
@ahrtr ahrtr changed the title Backport disable redirects in peer communication to release-3.5 [3.5] Backport disable redirects in peer communication to release-3.5 Dec 8, 2023
@ivanvc ivanvc deleted the release-3.5-backport-ssrf branch December 12, 2023 22:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

5 participants