Skip to content

syn2mas: Synapse configuration fixes #4266

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 18, 2025
Merged

syn2mas: Synapse configuration fixes #4266

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
0f479d0
syn2mas: fix handling of Synapse `user_consent` config
reivilibre Mar 18, 2025
d28b1cc
syn2mas: fix handling of missing Synapse `password_config` config
reivilibre Mar 18, 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: 2 additions & 2 deletions crates/syn2mas/src/synapse_reader/checks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ pub fn synapse_config_check(synapse_config: &Config) -> (Vec<CheckWarning>, Vec<
if synapse_config.enable_registration {
warnings.push(CheckWarning::DisableRegistrationAfterMigration);
}
if synapse_config.user_consent {
if synapse_config.user_consent.is_some() {
warnings.push(CheckWarning::DisableUserConsentAfterMigration);
}

Expand Down Expand Up @@ -232,7 +232,7 @@ pub async fn synapse_config_check_against_mas_config(
}

let mas_branding = BrandingConfig::extract_or_default(mas)?;
if synapse.user_consent && mas_branding.tos_uri.is_none() {
if synapse.user_consent.is_some() && mas_branding.tos_uri.is_none() {
warnings.push(CheckWarning::ShouldPortUserConsentAsTerms);
}

Expand Down
9 changes: 8 additions & 1 deletion crates/syn2mas/src/synapse_reader/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ use sqlx::postgres::PgConnectOptions;
#[allow(clippy::struct_excessive_bools)]
pub struct Config {
pub database: DatabaseSection,

#[serde(default)]
pub password_config: PasswordSection,

#[serde(default)]
Expand All @@ -36,7 +38,7 @@ pub struct Config {
pub enable_3pid_changes: bool,

#[serde(default)]
pub user_consent: bool,
pub user_consent: Option<UserConsentSection>,

#[serde(default)]
pub registrations_require_3pid: Vec<String>,
Expand Down Expand Up @@ -297,3 +299,8 @@ mod test {
);
}
}

/// We don't care about any of the fields in this section,
/// just whether it's present.
#[derive(Deserialize)]
pub struct UserConsentSection {}
Loading