fix(connector): better errors for MCS channel confirm #329
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
Coverage Report 🤖 ⚙️Past: New: Diff: -0.03% [this comment will be updated automatically] |
CBenoit
force-pushed
the
fix-channel-join-step
branch
from
57782eb
to
b4f5f39
Compare
CBenoit
force-pushed
the
fix-channel-join-step
branch
from
b4f5f39
to
e47f6e4
Compare
CBenoit
commented
Dec 8, 2023
Comment on lines
-176
to
199
| if channel_join_confirm.initiator_id != user_channel_id | ||
| || channel_join_confirm.channel_id != channel_join_confirm.requested_channel_id | ||
| || channel_join_confirm.channel_id != channel_id | ||
| { | ||
| return Err(general_err!("received bad MCS Channel Join Confirm")); | ||
| if channel_join_confirm.initiator_id != user_channel_id { | ||
| warn!( | ||
| channel_join_confirm.initiator_id, | ||
| user_channel_id, "Inconsistent initiator ID for MCS Channel Join Confirm", | ||
| ) | ||
| } | ||
|
|
||
| if channel_id != channel_join_confirm.requested_channel_id { | ||
| return Err(reason_err!( | ||
| "ChannelJoinConfirm", | ||
| "unexpected requested_channel_id in MCS Channel Join Confirm: received {}, got {}", | ||
| channel_id, | ||
| channel_join_confirm.requested_channel_id, | ||
| )); | ||
| } | ||
|
|
||
| if channel_id != channel_join_confirm.channel_id { | ||
| return Err(reason_err!( | ||
| "ChannelJoinConfirm", | ||
| "unexpected channel_id in MCS Channel Join Confirm: received {}, got {}", | ||
| channel_id, | ||
| channel_join_confirm.channel_id, | ||
| )); | ||
| } |
There was a problem hiding this comment.
More lenient handling and improved error reporting of this sanity check:
- Warn when the initiator ID does not match the user channel ID
- Fail when the requested channel ID doesn’t match the channel ID set in the Channel Join Request sent previously. This is because currently we don’t batch all the join request, but once we do, the join confirm messages may arrive out of order and the check should then be removed. Related: Send all the join requests in a single batch #112
- Fail when the joined channel ID does not match the requested channel ID. The server should follow what it advertised in the GCC Server Network Data.
CBenoit
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For context: #314 (comment)