|
|
@ -42,6 +42,7 @@ use ruma::{
|
|
|
|
receipt::{ReceiptEvent, ReceiptEventContent},
|
|
|
|
receipt::{ReceiptEvent, ReceiptEventContent},
|
|
|
|
room::{
|
|
|
|
room::{
|
|
|
|
create::RoomCreateEventContent,
|
|
|
|
create::RoomCreateEventContent,
|
|
|
|
|
|
|
|
join_rules::{JoinRule, RoomJoinRulesEventContent},
|
|
|
|
member::{MembershipState, RoomMemberEventContent},
|
|
|
|
member::{MembershipState, RoomMemberEventContent},
|
|
|
|
server_acl::RoomServerAclEventContent,
|
|
|
|
server_acl::RoomServerAclEventContent,
|
|
|
|
},
|
|
|
|
},
|
|
|
@ -2590,6 +2591,33 @@ pub async fn create_join_event_template_route(
|
|
|
|
|
|
|
|
|
|
|
|
acl_check(sender_servername, &body.room_id, &db)?;
|
|
|
|
acl_check(sender_servername, &body.room_id, &db)?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: Conduit does not implement restricted join rules yet, we always reject
|
|
|
|
|
|
|
|
let join_rules_event = db
|
|
|
|
|
|
|
|
.rooms
|
|
|
|
|
|
|
|
.room_state_get(&body.room_id, &StateEventType::RoomJoinRules, "")?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let join_rules_event_content: Option<RoomJoinRulesEventContent> = join_rules_event
|
|
|
|
|
|
|
|
.as_ref()
|
|
|
|
|
|
|
|
.map(|join_rules_event| {
|
|
|
|
|
|
|
|
serde_json::from_str(join_rules_event.content.get()).map_err(|e| {
|
|
|
|
|
|
|
|
warn!("Invalid join rules event: {}", e);
|
|
|
|
|
|
|
|
Error::bad_database("Invalid join rules event in db.")
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.transpose()?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(join_rules_event_content) = join_rules_event_content {
|
|
|
|
|
|
|
|
if matches!(
|
|
|
|
|
|
|
|
join_rules_event_content.join_rule,
|
|
|
|
|
|
|
|
JoinRule::Restricted { .. }
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
return Err(Error::BadRequest(
|
|
|
|
|
|
|
|
ErrorKind::Unknown,
|
|
|
|
|
|
|
|
"Conduit does not support restricted rooms yet.",
|
|
|
|
|
|
|
|
));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
let prev_events: Vec<_> = db
|
|
|
|
let prev_events: Vec<_> = db
|
|
|
|
.rooms
|
|
|
|
.rooms
|
|
|
|
.get_pdu_leaves(&body.room_id)?
|
|
|
|
.get_pdu_leaves(&body.room_id)?
|
|
|
@ -2749,6 +2777,33 @@ async fn create_join_event(
|
|
|
|
|
|
|
|
|
|
|
|
acl_check(sender_servername, room_id, db)?;
|
|
|
|
acl_check(sender_servername, room_id, db)?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: Conduit does not implement restricted join rules yet, we always reject
|
|
|
|
|
|
|
|
let join_rules_event = db
|
|
|
|
|
|
|
|
.rooms
|
|
|
|
|
|
|
|
.room_state_get(room_id, &StateEventType::RoomJoinRules, "")?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let join_rules_event_content: Option<RoomJoinRulesEventContent> = join_rules_event
|
|
|
|
|
|
|
|
.as_ref()
|
|
|
|
|
|
|
|
.map(|join_rules_event| {
|
|
|
|
|
|
|
|
serde_json::from_str(join_rules_event.content.get()).map_err(|e| {
|
|
|
|
|
|
|
|
warn!("Invalid join rules event: {}", e);
|
|
|
|
|
|
|
|
Error::bad_database("Invalid join rules event in db.")
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.transpose()?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(join_rules_event_content) = join_rules_event_content {
|
|
|
|
|
|
|
|
if matches!(
|
|
|
|
|
|
|
|
join_rules_event_content.join_rule,
|
|
|
|
|
|
|
|
JoinRule::Restricted { .. }
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
return Err(Error::BadRequest(
|
|
|
|
|
|
|
|
ErrorKind::Unknown,
|
|
|
|
|
|
|
|
"Conduit does not support restricted rooms yet.",
|
|
|
|
|
|
|
|
));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// We need to return the state prior to joining, let's keep a reference to that here
|
|
|
|
// We need to return the state prior to joining, let's keep a reference to that here
|
|
|
|
let shortstatehash = db
|
|
|
|
let shortstatehash = db
|
|
|
|
.rooms
|
|
|
|
.rooms
|
|
|
|