@ -1,9 +1,11 @@
mod edus ; mod edus ;
pub use edus ::RoomEdus ; pub use edus ::RoomEdus ;
use member ::MembershipState ;
use crate ::{ pdu ::PduBuilder , server_server , utils , Database , Error , PduEvent , Result } ; use crate ::{
pdu ::{ EventHash , PduBuilder } ,
server_server , utils , Database , Error , PduEvent , Result ,
} ;
use lru_cache ::LruCache ; use lru_cache ::LruCache ;
use regex ::Regex ; use regex ::Regex ;
use ring ::digest ; use ring ::digest ;
@ -11,18 +13,27 @@ use rocket::http::RawStr;
use ruma ::{ use ruma ::{
api ::{ client ::error ::ErrorKind , federation } , api ::{ client ::error ::ErrorKind , federation } ,
events ::{ events ::{
ignored_user_list , push_rules , direct ::DirectEvent ,
ignored_user_list ::IgnoredUserListEvent ,
push_rules ::PushRulesEvent ,
room ::{ room ::{
create ::CreateEventContent , member , message , power_levels ::PowerLevelsEventContent , create ::RoomCreateEventContent ,
member ::{ MembershipState , RoomMemberEventContent } ,
message ::RoomMessageEventContent ,
power_levels ::RoomPowerLevelsEventContent ,
} , } ,
tag ::TagEvent ,
AnyStrippedStateEvent , AnySyncStateEvent , EventType , AnyStrippedStateEvent , AnySyncStateEvent , EventType ,
} , } ,
push ::{ self , Action , Tweak } , push ::{ Action , Ruleset , Tweak } ,
serde ::{ CanonicalJsonObject , CanonicalJsonValue , Raw } , serde ::{ CanonicalJsonObject , CanonicalJsonValue , Raw } ,
state_res ::{ self , RoomVersion , StateMap } , state_res ::{ self , RoomVersion , StateMap } ,
uint , EventId , RoomAliasId , RoomId , RoomVersionId , ServerName , UserId , uint , EventId , RoomAliasId , RoomId , RoomVersionId , ServerName , UserId ,
} ; } ;
use serde ::Deserialize ;
use serde_json ::value ::to_raw_value ;
use std ::{ use std ::{
borrow ::Cow ,
collections ::{ BTreeMap , HashMap , HashSet } , collections ::{ BTreeMap , HashMap , HashSet } ,
convert ::{ TryFrom , TryInto } , convert ::{ TryFrom , TryInto } ,
mem ::size_of , mem ::size_of ,
@ -42,7 +53,7 @@ pub type StateHashId = Vec<u8>;
pub type CompressedStateEvent = [ u8 ; 2 * size_of ::< u64 > ( ) ] ; pub type CompressedStateEvent = [ u8 ; 2 * size_of ::< u64 > ( ) ] ;
pub struct Rooms { pub struct Rooms {
pub edus : edus:: RoomEdus, pub edus : ,
pub ( super ) pduid_pdu : Arc < dyn Tree > , // PduId = ShortRoomId + Count
pub ( super ) pduid_pdu : Arc < dyn Tree > , // PduId = ShortRoomId + Count
pub ( super ) eventid_pduid : Arc < dyn Tree > , pub ( super ) eventid_pduid : Arc < dyn Tree > ,
pub ( super ) roomid_pduleaves : Arc < dyn Tree > , pub ( super ) roomid_pduleaves : Arc < dyn Tree > ,
@ -210,16 +221,16 @@ impl Rooms {
self . eventid_shorteventid self . eventid_shorteventid
. get ( event_id . as_bytes ( ) ) ? . get ( event_id . as_bytes ( ) ) ?
. map_or ( Ok ( None ) , | shorteventid | { . map_or ( Ok ( None ) , | shorteventid | {
self . shorteventid_shortstatehash . get ( & shorteventid ) ? . map_or ( self . shorteventid_shortstatehash
Ok ::< _ , Error > ( None ) , . get ( & shorteventid ) ?
| bytes | { . map ( | bytes | {
Ok ( Some ( utils ::u64_from_bytes ( & bytes ) . map_err ( | _ | { utils ::u64_from_bytes ( & bytes ) . map_err ( | _ | {
Error ::bad_database ( Error ::bad_database (
"Invalid shortstatehash bytes in shorteventid_shortstatehash" , "Invalid shortstatehash bytes in shorteventid_shortstatehash" ,
) )
} ) ? ) ) } )
} , } )
) . transpose ( )
} ) } )
} }
@ -243,7 +254,7 @@ impl Rooms {
kind : & EventType , kind : & EventType ,
sender : & UserId , sender : & UserId ,
state_key : Option < & str > , state_key : Option < & str > ,
content : & serde_json ::, content : & serde_json ::value::Raw Value,
) -> Result < StateMap < Arc < PduEvent > > > { ) -> Result < StateMap < Arc < PduEvent > > > {
let shortstatehash = let shortstatehash =
if let Some ( current_shortstatehash ) = self . current_shortstatehash ( room_id ) ? { if let Some ( current_shortstatehash ) = self . current_shortstatehash ( room_id ) ? {
@ -252,7 +263,8 @@ impl Rooms {
return Ok ( HashMap ::new ( ) ) ; return Ok ( HashMap ::new ( ) ) ;
} ; } ;
let auth_events = state_res ::auth_types_for_event ( kind , sender , state_key , content ) ; let auth_events = state_res ::auth_types_for_event ( kind , sender , state_key , content )
. expect ( "content is a valid JSON object" ) ;
let mut sauthevents = auth_events let mut sauthevents = auth_events
. into_iter ( ) . into_iter ( )
@ -360,16 +372,16 @@ impl Rooms {
let ( statediffnew , statediffremoved ) = if let Some ( parent_stateinfo ) = states_parents . last ( ) let ( statediffnew , statediffremoved ) = if let Some ( parent_stateinfo ) = states_parents . last ( )
{ {
let statediffnew = new_state_ids_compressed let statediffnew : HashSet < _ > = new_state_ids_compressed
. difference ( & parent_stateinfo . 1 ) . difference ( & parent_stateinfo . 1 )
. c lon ed( ) . c opi ed( )
. collect ::< HashSet < _ > > ( ) ; . collect ( ) ;
let statediffremoved = parent_stateinfo let statediffremoved : HashSet < _ > = parent_stateinfo
. 1 . 1
. difference ( & new_state_ids_compressed ) . difference ( & new_state_ids_compressed )
. c lon ed( ) . c opi ed( )
. collect ::< HashSet < _ > > ( ) ; . collect ( ) ;
( statediffnew , statediffremoved ) ( statediffnew , statediffremoved )
} else { } else {
@ -391,37 +403,43 @@ impl Rooms {
. ok ( ) . ok ( )
. map ( | ( _ , id ) | id ) . map ( | ( _ , id ) | id )
} ) { } ) {
if let Some ( pdu ) = self . get_pdu_json ( & event_id ) ? { let pdu = match self . get_pdu_json ( & event_id ) ? {
if pdu . get ( "type" ) . and_then ( | val | val . as_str ( ) ) = = Some ( "m.room.member" ) { Some ( pdu ) = > pdu ,
if let Ok ( pdu ) = serde_json ::from_value ::< PduEvent > ( None = > continue ,
serde_json ::to_value ( & pdu ) . expect ( "CanonicalJsonObj is a valid JsonValue" ) , } ;
) {
if let Some ( membership ) = if pdu . get ( "type" ) . and_then ( | val | val . as_str ( ) ) ! = Some ( "m.room.member" ) {
pdu . content . get ( "membership" ) . and_then ( | membership | { continue ;
serde_json ::from_value ::< member ::MembershipState > ( }
membership . clone ( ) ,
) let pdu : PduEvent = match serde_json ::from_str (
. ok ( ) & serde_json ::to_string ( & pdu ) . expect ( "CanonicalJsonObj can be serialized to JSON" ) ,
} ) ) {
{ Ok ( pdu ) = > pdu ,
if let Some ( state_key ) = pdu Err ( _ ) = > continue ,
. state_key } ;
. and_then ( | state_key | UserId ::try_from ( state_key ) . ok ( ) )
{ #[ derive(Deserialize) ]
self . update_membership ( struct ExtractMembership {
room_id , membership : MembershipState ,
& state_key ,
membership ,
& pdu . sender ,
None ,
db ,
false ,
) ? ;
}
}
}
}
} }
let membership = match serde_json ::from_str ::< ExtractMembership > ( pdu . content . get ( ) ) {
Ok ( e ) = > e . membership ,
Err ( _ ) = > continue ,
} ;
let state_key = match pdu . state_key {
Some ( k ) = > k ,
None = > continue ,
} ;
let user_id = match UserId ::try_from ( state_key ) {
Ok ( id ) = > id ,
Err ( _ ) = > continue ,
} ;
self . update_membership ( room_id , & user_id , membership , & pdu . sender , None , db , false ) ? ;
} }
self . update_joined_count ( room_id , db ) ? ; self . update_joined_count ( room_id , db ) ? ;
@ -483,7 +501,7 @@ impl Rooms {
if parent ! = 0_ u64 { if parent ! = 0_ u64 {
let mut response = self . load_shortstatehash_info ( parent ) ? ; let mut response = self . load_shortstatehash_info ( parent ) ? ;
let mut state = response . last ( ) . unwrap ( ) . 1. clone ( ) ; let mut state = response . last ( ) . unwrap ( ) . 1. clone ( ) ;
state . extend ( added . iter ( ) . c lon ed( ) ) ; state . extend ( added . iter ( ) . c opi ed( ) ) ;
for r in & removed { for r in & removed {
state . remove ( r ) ; state . remove ( r ) ;
} }
@ -965,7 +983,8 @@ impl Rooms {
pub fn get_pdu_count ( & self , event_id : & EventId ) -> Result < Option < u64 > > { pub fn get_pdu_count ( & self , event_id : & EventId ) -> Result < Option < u64 > > {
self . eventid_pduid self . eventid_pduid
. get ( event_id . as_bytes ( ) ) ? . get ( event_id . as_bytes ( ) ) ?
. map_or ( Ok ( None ) , | pdu_id | self . pdu_count ( & pdu_id ) . map ( Some ) ) . map ( | pdu_id | self . pdu_count ( & pdu_id ) )
. transpose ( )
} }
#[ tracing::instrument(skip(self)) ] #[ tracing::instrument(skip(self)) ]
@ -993,7 +1012,7 @@ impl Rooms {
pub fn get_pdu_json ( & self , event_id : & EventId ) -> Result < Option < CanonicalJsonObject > > { pub fn get_pdu_json ( & self , event_id : & EventId ) -> Result < Option < CanonicalJsonObject > > {
self . eventid_pduid self . eventid_pduid
. get ( event_id . as_bytes ( ) ) ? . get ( event_id . as_bytes ( ) ) ?
. map_or_else ::< Result < _ > , _ , _ > ( . map_or_else (
| | self . eventid_outlierpdu . get ( event_id . as_bytes ( ) ) , | | self . eventid_outlierpdu . get ( event_id . as_bytes ( ) ) ,
| pduid | { | pduid | {
Ok ( Some ( self . pduid_pdu . get ( & pduid ) ? . ok_or_else ( | | { Ok ( Some ( self . pduid_pdu . get ( & pduid ) ? . ok_or_else ( | | {
@ -1026,14 +1045,12 @@ impl Rooms {
) -> Result < Option < CanonicalJsonObject > > { ) -> Result < Option < CanonicalJsonObject > > {
self . eventid_pduid self . eventid_pduid
. get ( event_id . as_bytes ( ) ) ? . get ( event_id . as_bytes ( ) ) ?
. map_or_else ::< Result < _ > , _ , _ > ( . map ( | pduid | {
| | Ok ( None ) , self . pduid_pdu
| pduid | { . get ( & pduid ) ?
Ok ( Some ( self . pduid_pdu . get ( & pduid ) ? . ok_or_else ( | | { . ok_or_else ( | | Error ::bad_database ( "Invalid pduid in eventid_pduid." ) )
Error ::bad_database ( "Invalid pduid in eventid_pduid." ) } )
} ) ? ) ) . transpose ( ) ?
} ,
) ?
. map ( | pdu | { . map ( | pdu | {
serde_json ::from_slice ( & pdu ) . map_err ( | _ | Error ::bad_database ( "Invalid PDU in db." ) ) serde_json ::from_slice ( & pdu ) . map_err ( | _ | Error ::bad_database ( "Invalid PDU in db." ) )
} ) } )
@ -1043,9 +1060,7 @@ impl Rooms {
/// Returns the pdu's id.
/// Returns the pdu's id.
#[ tracing::instrument(skip(self)) ] #[ tracing::instrument(skip(self)) ]
pub fn get_pdu_id ( & self , event_id : & EventId ) -> Result < Option < Vec < u8 > > > { pub fn get_pdu_id ( & self , event_id : & EventId ) -> Result < Option < Vec < u8 > > > {
self . eventid_pduid self . eventid_pduid . get ( event_id . as_bytes ( ) )
. get ( event_id . as_bytes ( ) ) ?
. map_or ( Ok ( None ) , | pdu_id | Ok ( Some ( pdu_id ) ) )
} }
/// Returns the pdu.
/// Returns the pdu.
@ -1055,14 +1070,12 @@ impl Rooms {
pub fn get_non_outlier_pdu ( & self , event_id : & EventId ) -> Result < Option < PduEvent > > { pub fn get_non_outlier_pdu ( & self , event_id : & EventId ) -> Result < Option < PduEvent > > {
self . eventid_pduid self . eventid_pduid
. get ( event_id . as_bytes ( ) ) ? . get ( event_id . as_bytes ( ) ) ?
. map_or_else ::< Result < _ > , _ , _ > ( . map ( | pduid | {
| | Ok ( None ) , self . pduid_pdu
| pduid | { . get ( & pduid ) ?
Ok ( Some ( self . pduid_pdu . get ( & pduid ) ? . ok_or_else ( | | { . ok_or_else ( | | Error ::bad_database ( "Invalid pduid in eventid_pduid." ) )
Error ::bad_database ( "Invalid pduid in eventid_pduid." ) } )
} ) ? ) ) . transpose ( ) ?
} ,
) ?
. map ( | pdu | { . map ( | pdu | {
serde_json ::from_slice ( & pdu ) . map_err ( | _ | Error ::bad_database ( "Invalid PDU in db." ) ) serde_json ::from_slice ( & pdu ) . map_err ( | _ | Error ::bad_database ( "Invalid PDU in db." ) )
} ) } )
@ -1081,11 +1094,8 @@ impl Rooms {
if let Some ( pdu ) = self if let Some ( pdu ) = self
. eventid_pduid . eventid_pduid
. get ( event_id . as_bytes ( ) ) ? . get ( event_id . as_bytes ( ) ) ?
. map_or_else ::< Result < _ > , _ , _ > ( . map_or_else (
| | { | | self . eventid_outlierpdu . get ( event_id . as_bytes ( ) ) ,
let r = self . eventid_outlierpdu . get ( event_id . as_bytes ( ) ) ;
r
} ,
| pduid | { | pduid | {
Ok ( Some ( self . pduid_pdu . get ( & pduid ) ? . ok_or_else ( | | { Ok ( Some ( self . pduid_pdu . get ( & pduid ) ? . ok_or_else ( | | {
Error ::bad_database ( "Invalid pduid in eventid_pduid." ) Error ::bad_database ( "Invalid pduid in eventid_pduid." )
@ -1325,11 +1335,11 @@ impl Rooms {
drop ( insert_lock ) ; drop ( insert_lock ) ;
// See if the event matches any known pushers
// See if the event matches any known pushers
let power_levels : = db let power_levels : Room PowerLevelsEventContent = db
. rooms . rooms
. room_state_get ( & pdu . room_id , & EventType ::RoomPowerLevels , "" ) ? . room_state_get ( & pdu . room_id , & EventType ::RoomPowerLevels , "" ) ?
. map ( | ev | { . map ( | ev | {
serde_json ::from_ value( ev . content . clone ( ) ) serde_json ::from_ str( ev . content . get ( ) )
. map_err ( | _ | Error ::bad_database ( "invalid m.room.power_levels event" ) ) . map_err ( | _ | Error ::bad_database ( "invalid m.room.power_levels event" ) )
} ) } )
. transpose ( ) ? . transpose ( ) ?
@ -1348,9 +1358,9 @@ impl Rooms {
let rules_for_user = db let rules_for_user = db
. account_data . account_data
. get ::< push_rules ::PushRulesEvent > ( None , user , EventType ::PushRules ) ? . get ( None , user , EventType ::PushRules ) ?
. map ( | ev | ev . content . global ) . map ( | ev : PushRulesEvent | ev . content . global )
. unwrap_or_else ( | | push:: Ruleset::server_default ( user ) ) ; . unwrap_or_else ( | | server_default ( user ) ) ;
let mut highlight = false ; let mut highlight = false ;
let mut notify = false ; let mut notify = false ;
@ -1404,30 +1414,21 @@ impl Rooms {
} }
EventType ::RoomMember = > { EventType ::RoomMember = > {
if let Some ( state_key ) = & pdu . state_key { if let Some ( state_key ) = & pdu . state_key {
#[ derive(Deserialize) ]
struct ExtractMembership {
membership : MembershipState ,
}
// if the state_key fails
// if the state_key fails
let target_user_id = UserId ::try_from ( state_key . clone ( ) ) let target_user_id = UserId ::try_from ( state_key . clone ( ) )
. expect ( "This state_key was previously validated" ) ; . expect ( "This state_key was previously validated" ) ;
let membership = serde_json ::from_value ::< member ::MembershipState > ( let content = serde_json ::from_str ::< ExtractMembership > ( pdu . content . get ( ) )
pdu . content . map_err ( | _ | Error ::bad_database ( "Invalid content in pdu." ) ) ? ;
. get ( "membership" )
. ok_or ( Error ::BadRequest (
ErrorKind ::InvalidParam ,
"Invalid member event content" ,
) ) ?
. clone ( ) ,
)
. map_err ( | _ | {
Error ::BadRequest (
ErrorKind ::InvalidParam ,
"Invalid membership state content." ,
)
} ) ? ;
let invite_state = match membership {
member ::MembershipState ::Invite = > {
let state = self . calculate_invite_state ( pdu ) ? ;
let invite_state = match content . membership {
MembershipState ::Invite = > {
let state = self . calculate_invite_state ( pdu ) ? ;
Some ( state ) Some ( state )
} }
_ = > None , _ = > None ,
@ -1438,7 +1439,7 @@ impl Rooms {
self . update_membership ( self . update_membership (
& pdu . room_id , & pdu . room_id ,
& target_user_id , & target_user_id ,
, content. membership,
& pdu . sender , & pdu . sender ,
invite_state , invite_state ,
db , db ,
@ -1447,7 +1448,16 @@ impl Rooms {
} }
} }
EventType ::RoomMessage = > { EventType ::RoomMessage = > {
if let Some ( body ) = pdu . content . get ( "body" ) . and_then ( | b | b . as_str ( ) ) { #[ derive(Deserialize) ]
struct ExtractBody < ' a > {
#[ serde(borrow) ]
body : Option < Cow < ' a , str > > ,
}
let content = serde_json ::from_str ::< ExtractBody < ' _ > > ( pdu . content . get ( ) )
. map_err ( | _ | Error ::bad_database ( "Invalid content in pdu." ) ) ? ;
if let Some ( body ) = content . body {
let mut batch = body let mut batch = body
. split_terminator ( | c : char | ! c . is_alphanumeric ( ) ) . split_terminator ( | c : char | ! c . is_alphanumeric ( ) )
. filter ( | s | ! s . is_empty ( ) ) . filter ( | s | ! s . is_empty ( ) )
@ -1475,11 +1485,11 @@ impl Rooms {
{ {
let mut lines = body . lines ( ) ; let mut lines = body . lines ( ) ;
let command_line = lines . next ( ) . expect ( "each string has at least one line" ) ; let command_line = lines . next ( ) . expect ( "each string has at least one line" ) ;
let body = lines . collect ::< Vec < _ > > ( ) ; let body : Vec < _ > = lines . collect ( ) ;
let mut parts = command_line . split_whitespace ( ) . skip ( 1 ) ; let mut parts = command_line . split_whitespace ( ) . skip ( 1 ) ;
if let Some ( command ) = parts . next ( ) { if let Some ( command ) = parts . next ( ) {
let args = parts . collect ::< Vec < _ > > ( ) ; let args : Vec < _ > = parts . collect ( ) ;
match command { match command {
"register_appservice" = > { "register_appservice" = > {
@ -1498,18 +1508,16 @@ impl Rooms {
} }
Err ( e ) = > { Err ( e ) = > {
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
message ::MessageEventContent ::text_plain ( RoomMessageEventContent ::text_plain ( format! (
format! ( "Could not parse appservice config: {}" ,
"Could not parse appservice config: {}" , e
e ) ) ,
) ,
) ,
) ) ; ) ) ;
} }
} }
} else { } else {
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
essage:: MessageEventContent::text_plain ( Roo mMessageEventContent::text_plain (
"Expected code block in command body." , "Expected code block in command body." ,
) , ) ,
) ) ; ) ) ;
@ -1542,12 +1550,10 @@ impl Rooms {
. count ( ) ; . count ( ) ;
let elapsed = start . elapsed ( ) ; let elapsed = start . elapsed ( ) ;
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
message ::MessageEventContent ::text_plain ( RoomMessageEventContent ::text_plain ( format! (
format! ( "Loaded auth chain with length {} in {:?}" ,
"Loaded auth chain with length {} in {:?}" , count , elapsed
count , elapsed ) ) ,
) ,
) ,
) ) ; ) ) ;
} }
} }
@ -1580,14 +1586,17 @@ impl Rooms {
) { ) {
Ok ( pdu ) = > { Ok ( pdu ) = > {
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
message ::MessageEventContent ::text_plain ( RoomMessageEventContent ::text_plain (
format! ( "EventId: {:?}\n{:#?}" , event_id , pdu ) , format! (
"EventId: {:?}\n{:#?}" ,
event_id , pdu
) ,
) , ) ,
) ) ; ) ) ;
} }
Err ( e ) = > { Err ( e ) = > {
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
essage:: MessageEventContent::text_plain ( Roo mMessageEventContent::text_plain (
format! ( "EventId: {:?}\nCould not parse event: {}" , event_id , e ) , format! ( "EventId: {:?}\nCould not parse event: {}" , event_id , e ) ,
) , ) ,
) ) ; ) ) ;
@ -1596,18 +1605,16 @@ impl Rooms {
} }
Err ( e ) = > { Err ( e ) = > {
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
message ::MessageEventContent ::text_plain ( RoomMessageEventContent ::text_plain ( format! (
format! ( "Invalid json in command body: {}" ,
"Invalid json in command body: {}" , e
e ) ) ,
) ,
) ,
) ) ; ) ) ;
} }
} }
} else { } else {
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
essage:: MessageEventContent::text_plain ( Roo mMessageEventContent::text_plain (
"Expected code block in command body." , "Expected code block in command body." ,
) , ) ,
) ) ; ) ) ;
@ -1629,7 +1636,7 @@ impl Rooms {
serde_json ::to_string_pretty ( & json ) serde_json ::to_string_pretty ( & json )
. expect ( "canonical json is valid json" ) ; . expect ( "canonical json is valid json" ) ;
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
essage:: MessageEventContent::text_html ( Roo mMessageEventContent::text_html (
format! ( "{}\n```json\n{}\n```" , format! ( "{}\n```json\n{}\n```" ,
if outlier { if outlier {
"PDU is outlier" "PDU is outlier"
@ -1643,7 +1650,7 @@ impl Rooms {
} }
None = > { None = > {
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
essage:: MessageEventContent::text_plain ( Roo mMessageEventContent::text_plain (
"PDU not found." , "PDU not found." ,
) , ) ,
) ) ; ) ) ;
@ -1651,14 +1658,14 @@ impl Rooms {
} }
} else { } else {
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
essage:: MessageEventContent::text_plain ( Roo mMessageEventContent::text_plain (
"Event ID could not be parsed." , "Event ID could not be parsed." ,
) , ) ,
) ) ; ) ) ;
} }
} else { } else {
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
essage:: MessageEventContent::text_plain ( Roo mMessageEventContent::text_plain (
"Usage: get_pdu <eventid>" , "Usage: get_pdu <eventid>" ,
) , ) ,
) ) ; ) ) ;
@ -1666,7 +1673,7 @@ impl Rooms {
} }
_ = > { _ = > {
db . admin . send ( AdminCommand ::SendMessage ( db . admin . send ( AdminCommand ::SendMessage (
essage:: MessageEventContent::text_plain ( format! ( Roo mMessageEventContent::text_plain ( format! (
"Unrecognized command: {}" , "Unrecognized command: {}" ,
command command
) ) , ) ) ,
@ -1759,16 +1766,16 @@ impl Rooms {
let ( statediffnew , statediffremoved ) = let ( statediffnew , statediffremoved ) =
if let Some ( parent_stateinfo ) = states_parents . last ( ) { if let Some ( parent_stateinfo ) = states_parents . last ( ) {
let statediffnew = state_ids_compressed let statediffnew : HashSet < _ > = state_ids_compressed
. difference ( & parent_stateinfo . 1 ) . difference ( & parent_stateinfo . 1 )
. c lon ed( ) . c opi ed( )
. collect ::< HashSet < _ > > ( ) ; . collect ( ) ;
let statediffremoved = parent_stateinfo let statediffremoved : HashSet < _ > = parent_stateinfo
. 1 . 1
. difference ( & state_ids_compressed ) . difference ( & state_ids_compressed )
. c lon ed( ) . c opi ed( )
. collect ::< HashSet < _ > > ( ) ; . collect ( ) ;
( statediffnew , statediffremoved ) ( statediffnew , statediffremoved )
} else { } else {
@ -1958,16 +1965,13 @@ impl Rooms {
let create_event = self . room_state_get ( room_id , & EventType ::RoomCreate , "" ) ? ; let create_event = self . room_state_get ( room_id , & EventType ::RoomCreate , "" ) ? ;
let create_event_content = create_event let create_event_content : Option < RoomCreateEventContent > = create_event
. as_ref ( ) . as_ref ( )
. map ( | create_event | { . map ( | create_event | {
serde_json ::from_value ::< Raw < CreateEventContent > > ( create_event . content . clone ( ) ) serde_json ::from_str ( create_event . content . get ( ) ) . map_err ( | e | {
. expect ( "Raw::from_value always works." ) warn ! ( "Invalid create event: {}" , e ) ;
. deserialize ( ) Error ::bad_database ( "Invalid create event in db." )
. map_err ( | e | { } )
warn ! ( "Invalid create event: {}" , e ) ;
Error ::bad_database ( "Invalid create event in db." )
} )
} ) } )
. transpose ( ) ? ; . transpose ( ) ? ;
@ -2000,7 +2004,10 @@ impl Rooms {
let mut unsigned = unsigned . unwrap_or_default ( ) ; let mut unsigned = unsigned . unwrap_or_default ( ) ;
if let Some ( state_key ) = & state_key { if let Some ( state_key ) = & state_key {
if let Some ( prev_pdu ) = self . room_state_get ( room_id , & event_type , state_key ) ? { if let Some ( prev_pdu ) = self . room_state_get ( room_id , & event_type , state_key ) ? {
unsigned . insert ( "prev_content" . to_owned ( ) , prev_pdu . content . clone ( ) ) ; unsigned . insert (
"prev_content" . to_owned ( ) ,
serde_json ::from_str ( prev_pdu . content . get ( ) ) . expect ( "string is valid json" ) ,
) ;
unsigned . insert ( unsigned . insert (
"prev_sender" . to_owned ( ) , "prev_sender" . to_owned ( ) ,
serde_json ::to_value ( & prev_pdu . sender ) . expect ( "UserId::to_value always works" ) , serde_json ::to_value ( & prev_pdu . sender ) . expect ( "UserId::to_value always works" ) ,
@ -2025,11 +2032,15 @@ impl Rooms {
. map ( | ( _ , pdu ) | pdu . event_id . clone ( ) ) . map ( | ( _ , pdu ) | pdu . event_id . clone ( ) )
. collect ( ) , . collect ( ) ,
redacts , redacts ,
unsigned , unsigned : if unsigned . is_empty ( ) {
hashes : ruma ::events ::pdu ::EventHash { None
} else {
Some ( to_raw_value ( & unsigned ) . expect ( "to_raw_value always works" ) )
} ,
hashes : EventHash {
sha256 : "aaa" . to_owned ( ) , sha256 : "aaa" . to_owned ( ) ,
} , } ,
signatures : BTreeMap ::new ( ) , signatures : None ,
} ; } ;
let auth_check = state_res ::auth_check ( let auth_check = state_res ::auth_check (
@ -2205,7 +2216,7 @@ impl Rooms {
let mut pdu = serde_json ::from_slice ::< PduEvent > ( & v ) let mut pdu = serde_json ::from_slice ::< PduEvent > ( & v )
. map_err ( | _ | Error ::bad_database ( "PDU in db is invalid." ) ) ? ; . map_err ( | _ | Error ::bad_database ( "PDU in db is invalid." ) ) ? ;
if pdu . sender ! = user_id { if pdu . sender ! = user_id {
pdu . unsigned. remove ( "transaction_id" ) ; pdu . remove_transaction_id( ) ? ;
} }
Ok ( ( pdu_id , pdu ) ) Ok ( ( pdu_id , pdu ) )
} ) ) } ) )
@ -2242,7 +2253,7 @@ impl Rooms {
let mut pdu = serde_json ::from_slice ::< PduEvent > ( & v ) let mut pdu = serde_json ::from_slice ::< PduEvent > ( & v )
. map_err ( | _ | Error ::bad_database ( "PDU in db is invalid." ) ) ? ; . map_err ( | _ | Error ::bad_database ( "PDU in db is invalid." ) ) ? ;
if pdu . sender ! = user_id { if pdu . sender ! = user_id {
pdu . unsigned. remove ( "transaction_id" ) ; pdu . remove_transaction_id( ) ? ;
} }
Ok ( ( pdu_id , pdu ) ) Ok ( ( pdu_id , pdu ) )
} ) ) } ) )
@ -2279,7 +2290,7 @@ impl Rooms {
let mut pdu = serde_json ::from_slice ::< PduEvent > ( & v ) let mut pdu = serde_json ::from_slice ::< PduEvent > ( & v )
. map_err ( | _ | Error ::bad_database ( "PDU in db is invalid." ) ) ? ; . map_err ( | _ | Error ::bad_database ( "PDU in db is invalid." ) ) ? ;
if pdu . sender ! = user_id { if pdu . sender ! = user_id {
pdu . unsigned. remove ( "transaction_id" ) ; pdu . remove_transaction_id( ) ? ;
} }
Ok ( ( pdu_id , pdu ) ) Ok ( ( pdu_id , pdu ) )
} ) ) } ) )
@ -2309,7 +2320,7 @@ impl Rooms {
& self , & self ,
room_id : & RoomId , room_id : & RoomId ,
user_id : & UserId , user_id : & UserId ,
membership : member:: MembershipState, membership : ,
sender : & UserId , sender : & UserId ,
last_state : Option < Vec < Raw < AnyStrippedStateEvent > > > , last_state : Option < Vec < Raw < AnyStrippedStateEvent > > > ,
db : & Database , db : & Database ,
@ -2338,7 +2349,7 @@ impl Rooms {
roomuser_id . extend_from_slice ( user_id . as_bytes ( ) ) ; roomuser_id . extend_from_slice ( user_id . as_bytes ( ) ) ;
match & membership { match & membership {
member:: MembershipState::Join = > { Join = > {
// Check if the user never joined this room
// Check if the user never joined this room
if ! self . once_joined ( user_id , room_id ) ? { if ! self . once_joined ( user_id , room_id ) ? {
// Add the user ID to the join list then
// Add the user ID to the join list then
@ -2347,23 +2358,16 @@ impl Rooms {
// Check if the room has a predecessor
// Check if the room has a predecessor
if let Some ( predecessor ) = self if let Some ( predecessor ) = self
. room_state_get ( room_id , & EventType ::RoomCreate , "" ) ? . room_state_get ( room_id , & EventType ::RoomCreate , "" ) ?
. and_then ( | create | { . and_then ( | create | serde_json ::from_str ( create . content . get ( ) ) . ok ( ) )
serde_json ::from_value ::< . and_then ( | content : RoomCreateEventContent | content . predecessor )
Raw < ruma ::events ::room ::create ::CreateEventContent > ,
> ( create . content . clone ( ) )
. expect ( "Raw::from_value always works" )
. deserialize ( )
. ok ( )
} )
. and_then ( | content | content . predecessor )
{ {
// Copy user settings from predecessor to the current room:
// Copy user settings from predecessor to the current room:
// - Push rules
// - Push rules
//
//
// TODO: finish this once push rules are implemented.
// TODO: finish this once push rules are implemented.
//
//
// let mut push_rules_event_content = account_data
// let mut push_rules_event_content: PushRulesEvent = account_data
// .get ::<ruma::events::push_rules::PushRulesEvent> (
// .get (
// None,
// None,
// user_id,
// user_id,
// EventType::PushRules,
// EventType::PushRules,
@ -2383,13 +2387,11 @@ impl Rooms {
// .ok();
// .ok();
// Copy old tags to new room
// Copy old tags to new room
if let Some ( tag_event ) = if let Some ( tag_event ) = db . account_data . get ::< TagEvent > (
db . account_data . get ::< ruma ::events ::tag ::TagEvent > ( Some ( & predecessor . room_id ) ,
Some ( & predecessor . room_id ) , user_id ,
user_id , EventType ::Tag ,
EventType ::Tag , ) ? {
) ?
{
db . account_data db . account_data
. update ( . update (
Some ( room_id ) , Some ( room_id ) ,
@ -2403,11 +2405,8 @@ impl Rooms {
// Copy direct chat flag
// Copy direct chat flag
if let Some ( mut direct_event ) = if let Some ( mut direct_event ) =
db . account_data . get ::< ruma ::events ::direct ::DirectEvent > ( db . account_data
None , . get ::< DirectEvent > ( None , user_id , EventType ::Direct ) ?
user_id ,
EventType ::Direct ,
) ?
{ {
let mut room_ids_updated = false ; let mut room_ids_updated = false ;
@ -2442,11 +2441,11 @@ impl Rooms {
self . userroomid_leftstate . remove ( & userroom_id ) ? ; self . userroomid_leftstate . remove ( & userroom_id ) ? ;
self . roomuserid_leftcount . remove ( & roomuser_id ) ? ; self . roomuserid_leftcount . remove ( & roomuser_id ) ? ;
} }
member:: MembershipState::Invite = > { Invite = > {
// We want to know if the sender is ignored by the receiver
// We want to know if the sender is ignored by the receiver
let is_ignored = db let is_ignored = db
. account_data . account_data
. get ::< ignored_user_list:: IgnoredUserListEvent> ( . get ::< > (
None , // Ignored users are in global account data
None , // Ignored users are in global account data
user_id , // Receiver
user_id , // Receiver
EventType ::IgnoredUserList , EventType ::IgnoredUserList ,
@ -2475,7 +2474,7 @@ impl Rooms {
self . userroomid_leftstate . remove ( & userroom_id ) ? ; self . userroomid_leftstate . remove ( & userroom_id ) ? ;
self . roomuserid_leftcount . remove ( & roomuser_id ) ? ; self . roomuserid_leftcount . remove ( & roomuser_id ) ? ;
} }
member:: MembershipState::Leave | member ::MembershipState ::Ban = > { Leave | MembershipState ::Ban = > {
if update_joined_count if update_joined_count
& & self & & self
. room_members ( room_id ) . room_members ( room_id )
@ -2700,26 +2699,23 @@ impl Rooms {
) ; ) ;
let state_lock = mutex_state . lock ( ) . await ; let state_lock = mutex_state . lock ( ) . await ;
let mut event = serde_json ::from_ value::< Raw < member ::MemberEventContent > > ( let mut event : RoomMemberEventContent = serde_json ::from_ str (
self . room_state_get ( room_id , & EventType ::RoomMember , & user_id . to_string ( ) ) ? self . room_state_get ( room_id , & EventType ::RoomMember , & user_id . to_string ( ) ) ?
. ok_or ( Error ::BadRequest ( . ok_or ( Error ::BadRequest (
ErrorKind ::BadState , ErrorKind ::BadState ,
"Cannot leave a room you are not a member of." , "Cannot leave a room you are not a member of." ,
) ) ? ) ) ?
. content . content
. clone ( ) , . get ( ) ,
) )
. expect ( "from_value::<Raw<..>> can never fail" )
. deserialize ( )
. map_err ( | _ | Error ::bad_database ( "Invalid member event in database." ) ) ? ; . map_err ( | _ | Error ::bad_database ( "Invalid member event in database." ) ) ? ;
event . membership = member:: MembershipState::Leave ; event . membership = Leave ;
self . build_and_append_pdu ( self . build_and_append_pdu (
PduBuilder { PduBuilder {
event_type : EventType ::RoomMember , event_type : EventType ::RoomMember ,
content : serde_json ::to_value ( event ) content : to_raw_value ( & event ) . expect ( "event is valid, we just created it" ) ,
. expect ( "event is valid, we just created it" ) ,
unsigned : None , unsigned : None ,
state_key : Some ( user_id . to_string ( ) ) , state_key : Some ( user_id . to_string ( ) ) ,
redacts : None , redacts : None ,
@ -2753,16 +2749,14 @@ impl Rooms {
"User is not invited." , "User is not invited." ,
) ) ? ; ) ) ? ;
let servers = invite_state let servers : HashSet < _ > = invite_state
. iter ( ) . iter ( )
. filter_map ( | event | { . filter_map ( | event | serde_json ::from_str ( event . json ( ) . get ( ) ) . ok ( ) )
serde_json ::from_str ::< serde_json ::Value > ( & event . json ( ) . to_string ( ) ) . ok ( ) . filter_map ( | event : serde_json ::Value | event . get ( "sender" ) . cloned ( ) )
} )
. filter_map ( | event | event . get ( "sender" ) . cloned ( ) )
. filter_map ( | sender | sender . as_str ( ) . map ( | s | s . to_owned ( ) ) ) . filter_map ( | sender | sender . as_str ( ) . map ( | s | s . to_owned ( ) ) )
. filter_map ( | sender | UserId ::try_from ( sender ) . ok ( ) ) . filter_map ( | sender | UserId ::try_from ( sender ) . ok ( ) )
. map ( | user | user . server_name ( ) . to_owned ( ) ) . map ( | user | user . server_name ( ) . to_owned ( ) )
. collect ::< HashSet < _ > > ( ) ; . collect ( ) ;
for remote_server in servers { for remote_server in servers {
let make_leave_response = db let make_leave_response = db
@ -2793,10 +2787,9 @@ impl Rooms {
} ; } ;
let mut leave_event_stub = let mut leave_event_stub =
serde_json ::from_str ::< CanonicalJsonObject > ( make_leave_response . event . json ( ) . get ( ) ) serde_json ::from_str ::< CanonicalJsonObject > ( make_leave_response . event . get ( ) ) . map_err (
. map_err ( | _ | { | _ | Error ::BadServerResponse ( "Invalid make_leave event json received from server." ) ,
Error ::BadServerResponse ( "Invalid make_leave event json received from server." ) ) ? ;
} ) ? ;
// TODO: Is origin needed?
// TODO: Is origin needed?
leave_event_stub . insert ( leave_event_stub . insert (
@ -2847,7 +2840,7 @@ impl Rooms {
federation ::membership ::create_leave_event ::v2 ::Request { federation ::membership ::create_leave_event ::v2 ::Request {
room_id , room_id ,
event_id : & event_id , event_id : & event_id ,
pdu : PduEvent ::convert_to_outgoing_federation_event ( leave_event . clone ( ) ) , pdu : & PduEvent ::convert_to_outgoing_federation_event ( leave_event . clone ( ) ) ,
} , } ,
) )
. await ? ; . await ? ;
@ -2912,14 +2905,13 @@ impl Rooms {
pub fn id_from_alias ( & self , alias : & RoomAliasId ) -> Result < Option < RoomId > > { pub fn id_from_alias ( & self , alias : & RoomAliasId ) -> Result < Option < RoomId > > {
self . alias_roomid self . alias_roomid
. get ( alias . alias ( ) . as_bytes ( ) ) ? . get ( alias . alias ( ) . as_bytes ( ) ) ?
. map_or ( Ok ( None ) , | bytes | { . map ( | bytes | {
Ok ( Some ( RoomId ::try_from ( utils ::string_from_bytes ( & bytes ) . map_err ( | _ | {
RoomId ::try_from ( utils ::string_from_bytes ( & bytes ) . map_err ( | _ | { Error ::bad_database ( "Room ID in alias_roomid is invalid unicode." )
Error ::bad_database ( "Room ID in alias_roomid is invalid unicode." ) } ) ? )
} ) ? ) . map_err ( | _ | Error ::bad_database ( "Room ID in alias_roomid is invalid." ) )
. map_err ( | _ | Error ::bad_database ( "Room ID in alias_roomid is invalid." ) ) ? ,
) )
} ) } )
. transpose ( )
} }
#[ tracing::instrument(skip(self)) ] #[ tracing::instrument(skip(self)) ]
@ -2979,11 +2971,11 @@ impl Rooms {
. to_vec ( ) ; . to_vec ( ) ;
let prefix_clone = prefix . clone ( ) ; let prefix_clone = prefix . clone ( ) ;
let words = search_string let words : Vec < _ > = search_string
. split_terminator ( | c : char | ! c . is_alphanumeric ( ) ) . split_terminator ( | c : char | ! c . is_alphanumeric ( ) )
. filter ( | s | ! s . is_empty ( ) ) . filter ( | s | ! s . is_empty ( ) )
. map ( str ::to_lowercase ) . map ( str ::to_lowercase )
. collect ::< Vec < _ > > ( ) ; . collect ( ) ;
let iterators = words . clone ( ) . into_iter ( ) . map ( move | word | { let iterators = words . clone ( ) . into_iter ( ) . map ( move | word | {
let mut prefix2 = prefix . clone ( ) ; let mut prefix2 = prefix . clone ( ) ;
@ -2996,12 +2988,7 @@ impl Rooms {
self . tokenids self . tokenids
. iter_from ( & last_possible_id , true ) // Newest pdus first
. iter_from ( & last_possible_id , true ) // Newest pdus first
. take_while ( move | ( k , _ ) | k . starts_with ( & prefix2 ) ) . take_while ( move | ( k , _ ) | k . starts_with ( & prefix2 ) )
. map ( | ( key , _ ) | { . map ( | ( key , _ ) | key [ key . len ( ) - size_of ::< u64 > ( ) .. ] . to_vec ( ) )
let pdu_id = key [ key . len ( ) - size_of ::< u64 > ( ) .. ] . to_vec ( ) ;
Ok ::< _ , Error > ( pdu_id )
} )
. filter_map ( | r | r . ok ( ) )
} ) ; } ) ;
Ok ( ( Ok ( (
@ -3233,11 +3220,11 @@ impl Rooms {
self . roomuserid_leftcount self . roomuserid_leftcount
. get ( & key ) ? . get ( & key ) ?
. map_or ( Ok ( None ) , | bytes | { . map ( | bytes | {
Ok ( Some ( utils ::u64_from_bytes ( & bytes ) . map_err ( | _ | { utils ::u64_from_bytes ( & bytes )
Error ::bad_database ( "Invalid leftcount in db." ) . map_err ( | _ | Error ::bad_database ( "Invalid leftcount in db." ) )
} ) ? ) )
} ) } )
. transpose ( )
} }
/// Returns an iterator over all rooms this user joined.
/// Returns an iterator over all rooms this user joined.
Nyaaori
3 years ago