check for membership join state at /send_join
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
parent
f31b7b9420
commit
1013fe5a42
1 changed files with 22 additions and 0 deletions
|
@ -1191,6 +1191,28 @@ async fn create_join_event(
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let content = value
|
||||||
|
.get("content")
|
||||||
|
.ok_or_else(|| Error::BadRequest(ErrorKind::InvalidParam, "Join event does not a content key"))?
|
||||||
|
.as_object()
|
||||||
|
.ok_or_else(|| Error::BadRequest(ErrorKind::InvalidParam, "Join event content is empty or invalid"))?;
|
||||||
|
|
||||||
|
let membership: MembershipState = serde_json::from_value(
|
||||||
|
content
|
||||||
|
.get("membership")
|
||||||
|
.ok_or_else(|| Error::BadRequest(ErrorKind::InvalidParam, "Join event content does not have a membership"))?
|
||||||
|
.clone()
|
||||||
|
.into(),
|
||||||
|
)
|
||||||
|
.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Join event has an invalid membership"))?;
|
||||||
|
|
||||||
|
if membership != MembershipState::Join {
|
||||||
|
return Err(Error::BadRequest(
|
||||||
|
ErrorKind::InvalidParam,
|
||||||
|
"Not allowed to send a non-join event at a join endpoint",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
// ACL check sender server name
|
// ACL check sender server name
|
||||||
let sender: OwnedUserId = serde_json::from_value(
|
let sender: OwnedUserId = serde_json::from_value(
|
||||||
value
|
value
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue