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

state-res: Remove fetch_state parameter from a few more functions

Browse Source
This commit is contained in:
Jonas Platte 2021-09-04 00:54:29 +02:00
parent 4bba58d781
commit f00b4a0984
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,7 +284,11 @@ where
// If the event type's required power level is greater than the sender's power level, reject // If the event type's required power level is greater than the sender's power level, reject
// If the event has a state_key that starts with an @ and does not match the sender, reject. // If the event has a state_key that starts with an @ and does not match the sender, reject.
if !can_send_event(incoming_event, fetch_state(&EventType::RoomPowerLevels, ""), &fetch_state) { if !can_send_event(
incoming_event,
fetch_state(&EventType::RoomPowerLevels, ""),
get_user_power_level(incoming_event.sender(), &fetch_state),
) {
warn!("user cannot send event"); warn!("user cannot send event");
return Ok(false); return Ok(false);
} }
@ -296,7 +300,7 @@ where
room_version, room_version,
incoming_event, incoming_event,
fetch_state(&EventType::RoomPowerLevels, ""), fetch_state(&EventType::RoomPowerLevels, ""),
&fetch_state, get_user_power_level(incoming_event.sender(), &fetch_state),
) { ) {
if !required_pwr_lvl { if !required_pwr_lvl {
warn!("power level was not allowed"); warn!("power level was not allowed");
@ -318,7 +322,12 @@ where
if room_version.extra_redaction_checks if room_version.extra_redaction_checks
&& incoming_event.event_type() == EventType::RoomRedaction && incoming_event.event_type() == EventType::RoomRedaction
&& !check_redaction(room_version, incoming_event, &fetch_state)? && !check_redaction(
room_version,
incoming_event,
get_user_power_level(incoming_event.sender(), &fetch_state),
get_named_level(fetch_state, "redact", int!(50)),
)?
{ {
return Ok(false); return Ok(false);
} }
@ -534,14 +543,9 @@ fn valid_membership_change<E: Event>(
/// Is the user allowed to send a specific event based on the rooms power levels. /// Is the user allowed to send a specific event based on the rooms power levels.
/// ///
/// Does the event have the correct userId as its state_key if it's not the "" state_key. /// Does the event have the correct userId as its state_key if it's not the "" state_key.
fn can_send_event<E, F>(event: &Arc<E>, ple: Option<Arc<E>>, fetch_state: F) -> bool fn can_send_event<E: Event>(event: &Arc<E>, ple: Option<Arc<E>>, user_level: Int) -> bool {
where
E: Event,
F: Fn(&EventType, &str) -> Option<Arc<E>>,
{
let event_type_power_level = let event_type_power_level =
get_send_level(&event.event_type(), event.state_key(), ple.as_ref()); get_send_level(&event.event_type(), event.state_key(), ple.as_ref());
let user_level = get_user_power_level(event.sender(), fetch_state);
debug!("{} ev_type {} usr {}", event.event_id(), event_type_power_level, user_level); debug!("{} ev_type {} usr {}", event.event_id(), event_type_power_level, user_level);
@ -559,15 +563,14 @@ where
} }
/// Confirm that the event sender has the required power levels. /// Confirm that the event sender has the required power levels.
fn check_power_levels<E, F>( fn check_power_levels<E>(
room_version: &RoomVersion, room_version: &RoomVersion,
power_event: &Arc<E>, power_event: &Arc<E>,
previous_power_event: Option<Arc<E>>, previous_power_event: Option<Arc<E>>,
fetch_state: F, user_level: Int,
) -> Option<bool> ) -> Option<bool>
where where
E: Event, E: Event,
F: Fn(&EventType, &str) -> Option<Arc<E>>,
{ {
match power_event.state_key().as_deref() { match power_event.state_key().as_deref() {
Some("") => {} Some("") => {}
@ -599,8 +602,6 @@ where
// Validation of users is done in Ruma, synapse for loops validating user_ids and integers here // Validation of users is done in Ruma, synapse for loops validating user_ids and integers here
info!("validation of power event finished"); info!("validation of power event finished");
let user_level = get_user_power_level(power_event.sender(), fetch_state);
let mut user_levels_to_check = BTreeSet::new(); let mut user_levels_to_check = BTreeSet::new();
let old_list = &current_content.users; let old_list = &current_content.users;
let user_list = &user_content.users; let user_list = &user_content.users;
@ -716,18 +717,12 @@ fn get_deserialize_levels(
} }
/// Does the event redacting come from a user with enough power to redact the given event. /// Does the event redacting come from a user with enough power to redact the given event.
pub fn check_redaction<E, F>( pub fn check_redaction<E: Event>(
_room_version: &RoomVersion, _room_version: &RoomVersion,
redaction_event: &Arc<E>, redaction_event: &Arc<E>,
fetch_state: F, user_level: Int,
) -> Result<bool> redact_level: Int,
where ) -> Result<bool> {
E: Event,
F: Fn(&EventType, &str) -> Option<Arc<E>>,
{
let user_level = get_user_power_level(redaction_event.sender(), &fetch_state);
let redact_level = get_named_level(fetch_state, "redact", int!(50));
if user_level >= redact_level { if user_level >= redact_level {
info!("redaction allowed via power levels"); info!("redaction allowed via power levels");
return Ok(true); return Ok(true);