nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

sytest test

Browse source
This commit is contained in:
Timo Kösters 2021-03-26 13:41:05 +01:00
parent 8c6a49bec3
commit db7044a950
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
3 changed files with 394 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/database/rooms.rs
View file

@ -1081,7 +1081,7 @@ impl Rooms {
signatures: BTreeMap::new(),
};
if !state_res::auth_check(
let auth_check = state_res::auth_check(
&room_version,
&Arc::new(pdu.clone()),
create_prev_event,
@ -1091,7 +1091,9 @@ impl Rooms {
.map_err(|e| {
error!("{:?}", e);
Error::bad_database("Auth check failed.")
})? {
})?;
if !auth_check {
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
"Event is not authorized.",

9
src/server_server.rs
View file

@ -184,7 +184,10 @@ where
"{} {}: {}",
url,
status,
String::from_utf8_lossy(&body).lines().collect::<Vec<_>>().join(" ")
String::from_utf8_lossy(&body)
.lines()
.collect::<Vec<_>>()
.join(" ")
);
}
@ -698,8 +701,8 @@ fn handle_incoming_pdu<'a>(
let create_event = db
.rooms
.room_state_get(&room_id, &EventType::RoomCreate, "")
.map_err(|_| "Failed to ask database for event.")?
.ok_or_else(|| "Failed to find create event in db.")?;
.map_err(|_| "Failed to ask database for event.".to_owned())?
.ok_or_else(|| "Failed to find create event in db.".to_owned())?;
let create_event_content =
serde_json::from_value::<Raw<CreateEventContent>>(create_event.content.clone())