chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

state-res: fix incorrect knock join_rule checks

Browse Source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-11-20 19:34:39 -05:00
parent 82ebed457a
commit d1f635764e
No known key found for this signature in database
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/ruma-state-res/src/event_auth.rs
View File

@ -706,14 +706,18 @@ fn valid_membership_change(
} }
MembershipState::Knock if room_version.allow_knocking => { MembershipState::Knock if room_version.allow_knocking => {
// 1. If the `join_rule` is anything other than `knock` or `knock_restricted`, reject. // 1. If the `join_rule` is anything other than `knock` or `knock_restricted`, reject.
if join_rules != JoinRule::Knock if !matches!(join_rules, JoinRule::KnockRestricted(_) | JoinRule::Knock) {
|| room_version.knock_restricted_join_rule
&& matches!(join_rules, JoinRule::KnockRestricted(_))
{
warn!("Join rule is not set to knock or knock_restricted, knocking is not allowed"); warn!("Join rule is not set to knock or knock_restricted, knocking is not allowed");
false false
} else if matches!(join_rules, JoinRule::KnockRestricted(_))
&& !room_version.knock_restricted_join_rule
{
// 2. If the `join_rule` is `knock_restricted`, but the room does not support
// `knock_restricted`, reject.
warn!("Join rule is set to knock_restricted but room version does not support knock_restricted, knocking is not allowed");
false
} else if sender != target_user { } else if sender != target_user {
// 2. If `sender` does not match `state_key`, reject. // 3. If `sender` does not match `state_key`, reject.
warn!( warn!(
?sender, ?sender,
?target_user, ?target_user,
@ -724,8 +728,8 @@ fn valid_membership_change(
sender_membership, sender_membership,
MembershipState::Ban | MembershipState::Invite | MembershipState::Join MembershipState::Ban | MembershipState::Invite | MembershipState::Join
) { ) {
// 3. If the `sender`'s current membership is not `ban`, `invite`, or `join`, allow. // 4. If the `sender`'s current membership is not `ban`, `invite`, or `join`, allow.
// 4. Otherwise, reject. // 5. Otherwise, reject.
warn!( warn!(
?target_user_membership_event_id, ?target_user_membership_event_id,
"Knocking with a membership state of ban, invite or join is invalid", "Knocking with a membership state of ban, invite or join is invalid",