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: Release session lock before sending threepid validation email

Browse Source
This commit is contained in:
Ginger
2026-03-27 11:43:39 -04:00
committed by Ellis Git
parent 951b5abe19
commit d5675b85cf
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/service/threepid/mod.rs
+9 -2
View File
@@ -112,6 +112,9 @@ impl Service {
| None => sessions.create_session(recipient.email.clone(), client_secret.to_owned()), | None => sessions.create_session(recipient.email.clone(), client_secret.to_owned()),
}; };
// Clone this so it can outlive the lock we're holding on `sessions`
let session_id = session.session_id.clone();
let ValidationState::Pending(token) = &session.validation_state else { let ValidationState::Pending(token) = &session.validation_state else {
unreachable!("session should be pending") unreachable!("session should be pending")
}; };
@@ -125,14 +128,18 @@ impl Service {
validation_url validation_url
.query_pairs_mut() .query_pairs_mut()
.append_pair("session", session.session_id.as_ref()) .append_pair("session", session_id.as_str())
.append_pair("token", &token.token); .append_pair("token", &token.token);
// Once the validation URL is built, we don't need any data borrowed from
// `sessions` anymore and can release our lock
drop(sessions);
let message = prepare_body(validation_url.to_string()); let message = prepare_body(validation_url.to_string());
mailer.send(recipient, message).await?; mailer.send(recipient, message).await?;
Ok(session.session_id.clone()) Ok(session_id)
} }
/// Attempt to mark a validation session as valid using a validation token. /// Attempt to mark a validation session as valid using a validation token.