backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix api/client_server/membership events

Browse source
This commit is contained in:
Charles Hall 2024-07-08 13:43:01 -07:00
parent b05c91b13e
commit ca4f780c93
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/api/client_server/membership.rs
View file

@ -518,6 +518,7 @@ pub(crate) async fn joined_members_route(
} }
#[allow(clippy::too_many_lines)] #[allow(clippy::too_many_lines)]
#[tracing::instrument(skip(reason, _third_party_signed))]
async fn join_room_by_id_helper( async fn join_room_by_id_helper(
sender_user: Option<&UserId>, sender_user: Option<&UserId>,
room_id: &RoomId, room_id: &RoomId,
@ -557,8 +558,8 @@ async fn join_room_by_id_helper(
.as_ref() .as_ref()
.map(|join_rules_event| { .map(|join_rules_event| {
serde_json::from_str(join_rules_event.content.get()) serde_json::from_str(join_rules_event.content.get())
.map_err(|e| { .map_err(|error| {
warn!("Invalid join rules event: {}", e); warn!(%error, "Invalid join rules event");
Error::bad_database( Error::bad_database(
"Invalid join rules event in db.", "Invalid join rules event in db.",
) )
@ -811,7 +812,7 @@ async fn join_room_by_id_helper(
) )
.await?; .await?;
} else { } else {
info!("Joining {room_id} over federation."); info!("Joining over federation.");
let (make_join_response, remote_server) = let (make_join_response, remote_server) =
make_join_request(sender_user, room_id, servers).await?; make_join_request(sender_user, room_id, servers).await?;
@ -915,7 +916,7 @@ async fn join_room_by_id_helper(
// It has enough fields to be called a proper event now // It has enough fields to be called a proper event now
let mut join_event = join_event_stub; let mut join_event = join_event_stub;
info!("Asking {remote_server} for send_join"); info!(server = %remote_server, "Asking other server for send_join");
let send_join_response = services() let send_join_response = services()
.sending .sending
.send_federation_request( .send_federation_request(
@ -975,10 +976,13 @@ async fn join_room_by_id_helper(
.expect("we created a valid pdu") .expect("we created a valid pdu")
.insert(remote_server.to_string(), signature.clone()); .insert(remote_server.to_string(), signature.clone());
} }
Err(e) => { Err(error) => {
warn!( warn!(
"Server {remote_server} sent invalid signature in \ %error,
sendjoin signatures for event {signed_value:?}: {e:?}", server = %remote_server,
event = ?signed_value,
"Other server sent invalid signature in sendjoin \
signatures for event",
); );
} }
} }
@ -1015,10 +1019,11 @@ async fn join_room_by_id_helper(
}; };
let pdu = PduEvent::from_id_val(&event_id, value.clone()).map_err( let pdu = PduEvent::from_id_val(&event_id, value.clone()).map_err(
|e| { |error| {
warn!( warn!(
"Invalid PDU in send_join response: {} {:?}", %error,
e, value object = ?value,
"Invalid PDU in send_join response",
); );
Error::BadServerResponse( Error::BadServerResponse(
"Invalid PDU in send_join response.", "Invalid PDU in send_join response.",
@ -1076,8 +1081,8 @@ async fn join_room_by_id_helper(
.ok()? .ok()?
}, },
) )
.map_err(|e| { .map_err(|error| {
warn!("Auth check failed: {e}"); warn!(%error, "Auth check failed");
Error::BadRequest(ErrorKind::InvalidParam, "Auth check failed") Error::BadRequest(ErrorKind::InvalidParam, "Auth check failed")
})?; })?;
@ -1168,7 +1173,7 @@ async fn make_join_request(
if remote_server == services().globals.server_name() { if remote_server == services().globals.server_name() {
continue; continue;
} }
info!("Asking {remote_server} for make_join"); info!(server = %remote_server, "Asking other server for make_join");
let make_join_response = services() let make_join_response = services()
.sending .sending
.send_federation_request( .send_federation_request(
@ -1198,8 +1203,8 @@ async fn validate_and_add_event_id(
pub_key_map: &RwLock<BTreeMap<String, SigningKeys>>, pub_key_map: &RwLock<BTreeMap<String, SigningKeys>>,
) -> Result<(OwnedEventId, CanonicalJsonObject)> { ) -> Result<(OwnedEventId, CanonicalJsonObject)> {
let mut value: CanonicalJsonObject = serde_json::from_str(pdu.get()) let mut value: CanonicalJsonObject = serde_json::from_str(pdu.get())
.map_err(|e| { .map_err(|error| {
error!("Invalid PDU in server response: {:?}: {:?}", pdu, e); error!(%error, object = ?pdu, "Invalid PDU in server response");
Error::BadServerResponse("Invalid PDU in server response") Error::BadServerResponse("Invalid PDU in server response")
})?; })?;
let event_id = EventId::parse(format!( let event_id = EventId::parse(format!(
@ -1231,7 +1236,7 @@ async fn validate_and_add_event_id(
} }
if time.elapsed() < min_elapsed_duration { if time.elapsed() < min_elapsed_duration {
debug!("Backing off from {}", event_id); debug!(%event_id, "Backing off from event");
return Err(Error::BadServerResponse( return Err(Error::BadServerResponse(
"bad event, still backing off", "bad event, still backing off",
)); ));
@ -1270,9 +1275,15 @@ async fn validate_and_add_event_id(
room_version, room_version,
); );
if let Err(e) = ruma::signatures::verify_event(&keys, &value, room_version) if let Err(error) =
ruma::signatures::verify_event(&keys, &value, room_version)
{ {
warn!("Event {} failed verification {:?} {}", event_id, pdu, e); warn!(
%event_id,
%error,
?pdu,
"Event failed verification",
);
back_off(event_id).await; back_off(event_id).await;
return Err(Error::BadServerResponse("Event failed verification.")); return Err(Error::BadServerResponse("Event failed verification."));
} }
@ -1375,11 +1386,11 @@ pub(crate) async fn invite_helper(
if *pdu.event_id != *event_id { if *pdu.event_id != *event_id {
warn!( warn!(
"Server {} changed invite event, that's not allowed in the \ server = %user_id.server_name(),
spec: ours: {:?}, theirs: {:?}", our_object = ?pdu_json,
user_id.server_name(), their_object = ?value,
pdu_json, "Other server changed invite event, that's not allowed in the \
value spec",
); );
} }
@ -1500,13 +1511,14 @@ pub(crate) async fn leave_all_rooms(user_id: &UserId) -> Result<()> {
}; };
if let Err(error) = leave_room(user_id, &room_id, None).await { if let Err(error) = leave_room(user_id, &room_id, None).await {
warn!(%user_id, %room_id, %error, "failed to leave room"); warn!(%user_id, %room_id, %error, "Failed to leave room");
} }
} }
Ok(()) Ok(())
} }
#[tracing::instrument(skip(reason))]
pub(crate) async fn leave_room( pub(crate) async fn leave_room(
user_id: &UserId, user_id: &UserId,
room_id: &RoomId, room_id: &RoomId,
@ -1580,8 +1592,8 @@ pub(crate) async fn leave_room(
) )
.await?; .await?;
} else { } else {
if let Err(e) = remote_leave_room(user_id, room_id).await { if let Err(error) = remote_leave_room(user_id, room_id).await {
warn!("Failed to leave room {} remotely: {}", user_id, e); warn!(%error, "Failed to leave room remotely");
// Don't tell the client about this error // Don't tell the client about this error
} }