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

state-res: Use named fields instead of multiline messages for tracing events

Browse Source
This commit is contained in:
Jonas Platte 2021-09-04 01:43:28 +02:00
parent 43c8df18ad
commit 17ffade52b
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -447,10 +447,7 @@ fn valid_membership_change<E: Event>(
warn!("Can't make other user join"); warn!("Can't make other user join");
false false
} else if let MembershipState::Ban = target_user_current_membership { } else if let MembershipState::Ban = target_user_current_membership {
warn!( warn!(?target_user_membership_event_id, "Banned user can't join");
"Banned user can't join\nCurrent user state: {:?}",
target_user_membership_event_id,
);
false false
} else { } else {
let allow = join_rules == JoinRule::Invite let allow = join_rules == JoinRule::Invite
@ -459,9 +456,10 @@ fn valid_membership_change<E: Event>(
|| join_rules == JoinRule::Public; || join_rules == JoinRule::Public;
if !allow { if !allow {
warn!("Can't join if join rules is not public and user is not invited/joined\nJoin Rules: {:?}\nCurrent user state: {:?}", warn!(
join_rules_event.as_ref().map(|e| e.event_id()), join_rules_event_id = ?join_rules_event.as_ref().map(|e| e.event_id()),
target_user_membership_event_id, ?target_user_membership_event_id,
"Can't join if join rules is not public and user is not invited / joined",
); );
} }
allow allow
@ -471,10 +469,7 @@ fn valid_membership_change<E: Event>(
// If content has third_party_invite key // If content has third_party_invite key
if let Some(Ok(tp_id)) = third_party_invite { if let Some(Ok(tp_id)) = third_party_invite {
if target_user_current_membership == MembershipState::Ban { if target_user_current_membership == MembershipState::Ban {
warn!( warn!(?target_user_membership_event_id, "Can't invite banned user");
"Can't invite banned user\nCurrent user state: {:?}",
target_user_membership_event_id,
);
false false
} else { } else {
let allow = verify_third_party_invite( let allow = verify_third_party_invite(
@ -493,18 +488,19 @@ fn valid_membership_change<E: Event>(
|| target_user_current_membership == MembershipState::Ban || target_user_current_membership == MembershipState::Ban
{ {
warn!( warn!(
"Can't invite user if sender not joined or the user is currently joined or banned\nCurrent user state: {:?}\nSender user state: {:?}", ?target_user_membership_event_id,
target_user_membership_event_id, ?sender_membership_event_id,
sender_membership_event_id, "Can't invite user if sender not joined or the user is currently joined or \
banned",
); );
false false
} else { } else {
let allow = sender_power.filter(|&p| p >= &power_levels.invite).is_some(); let allow = sender_power.filter(|&p| p >= &power_levels.invite).is_some();
if !allow { if !allow {
warn!( warn!(
"User does not have enough power to invite\nCurrent user state: {:?}\nPower levels: {:?}", ?target_user_membership_event_id,
target_user_membership_event_id, ?power_levels_event_id,
power_levels_event_id, "User does not have enough power to invite",
); );
} }
allow allow
@ -515,28 +511,27 @@ fn valid_membership_change<E: Event>(
let allow = target_user_current_membership == MembershipState::Join let allow = target_user_current_membership == MembershipState::Join
|| target_user_current_membership == MembershipState::Invite; || target_user_current_membership == MembershipState::Invite;
if !allow { if !allow {
warn!( warn!(?target_user_membership_event_id, "Can't leave if not invited or joined");
"Can't leave if not invited or joined\nCurrent user state: {:?}",
target_user_membership_event_id,
);
} }
allow allow
} else if !sender_is_joined } else if !sender_is_joined
|| target_user_current_membership == MembershipState::Ban || target_user_current_membership == MembershipState::Ban
&& sender_power.filter(|&p| p < &power_levels.ban).is_some() && sender_power.filter(|&p| p < &power_levels.ban).is_some()
{ {
warn!("Can't kick if sender not joined or user is already banned\nCurrent user state: {:?}\nSender user state: {:?}", warn!(
target_user_membership_event_id, ?target_user_membership_event_id,
sender_membership_event_id ?sender_membership_event_id,
"Can't kick if sender not joined or user is already banned",
); );
false false
} else { } else {
let allow = sender_power.filter(|&p| p >= &power_levels.kick).is_some() let allow = sender_power.filter(|&p| p >= &power_levels.kick).is_some()
&& target_power < sender_power; && target_power < sender_power;
if !allow { if !allow {
warn!("User does not have enough power to kick\nCurrent user state: {:?}\nPower levels: {:?}", warn!(
target_user_membership_event_id, ?target_user_membership_event_id,
power_levels_event_id, ?power_levels_event_id,
"User does not have enough power to kick",
); );
} }
allow allow
@ -544,18 +539,16 @@ fn valid_membership_change<E: Event>(
} }
MembershipState::Ban => { MembershipState::Ban => {
if !sender_is_joined { if !sender_is_joined {
warn!( warn!(?sender_membership_event_id, "Can't ban user if sender is not joined");
"Can't ban user if sender is not joined\nSender user state: {:?}",
sender_membership_event_id
);
false false
} else { } else {
let allow = sender_power.filter(|&p| p >= &power_levels.ban).is_some() let allow = sender_power.filter(|&p| p >= &power_levels.ban).is_some()
&& target_power < sender_power; && target_power < sender_power;
if !allow { if !allow {
warn!("User does not have enough power to ban\nCurrent user state: {:?}\nPower levels: {:?}", warn!(
target_user_membership_event_id, ?target_user_membership_event_id,
power_levels_event_id, ?power_levels_event_id,
"User does not have enough power to ban",
); );
} }
allow allow