git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-09 19:13:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(MSC4277): Undo refuted response changes

Browse source
This commit is contained in:
nexy7574 2025-09-07 23:36:26 +01:00
commit 3df097c2a7
No known key found for this signature in database
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/api/client/report.rs
View file

@ -63,8 +63,9 @@ pub(crate) async fn report_room_route(
.server_in_room(&services.server.name, &body.room_id) .server_in_room(&services.server.name, &body.room_id)
.await .await
{ {
// return 200 as to not reveal if the room exists, preventing enumeration. return Err!(Request(NotFound(
return Ok(report_room::v3::Response {}); "Room does not exist to us, no local users have joined at all"
)));
} }
let report = Report { let report = Report {
@ -100,12 +101,7 @@ pub(crate) async fn report_event_route(
// check if we know about the reported event ID or if it's invalid // check if we know about the reported event ID or if it's invalid
let Ok(pdu) = services.rooms.timeline.get_pdu(&body.event_id).await else { let Ok(pdu) = services.rooms.timeline.get_pdu(&body.event_id).await else {
info!( return Err!(Request(NotFound("Event ID is not known to us or Event ID is invalid")));
"Received event report by user {sender_user} for room {} and event ID {}, but the \
event ID is not known to us or invalid.",
body.room_id, body.event_id
);
return Ok(report_content::v3::Response {});
}; };
is_event_report_valid( is_event_report_valid(
@ -201,8 +197,6 @@ async fn is_event_report_valid(
valid" valid"
); );
// Followup(MSC4277): Should we return 200 regardless in this check? but just
// log the warning?
if room_id != pdu.room_id { if room_id != pdu.room_id {
return Err!(Request(NotFound("Event ID does not belong to the reported room",))); return Err!(Request(NotFound("Event ID does not belong to the reported room",)));
} }