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

state-res: Return borrowed content in Event method

Browse Source
This commit is contained in:
Jonas Platte 2021-09-13 18:51:37 +02:00
parent e49f76b4be
commit 0999e420ae
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
5 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ruma-state-res/benches/state_res_bench.rs
View File

@ -573,10 +573,10 @@ mod event {
}
}
fn content(&self) -> serde_json::Value {
fn content(&self) -> &serde_json::Value {
match &self.rest {
Pdu::RoomV1Pdu(ev) => ev.content.clone(),
Pdu::RoomV3Pdu(ev) => ev.content.clone(),
Pdu::RoomV1Pdu(ev) => &ev.content,
Pdu::RoomV3Pdu(ev) => &ev.content,
#[cfg(not(feature = "unstable-exhaustive-types"))]
_ => unreachable!("new PDU version"),
}

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

@ -22,7 +22,7 @@ pub fn auth_types_for_event(
kind: &EventType,
sender: &UserId,
state_key: Option<&str>,
content: serde_json::Value,
content: &serde_json::Value,
) -> Vec<(EventType, String)> {
if kind == &EventType::RoomCreate {
return vec![];
@ -269,7 +269,9 @@ where
}
let sender_power_level = if let Some(pl) = &power_levels_event {
if let Ok(content) = serde_json::from_value::<PowerLevelsEventContent>(pl.content()) {
if let Ok(content) =
serde_json::from_value::<PowerLevelsEventContent>(pl.content().to_owned())
{
if let Some(level) = content.users.get(sender) {
*level
} else {
@ -281,7 +283,9 @@ where
} else {
// If no power level event found the creator gets 100 everyone else gets 0
room_create_event
.and_then(|create| serde_json::from_value::<CreateEventContent>(create.content()).ok())
.and_then(|create| {
serde_json::from_value::<CreateEventContent>(create.content().to_owned()).ok()
})
.and_then(|create| (create.creator == *sender).then(|| int!(100)))
.unwrap_or_default()
};
@ -291,7 +295,10 @@ where
if *incoming_event.event_type() == EventType::RoomThirdPartyInvite {
let invite_level = match &power_levels_event {
Some(power_levels) => {
serde_json::from_value::<PowerLevelsEventContent>(power_levels.content())?.invite
serde_json::from_value::<PowerLevelsEventContent>(
power_levels.content().to_owned(),
)?
.invite
}
None => int!(50),
};
@ -376,7 +383,7 @@ fn valid_membership_change<E: Event>(
target_user_membership_event: Option<&E>,
sender: &UserId,
sender_membership_event: Option<&E>,
content: serde_json::Value,
content: &serde_json::Value,
prev_event: Option<&E>,
current_third_party_invite: Option<&E>,
power_levels_event: Option<&E>,
@ -412,7 +419,7 @@ fn valid_membership_change<E: Event>(
};
let power_levels: PowerLevelsEventContent = match &power_levels_event {
Some(ev) => serde_json::from_value(ev.content())?,
Some(ev) => serde_json::from_value(ev.content().to_owned())?,
None => PowerLevelsEventContent::default(),
};
@ -427,7 +434,8 @@ fn valid_membership_change<E: Event>(
let mut join_rules = JoinRule::Invite;
if let Some(jr) = &join_rules_event {
join_rules = serde_json::from_value::<JoinRulesEventContent>(jr.content())?.join_rule;
join_rules =
serde_json::from_value::<JoinRulesEventContent>(jr.content().to_owned())?.join_rule;
}
if let Some(prev) = prev_event {
@ -613,10 +621,12 @@ where
// If users key in content is not a dictionary with keys that are valid user IDs
// with values that are integers (or a string that is an integer), reject.
let user_content =
serde_json::from_value::<PowerLevelsEventContent>(power_event.content()).unwrap();
serde_json::from_value::<PowerLevelsEventContent>(power_event.content().to_owned())
.unwrap();
let current_content =
serde_json::from_value::<PowerLevelsEventContent>(current_state.content()).unwrap();
serde_json::from_value::<PowerLevelsEventContent>(current_state.content().to_owned())
.unwrap();
// Validation of users is done in Ruma, synapse for loops validating user_ids and integers here
info!("validation of power event finished");
@ -768,7 +778,7 @@ fn get_send_level<E: Event>(
) -> Int {
power_lvl
.and_then(|ple| {
serde_json::from_value::<PowerLevelsEventContent>(ple.content())
serde_json::from_value::<PowerLevelsEventContent>(ple.content().to_owned())
.map(|content| {
content.events.get(e_type).copied().unwrap_or_else(|| {
if state_key.is_some() {
@ -810,9 +820,9 @@ fn verify_third_party_invite<E: Event>(
// If any signature in signed matches any public key in the m.room.third_party_invite event,
// allow
if let Ok(tpid_ev) =
serde_json::from_value::<ThirdPartyInviteEventContent>(current_tpid.content())
{
if let Ok(tpid_ev) = serde_json::from_value::<ThirdPartyInviteEventContent>(
current_tpid.content().to_owned(),
) {
// A list of public keys in the public_keys field
for key in tpid_ev.public_keys.unwrap_or_default() {
if key.public_key == tp_id.signed.token {

10
crates/ruma-state-res/src/lib.rs
View File

@ -343,9 +343,9 @@ where
return 0;
}
if let Some(content) =
pl.and_then(|pl| serde_json::from_value::<PowerLevelsEventContent>(pl.content()).ok())
{
if let Some(content) = pl.and_then(|pl| {
serde_json::from_value::<PowerLevelsEventContent>(pl.content().to_owned()).ok()
}) {
if let Some(ev) = event {
if let Some(user) = content.users.get(ev.sender()) {
debug!("found {} at power_level {}", ev.sender(), user);
@ -615,7 +615,9 @@ fn is_power_event<E: Event>(event: &E) -> bool {
event.state_key() == Some("")
}
EventType::RoomMember => {
if let Ok(content) = serde_json::from_value::<MemberEventContent>(event.content()) {
if let Ok(content) =
serde_json::from_value::<MemberEventContent>(event.content().to_owned())
{
if [MembershipState::Leave, MembershipState::Ban].contains(&content.membership) {
return Some(event.sender().as_str()) != event.state_key();
}

10
crates/ruma-state-res/src/state_event.rs
View File

@ -24,7 +24,11 @@ pub trait Event {
fn event_type(&self) -> &EventType;
/// The event's content.
fn content(&self) -> serde_json::Value;
// FIXME: This forces a serde_json::Value to be stored, which the previous solution of returning
// an owned one did not. However, the previous signature was even less efficient and also
// heavily encouraged storing `serde_json::Value`. We should likely force usage of `RawValue`
// instead, or somehow allow different storage without pessimizing all but one.
fn content(&self) -> &serde_json::Value;
/// The state key for this event.
fn state_key(&self) -> Option<&str>;
@ -77,7 +81,7 @@ impl<T: Event> Event for &T {
(*self).event_type()
}
fn content(&self) -> serde_json::Value {
fn content(&self) -> &serde_json::Value {
(*self).content()
}
@ -135,7 +139,7 @@ impl<T: Event> Event for Arc<T> {
(&**self).event_type()
}
fn content(&self) -> serde_json::Value {
fn content(&self) -> &serde_json::Value {
(&**self).content()
}

8
crates/ruma-state-res/src/test_utils.rs
View File

@ -149,7 +149,7 @@ pub fn do_check(
e.sender().clone(),
e.event_type().clone(),
e.state_key(),
e.content(),
e.content().to_owned(),
&auth_events,
&prev_events.iter().cloned().collect::<Vec<_>>(),
);
@ -575,10 +575,10 @@ pub mod event {
}
}
fn content(&self) -> serde_json::Value {
fn content(&self) -> &serde_json::Value {
match &self.rest {
Pdu::RoomV1Pdu(ev) => ev.content.clone(),
Pdu::RoomV3Pdu(ev) => ev.content.clone(),
Pdu::RoomV1Pdu(ev) => &ev.content,
Pdu::RoomV3Pdu(ev) => &ev.content,
#[cfg(not(feature = "unstable-exhaustive-types"))]
_ => unreachable!("new PDU version"),
}