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

signatures: Add redact_in_place

Browse Source
This commit is contained in:
Jonathan de Jong 2022-02-01 15:03:22 +01:00 committed by GitHub
parent 89ae41166d
commit bdf4a86770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/ruma-signatures/src/functions.rs
View File

@ -722,8 +722,20 @@ pub fn redact(
object: &CanonicalJsonObject, object: &CanonicalJsonObject,
version: &RoomVersionId, version: &RoomVersionId,
) -> Result<CanonicalJsonObject, Error> { ) -> Result<CanonicalJsonObject, Error> {
let mut event = object.clone(); let mut val = object.clone();
redact_in_place(&mut val, version)?;
Ok(val)
}
/// Redacts an event using the rules specified in the Matrix client-server specification.
///
/// Functionally equivalent to `redact`, only;
/// * upon error, the event is not touched.
/// * this'll redact the event in-place.
pub fn redact_in_place(
event: &mut CanonicalJsonObject,
version: &RoomVersionId,
) -> Result<(), Error> {
let event_type_value = match event.get("type") { let event_type_value = match event.get("type") {
Some(event_type_value) => event_type_value, Some(event_type_value) => event_type_value,
None => return Err(JsonError::field_missing_from_object("type")), None => return Err(JsonError::field_missing_from_object("type")),
@ -749,7 +761,7 @@ pub fn redact(
} }
} }
let mut old_event = mem::take(&mut event); let mut old_event = mem::take(event);
for &key in ALLOWED_KEYS { for &key in ALLOWED_KEYS {
if let Some(value) = old_event.remove(key) { if let Some(value) = old_event.remove(key) {
@ -757,7 +769,7 @@ pub fn redact(
} }
} }
Ok(event) Ok(())
} }
/// Extracts the server names to check signatures for given event. /// Extracts the server names to check signatures for given event.