Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Perform additional membership validation on remote knocks too

Browse Source
This commit is contained in:
timedout
2026-02-08 15:34:07 +00:00
parent 184ae2ebb9
commit e0b7d03018
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/client/membership/knock.rs
+12 -1
View File
@@ -10,7 +10,7 @@ use conduwuit::{
}, },
result::FlatOk, result::FlatOk,
trace, trace,
utils::{self, shuffle, stream::IterStream}, utils::{self, shuffle, stream::IterStream, to_canonical_object},
warn, warn,
}; };
use futures::{FutureExt, StreamExt}; use futures::{FutureExt, StreamExt};
@@ -741,6 +741,17 @@ async fn make_knock_request(
trace!("make_knock response: {make_knock_response:?}"); trace!("make_knock response: {make_knock_response:?}");
make_knock_counter = make_knock_counter.saturating_add(1); make_knock_counter = make_knock_counter.saturating_add(1);
if let Ok(r) = &make_knock_response {
if let Err(e) = validate_remote_member_event_stub(
&MembershipState::Knock,
sender_user,
room_id,
&to_canonical_object(&r.event)?,
) {
warn!("make_knock response from {remote_server} failed validation: {e}");
continue;
}
}
make_knock_response_and_server = make_knock_response.map(|r| (r, remote_server.clone())); make_knock_response_and_server = make_knock_response.map(|r| (r, remote_server.clone()));