Skip to content

Properly ignore devices, threepids and access tokens from AS users #4122

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

Properly ignore devices, threepids and access tokens from AS users #4122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2385d09
Actualy read appservice users, but don't insert them
sandhose Feb 27, 2025
1e99a6b
syn2mas: use NonNilUuid for MAS user IDs
sandhose Mar 4, 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
56 changes: 28 additions & 28 deletions crates/syn2mas/src/mas_writer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use thiserror::Error;
use thiserror_ext::{Construct, ContextInto};
use tokio::sync::mpsc::{self, Receiver, Sender};
use tracing::{Level, error, info, warn};
use uuid::Uuid;
use uuid::{NonNilUuid, Uuid};

use self::{
constraint_pausing::{ConstraintDescription, IndexDescription},
Expand Down Expand Up @@ -197,7 +197,7 @@ pub struct MasWriter {
}

pub struct MasNewUser {
pub user_id: Uuid,
pub user_id: NonNilUuid,
pub username: String,
pub created_at: DateTime<Utc>,
pub locked_at: Option<DateTime<Utc>>,
Expand All @@ -210,36 +210,36 @@ pub struct MasNewUser {

pub struct MasNewUserPassword {
pub user_password_id: Uuid,
pub user_id: Uuid,
pub user_id: NonNilUuid,
pub hashed_password: String,
pub created_at: DateTime<Utc>,
}

pub struct MasNewEmailThreepid {
pub user_email_id: Uuid,
pub user_id: Uuid,
pub user_id: NonNilUuid,
pub email: String,
pub created_at: DateTime<Utc>,
}

pub struct MasNewUnsupportedThreepid {
pub user_id: Uuid,
pub user_id: NonNilUuid,
pub medium: String,
pub address: String,
pub created_at: DateTime<Utc>,
}

pub struct MasNewUpstreamOauthLink {
pub link_id: Uuid,
pub user_id: Uuid,
pub user_id: NonNilUuid,
pub upstream_provider_id: Uuid,
pub subject: String,
pub created_at: DateTime<Utc>,
}

pub struct MasNewCompatSession {
pub session_id: Uuid,
pub user_id: Uuid,
pub user_id: NonNilUuid,
pub device_id: Option<String>,
pub human_name: Option<String>,
pub created_at: DateTime<Utc>,
Expand Down Expand Up @@ -598,7 +598,7 @@ impl MasWriter {
is_guest,
} in users
{
user_ids.push(user_id);
user_ids.push(user_id.get());
usernames.push(username);
created_ats.push(created_at);
locked_ats.push(locked_at);
Expand Down Expand Up @@ -662,7 +662,7 @@ impl MasWriter {
} in passwords
{
user_password_ids.push(user_password_id);
user_ids.push(user_id);
user_ids.push(user_id.get());
hashed_passwords.push(hashed_password);
created_ats.push(created_at);
versions.push(MIGRATED_PASSWORD_VERSION.into());
Expand Down Expand Up @@ -705,7 +705,7 @@ impl MasWriter {
} in threepids
{
user_email_ids.push(user_email_id);
user_ids.push(user_id);
user_ids.push(user_id.get());
emails.push(email);
created_ats.push(created_at);
}
Expand Down Expand Up @@ -748,7 +748,7 @@ impl MasWriter {
created_at,
} in threepids
{
user_ids.push(user_id);
user_ids.push(user_id.get());
mediums.push(medium);
addresses.push(address);
created_ats.push(created_at);
Expand Down Expand Up @@ -793,7 +793,7 @@ impl MasWriter {
} in links
{
link_ids.push(link_id);
user_ids.push(user_id);
user_ids.push(user_id.get());
upstream_provider_ids.push(upstream_provider_id);
subjects.push(subject);
created_ats.push(created_at);
Expand Down Expand Up @@ -850,7 +850,7 @@ impl MasWriter {
} in sessions
{
session_ids.push(session_id);
user_ids.push(user_id);
user_ids.push(user_id.get());
device_ids.push(device_id);
human_names.push(human_name);
created_ats.push(created_at);
Expand Down Expand Up @@ -1091,7 +1091,7 @@ mod test {
use futures_util::TryStreamExt;
use serde::Serialize;
use sqlx::{Column, PgConnection, PgPool, Row};
use uuid::Uuid;
use uuid::{NonNilUuid, Uuid};

use crate::{
LockedMasDatabase, MasWriter,
Expand Down Expand Up @@ -1213,7 +1213,7 @@ mod test {

writer
.write_users(vec![MasNewUser {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
username: "alice".to_owned(),
created_at: DateTime::default(),
locked_at: None,
Expand All @@ -1231,7 +1231,7 @@ mod test {
/// Tests writing a single user, with a password.
#[sqlx::test(migrator = "mas_storage_pg::MIGRATOR")]
async fn test_write_user_with_password(pool: PgPool) {
const USER_ID: Uuid = Uuid::from_u128(1u128);
const USER_ID: NonNilUuid = NonNilUuid::new(Uuid::from_u128(1u128)).unwrap();

let mut writer = make_mas_writer(&pool).await;

Expand Down Expand Up @@ -1268,7 +1268,7 @@ mod test {

writer
.write_users(vec![MasNewUser {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
username: "alice".to_owned(),
created_at: DateTime::default(),
locked_at: None,
Expand All @@ -1281,7 +1281,7 @@ mod test {
writer
.write_email_threepids(vec![MasNewEmailThreepid {
user_email_id: Uuid::from_u128(2u128),
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
email: "[email protected]".to_owned(),
created_at: DateTime::default(),
}])
Expand All @@ -1301,7 +1301,7 @@ mod test {

writer
.write_users(vec![MasNewUser {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
username: "alice".to_owned(),
created_at: DateTime::default(),
locked_at: None,
Expand All @@ -1313,7 +1313,7 @@ mod test {

writer
.write_unsupported_threepids(vec![MasNewUnsupportedThreepid {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
medium: "msisdn".to_owned(),
address: "441189998819991197253".to_owned(),
created_at: DateTime::default(),
Expand All @@ -1335,7 +1335,7 @@ mod test {

writer
.write_users(vec![MasNewUser {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
username: "alice".to_owned(),
created_at: DateTime::default(),
locked_at: None,
Expand All @@ -1347,7 +1347,7 @@ mod test {

writer
.write_upstream_oauth_links(vec![MasNewUpstreamOauthLink {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
link_id: Uuid::from_u128(3u128),
upstream_provider_id: Uuid::from_u128(4u128),
subject: "12345.67890".to_owned(),
Expand All @@ -1368,7 +1368,7 @@ mod test {

writer
.write_users(vec![MasNewUser {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
username: "alice".to_owned(),
created_at: DateTime::default(),
locked_at: None,
Expand All @@ -1380,7 +1380,7 @@ mod test {

writer
.write_compat_sessions(vec![MasNewCompatSession {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
session_id: Uuid::from_u128(5u128),
created_at: DateTime::default(),
device_id: Some("ADEVICE".to_owned()),
Expand All @@ -1405,7 +1405,7 @@ mod test {

writer
.write_users(vec![MasNewUser {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
username: "alice".to_owned(),
created_at: DateTime::default(),
locked_at: None,
Expand All @@ -1417,7 +1417,7 @@ mod test {

writer
.write_compat_sessions(vec![MasNewCompatSession {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
session_id: Uuid::from_u128(5u128),
created_at: DateTime::default(),
device_id: Some("ADEVICE".to_owned()),
Expand Down Expand Up @@ -1454,7 +1454,7 @@ mod test {

writer
.write_users(vec![MasNewUser {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
username: "alice".to_owned(),
created_at: DateTime::default(),
locked_at: None,
Expand All @@ -1466,7 +1466,7 @@ mod test {

writer
.write_compat_sessions(vec![MasNewCompatSession {
user_id: Uuid::from_u128(1u128),
user_id: NonNilUuid::new(Uuid::from_u128(1u128)).unwrap(),
session_id: Uuid::from_u128(5u128),
created_at: DateTime::default(),
device_id: Some("ADEVICE".to_owned()),
Expand Down
Loading
Loading