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

state-res: Add knock_restricted join rule

Browse Source 
According to MSC3787
This commit is contained in:
Kévin Commaille 2022-06-21 16:48:56 +02:00 committed by Kévin Commaille
parent e683d28afe
commit ef072654da
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -563,8 +563,10 @@ fn valid_membership_change(
true true
} else if room_version.restricted_join_rules } else if room_version.restricted_join_rules
&& matches!(join_rules, JoinRule::Restricted(_)) && matches!(join_rules, JoinRule::Restricted(_))
|| room_version.knock_restricted_join_rule
&& matches!(join_rules, JoinRule::KnockRestricted(_))
{ {
// If the join_rule is restricted // If the join_rule is restricted or knock_restricted
if matches!( if matches!(
target_user_current_membership, target_user_current_membership,
MembershipState::Invite | MembershipState::Join MembershipState::Invite | MembershipState::Join
@ -673,9 +675,12 @@ 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`, reject. // 1. If the `join_rule` is anything other than `knock` or `knock_restricted`, reject.
if join_rules != JoinRule::Knock { if join_rules != JoinRule::Knock
warn!("Join rule is not set to knock, knocking is not allowed"); || 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");
false false
} else { } else {
// 2. If `sender` does not match `state_key`, reject. // 2. If `sender` does not match `state_key`, reject.