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.4] backport 15294 #15621

Merged
merged 2 commits into from
Apr 5, 2023
Merged

[3.4] backport 15294 #15621

merged 2 commits into from
Apr 5, 2023

Conversation

mitake
Copy link
Contributor

@mitake mitake commented Apr 3, 2023

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

This PR backports #15294 to release-3.4. It also backports #13086 which is needed by 15294 and its fix is valuable for 3.4.

cc @ahrtr @serathius @spzala

Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

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

LGTM

Please signoff the commit.

@mitake mitake force-pushed the 3.4-backport-15294 branch 2 times, most recently from 109c6c3 to 62e4da2 Compare April 4, 2023 12:40
dlowe and others added 2 commits April 4, 2023 21:40
Prevent etcd from crashing when given a bad grant payload, e.g.:

$ curl -d '{"name": "foo"}' http://localhost:2379/v3/auth/role/add
{"header":{"cluster_id":"14841639068965178418", ...
$ curl -d '{"name": "foo"}' http://localhost:2379/v3/auth/role/grant
curl: (52) Empty reply from server

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
Signed-off-by: J. David Lowe <j.david.lowe@gmail.com>
Signed-off-by: Hitoshi Mitake <h.mitake@gmail.com>
Co-authored-by: Benjamin Wang <wachao@vmware.com>
@mitake
Copy link
Contributor Author

mitake commented Apr 4, 2023

@ahrtr Thanks for pointing out, it seems that the original commit cannot pass the DCO enforced today (when the PR was merged, DCO didn't exist). I updated it.

@ahrtr
Copy link
Member

ahrtr commented Apr 5, 2023

Thanks @mitake

@ahrtr ahrtr merged commit ab64d49 into etcd-io:release-3.4 Apr 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants