MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-27 13:04:31 +01:00
Code Issues Releases Activity

Log the room ID, event ID, PDU, and event type where possible

Browse source 
Signed-off-by: girlbossceo <june@girlboss.ceo>
This commit is contained in:
girlbossceo 2023-07-28 23:40:10 +00:00
parent 863103450c
commit cc5dcceacc
4 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api/client_server/room.rs
View file

@ -429,7 +429,9 @@ pub async fn get_room_event_route(
.rooms .rooms
.timeline .timeline
.get_pdu(&body.event_id)? .get_pdu(&body.event_id)?
.ok_or(Error::BadRequest(ErrorKind::NotFound, "Event not found."))?; .ok_or({
warn!("Event not found, event ID: {:?}", &body.event_id);
Error::BadRequest(ErrorKind::NotFound, "Event not found.")})?;
if !services().rooms.state_accessor.user_can_see_event( if !services().rooms.state_accessor.user_can_see_event(
sender_user, sender_user,

16
src/api/client_server/state.rs
View file

@ -12,6 +12,7 @@ use ruma::{
serde::Raw, serde::Raw,
EventId, RoomId, UserId, EventId, RoomId, UserId,
}; };
use tracing::log::warn;
/// # `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}` /// # `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}`
/// ///
@ -129,10 +130,11 @@ pub async fn get_state_events_for_key_route(
.rooms .rooms
.state_accessor .state_accessor
.room_state_get(&body.room_id, &body.event_type, &body.state_key)? .room_state_get(&body.room_id, &body.event_type, &body.state_key)?
.ok_or(Error::BadRequest( .ok_or({
ErrorKind::NotFound, warn!("State event {:?} not found in room {:?}", &body.event_type, &body.room_id);
Error::BadRequest(ErrorKind::NotFound,
"State event not found.", "State event not found.",
))?; )})?;
Ok(get_state_events_for_key::v3::Response { Ok(get_state_events_for_key::v3::Response {
content: serde_json::from_str(event.content.get()) content: serde_json::from_str(event.content.get())
@ -165,10 +167,10 @@ pub async fn get_state_events_for_empty_key_route(
.rooms .rooms
.state_accessor .state_accessor
.room_state_get(&body.room_id, &body.event_type, "")? .room_state_get(&body.room_id, &body.event_type, "")?
.ok_or(Error::BadRequest( .ok_or({
ErrorKind::NotFound, warn!("State event {:?} not found in room {:?}", &body.event_type, &body.room_id);
"State event not found.", Error::BadRequest(ErrorKind::NotFound,
))?; "State event not found.",)})?;
Ok(get_state_events_for_key::v3::Response { Ok(get_state_events_for_key::v3::Response {
content: serde_json::from_str(event.content.get()) content: serde_json::from_str(event.content.get())

11
src/api/server_server.rs
View file

@ -711,7 +711,8 @@ pub async fn send_transaction_message_route(
let (event_id, value, room_id) = match r { let (event_id, value, room_id) = match r {
Ok(t) => t, Ok(t) => t,
Err(e) => { Err(e) => {
warn!("Could not parse pdu: {e}"); warn!("Could not parse PDU: {e}");
warn!("Full PDU: {:?}", &pdu);
continue; continue;
} }
}; };
@ -952,7 +953,9 @@ pub async fn get_event_route(
.rooms .rooms
.timeline .timeline
.get_pdu_json(&body.event_id)? .get_pdu_json(&body.event_id)?
.ok_or(Error::BadRequest(ErrorKind::NotFound, "Event not found."))?; .ok_or({
warn!("Event not found, event ID: {:?}", &body.event_id);
Error::BadRequest(ErrorKind::NotFound, "Event not found.")})?;
let room_id_str = event let room_id_str = event
.get("room_id") .get("room_id")
@ -1192,7 +1195,9 @@ pub async fn get_event_authorization_route(
.rooms .rooms
.timeline .timeline
.get_pdu_json(&body.event_id)? .get_pdu_json(&body.event_id)?
.ok_or(Error::BadRequest(ErrorKind::NotFound, "Event not found."))?; .ok_or({
warn!("Event not found, event ID: {:?}", &body.event_id);
Error::BadRequest(ErrorKind::NotFound, "Event not found.")})?;
let room_id_str = event let room_id_str = event
.get("room_id") .get("room_id")

4
src/service/rooms/state/mod.rs
View file

@ -342,7 +342,9 @@ impl Service {
.transpose()?; .transpose()?;
let room_version = create_event_content let room_version = create_event_content
.map(|create_event| create_event.room_version) .map(|create_event| create_event.room_version)
.ok_or(Error::BadDatabase("Invalid room version"))?; .ok_or({
warn!("Invalid room version for room {room_id}");
Error::BadDatabase("Invalid room version")})?;
Ok(room_version) Ok(room_version)
} }