Skip to content

Ignore guest devices and empty IPs when migrating from Synapse #4121

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 4 commits into from
Mar 4, 2025
Merged

Ignore guest devices and empty IPs when migrating from Synapse #4121

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7263bca
Ignore colons in localparts when importing users
sandhose Feb 18, 2025
89416c8
Ignore '-' as ip on devices
sandhose Feb 6, 2025
1c99829
Ignore 'guest_devices' in synapse
sandhose Feb 6, 2025
b6bb596
Revert "Ignore colons in localparts when importing users"
sandhose Mar 3, 2025
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
4 changes: 3 additions & 1 deletion crates/syn2mas/src/migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,9 @@ async fn migrate_devices(
// As we're using a real IP type in the MAS database, it is possible
// that we encounter invalid IP addresses in the Synapse database.
// In that case, we should ignore them, but still log a warning.
let last_active_ip = ip.and_then(|ip| {
// One special case: Synapse will record '-' as IP in some cases, we don't want
// to log about those
let last_active_ip = ip.filter(|ip| ip != "-").and_then(|ip| {
ip.parse()
.map_err(|e| {
tracing::warn!(
Expand Down
4 changes: 2 additions & 2 deletions crates/syn2mas/src/synapse_reader/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ impl FullUserId {
return Err(ExtractLocalpartError::NoAtSigil);
};

let Some((localpart, server_name)) = without_sigil.split_once(':') else {
let Some((localpart, server_name)) = without_sigil.rsplit_once(':') else {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is different from Synapse's splitting logic (see below refs) and moreover would break on @user:localhost:4242...

If we have truly broken user IDs in the m.org DB then .... maybe it'd be best to find a way to exorcise the database of those :/

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, I reverted this for now; the problematic user on matrix.org is an AS one, and has no 3pid or device, so I'll do a proper fix to ignore this user once the PR to read AS users lands

return Err(ExtractLocalpartError::NoSeparator);
};

Expand Down Expand Up @@ -416,7 +416,7 @@ impl<'conn> SynapseReader<'conn> {
SELECT
user_id, device_id, display_name, last_seen, ip, user_agent
FROM devices
WHERE NOT hidden
WHERE NOT hidden AND device_id != 'guest_device'
",
)
.fetch(&mut *self.txn)
Expand Down
Loading