Skip to content

Fix encoding of MXIDs when creating devices in Synapse #4542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2025
Merged

Fix encoding of MXIDs when creating devices in Synapse #4542

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions crates/matrix-synapse/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,10 @@ impl HomeserverConnection for SynapseConnection {
err(Debug),
)]
async fn query_user(&self, mxid: &str) -> Result<MatrixUser, anyhow::Error> {
let mxid = urlencoding::encode(mxid);
let encoded_mxid = urlencoding::encode(mxid);

let response = self
.get(&format!("_synapse/admin/v2/users/{mxid}"))
.get(&format!("_synapse/admin/v2/users/{encoded_mxid}"))
.send_traced()
.await
.context("Failed to query user from Synapse")?;
Expand Down Expand Up @@ -293,9 +293,9 @@ impl HomeserverConnection for SynapseConnection {
);
});

let mxid = urlencoding::encode(request.mxid());
let encoded_mxid = urlencoding::encode(request.mxid());
let response = self
.put(&format!("_synapse/admin/v2/users/{mxid}"))
.put(&format!("_synapse/admin/v2/users/{encoded_mxid}"))
.json(&body)
.send_traced()
.await
Expand Down Expand Up @@ -379,10 +379,11 @@ impl HomeserverConnection for SynapseConnection {
device_id: &str,
display_name: &str,
) -> Result<(), anyhow::Error> {
let encoded_mxid = urlencoding::encode(mxid);
let device_id = urlencoding::encode(device_id);
let response = self
.put(&format!(
"_synapse/admin/v2/users/{mxid}/devices/{device_id}"
"_synapse/admin/v2/users/{encoded_mxid}/devices/{device_id}"
))
.json(&SynapseUpdateDeviceRequest {
display_name: Some(display_name),
Expand Down Expand Up @@ -417,12 +418,12 @@ impl HomeserverConnection for SynapseConnection {
err(Debug),
)]
async fn delete_device(&self, mxid: &str, device_id: &str) -> Result<(), anyhow::Error> {
let mxid = urlencoding::encode(mxid);
let device_id = urlencoding::encode(device_id);
let encoded_mxid = urlencoding::encode(mxid);
let encoded_device_id = urlencoding::encode(device_id);

let response = self
.delete(&format!(
"_synapse/admin/v2/users/{mxid}/devices/{device_id}"
"_synapse/admin/v2/users/{encoded_mxid}/devices/{encoded_device_id}"
))
.send_traced()
.await
Expand Down Expand Up @@ -458,10 +459,10 @@ impl HomeserverConnection for SynapseConnection {
devices: HashSet<String>,
) -> Result<(), anyhow::Error> {
// Get the list of current devices
let mxid_url = urlencoding::encode(mxid);
let encoded_mxid = urlencoding::encode(mxid);

let response = self
.get(&format!("_synapse/admin/v2/users/{mxid_url}/devices"))
.get(&format!("_synapse/admin/v2/users/{encoded_mxid}/devices"))
.send_traced()
.await
.context("Failed to query devices from Synapse")?;
Expand Down Expand Up @@ -492,7 +493,7 @@ impl HomeserverConnection for SynapseConnection {

let response = self
.post(&format!(
"_synapse/admin/v2/users/{mxid_url}/delete_devices"
"_synapse/admin/v2/users/{encoded_mxid}/delete_devices"
))
.json(&SynapseDeleteDevicesRequest { devices: to_delete })
.send_traced()
Expand Down Expand Up @@ -531,10 +532,10 @@ impl HomeserverConnection for SynapseConnection {
err(Debug),
)]
async fn delete_user(&self, mxid: &str, erase: bool) -> Result<(), anyhow::Error> {
let mxid = urlencoding::encode(mxid);
let encoded_mxid = urlencoding::encode(mxid);

let response = self
.post(&format!("_synapse/admin/v1/deactivate/{mxid}"))
.post(&format!("_synapse/admin/v1/deactivate/{encoded_mxid}"))
.json(&SynapseDeactivateUserRequest { erase })
// Deactivation can take a while, so we set a longer timeout
.timeout(Duration::from_secs(60 * 5))
Expand Down Expand Up @@ -567,9 +568,9 @@ impl HomeserverConnection for SynapseConnection {
err(Debug),
)]
async fn reactivate_user(&self, mxid: &str) -> Result<(), anyhow::Error> {
let mxid = urlencoding::encode(mxid);
let encoded_mxid = urlencoding::encode(mxid);
let response = self
.put(&format!("_synapse/admin/v2/users/{mxid}"))
.put(&format!("_synapse/admin/v2/users/{encoded_mxid}"))
.json(&SynapseUser {
deactivated: Some(false),
..SynapseUser::default()
Expand Down Expand Up @@ -600,9 +601,11 @@ impl HomeserverConnection for SynapseConnection {
err(Debug),
)]
async fn set_displayname(&self, mxid: &str, displayname: &str) -> Result<(), anyhow::Error> {
let mxid = urlencoding::encode(mxid);
let encoded_mxid = urlencoding::encode(mxid);
let response = self
.put(&format!("_matrix/client/v3/profile/{mxid}/displayname"))
.put(&format!(
"_matrix/client/v3/profile/{encoded_mxid}/displayname"
))
.json(&SetDisplayNameRequest { displayname })
.send_traced()
.await
Expand Down Expand Up @@ -646,11 +649,11 @@ impl HomeserverConnection for SynapseConnection {
err(Debug),
)]
async fn allow_cross_signing_reset(&self, mxid: &str) -> Result<(), anyhow::Error> {
let mxid = urlencoding::encode(mxid);
let encoded_mxid = urlencoding::encode(mxid);

let response = self
.post(&format!(
"_synapse/admin/v1/users/{mxid}/_allow_cross_signing_replacement_without_uia"
"_synapse/admin/v1/users/{encoded_mxid}/_allow_cross_signing_replacement_without_uia"
))
.json(&SynapseAllowCrossSigningResetRequest {})
.send_traced()
Expand Down
Loading