client/v3: do not overwrite authTokenBundle on dial#12992
Merged
ptabor merged 1 commit intoetcd-io:mainfrom Jul 1, 2021
awly:client-auth-bundle-overwrite
Merged
client/v3: do not overwrite authTokenBundle on dial#12992ptabor merged 1 commit intoetcd-io:mainfrom awly:client-auth-bundle-overwrite
ptabor merged 1 commit intoetcd-io:mainfrom
awly:client-auth-bundle-overwrite
Conversation
Codecov Report
@@ Coverage Diff @@
## main #12992 +/- ##
===========================================
- Coverage 55.29% 42.72% -12.57%
===========================================
Files 429 413 -16
Lines 33181 33221 +40
===========================================
- Hits 18346 14193 -4153
- Misses 13102 17121 +4019
- Partials 1733 1907 +174
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
ptabor
approved these changes
May 24, 2021
Contributor
ptabor
left a comment
ptabor
left a comment
There was a problem hiding this comment.
Thank you. Could you, please, add a regression test for the new behavior.
Contributor
Author
|
@ptabor sorry for the delay, added a test. |
`Client.dial` can be called multiple times. For example, from regular `NewClient` and [from the `Maintenance` wrapper](https://github.com/etcd-io/etcd/blob/6d451ab61d2da992622b3e7dbf85ded04ebcc515/client/v3/maintenance.go#L81-L84). This ends up creating two (if `Client.dial` is called twice) independent `credentials.Bundle` instances: - the first one is wired into `PerRPCCredentials` callback in gRPC client. - the second one is in `Client.authTokenBundle` and receives the latest auth token updates. When using username/password authentication and the server is configured to issue JWTs, token rotation logic breaks because of the above `credentials.Bundle` confusion.
Contributor
Author
|
@ptabor could you merge this please? |
ptabor
approved these changes
Jul 1, 2021
Contributor
|
@ptabor how do you think, is it possible to make a backport to 3.5 for this fix? For cluster with enable auth this bug is quite annoying and hard to workaround without hot patching. |
ahrtr
added a commit
to ahrtr/etcd
that referenced
this pull request
Jun 17, 2022
Cherry pick the PR etcd-io#12992 to 3.5, so please refer to the original PR for more detailed info. Signed-off-by: Benjamin Wang <[email protected]>
ahrtr
added a commit
to ahrtr/etcd
that referenced
this pull request
Jun 17, 2022
Cherry pick the PR etcd-io#12992 to 3.5, so please refer to the original PR for more detailed info. Signed-off-by: Benjamin Wang <[email protected]>
openshift-cherrypick-robot
pushed a commit
to openshift-cherrypick-robot/etcd
that referenced
this pull request
Oct 7, 2022
Cherry pick the PR etcd-io#12992 to 3.5, so please refer to the original PR for more detailed info. Signed-off-by: Benjamin Wang <[email protected]>
tjungblu
pushed a commit
to tjungblu/etcd
that referenced
this pull request
Jul 26, 2023
Cherry pick the PR etcd-io#12992 to 3.5, so please refer to the original PR for more detailed info. Signed-off-by: Benjamin Wang <[email protected]>
1 task
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
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.
Client.dialcan be called multiple times. For example, from regularNewClientand from theMaintenancewrapper.
This ends up creating two (if
Client.dialis called twice) independentcredentials.Bundleinstances:PerRPCCredentialscallback in gRPCclient.
Client.authTokenBundleand receives the latestauth token updates.
When using username/password authentication and the server is configured
to issue JWTs, token rotation logic breaks because of the above
credentials.Bundleconfusion.As a simple solution, do not overwrite
Client.authTokenBundleif it's already set.Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.