core: Don't leak CallCredentials into OOB channels #7712
Merged
Conversation
This file contains 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
The addition of CompositeChannelCredentials allowed CallCredentials to be passed to the ManagedChannel itself. But the implementation was buggy and used the call creds for out-of-band channels as well, which is inappropriate since they have a different authority. This also fixes a bug where resolving OOB channels would have CallCreds duplicated; that wasn't noticed or important because we don't use CallCreds in OOB channels. Fixes grpc#7643
|
@veblush, could you do one more test with this and post the log? I search for |
|
@ejona86 Sure. Would running my client with this PR be enough? |
|
@veblush, yeah. Patch this PR in and see if it resolves things. Any commit after the ChannelCredentials stuff was added would be fine. That means the commit you originally produced the issue should be fine to patch this into. |
|
I got 1.34.1.log by running gRPC Java 1.34.x with this PR cherry-picked. |
|
@veblush, excellent! That log shows this PR did successfully avoid including the call creds. So this PR should fix the original issue you experienced (even if we can't reproduce it now). |
ejona86
added
the
TODO:backport
core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
Outdated
Show resolved
Hide resolved
sanjaypujare
approved these changes
Dec 10, 2020
ejona86
removed
the
TODO:backport
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The addition of CompositeChannelCredentials allowed CallCredentials to
be passed to the ManagedChannel itself. But the implementation was buggy
and used the call creds for out-of-band channels as well, which is
inappropriate since they have a different authority.
This also fixes a bug where resolving OOB channels would have CallCreds
duplicated; that wasn't noticed or important because we don't use
CallCreds in OOB channels.
Fixes #7643
Note that the originalTransportFactory usage vs oobTransportFactory usage is
subtle. If you use the wrong one then CallCreds are duplicated. That's not great,
but also not the worst thing that could happen.