Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-24 22:19:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix fallback value for account_threepid_delegates.email (#7316)

Browse Source
This commit is contained in:
Andrew Morgan 2020-04-29 11:30:06 +01:00 committed by GitHub
parent c58ae367d8
commit eeef9633af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7316.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed backwards compatibility logic of the first value of `trusted_third_party_id_servers` being used for `account_threepid_delegates.email`, which occurs when the former, deprecated option is set and the latter is not.

11
synapse/config/emailconfig.py
View File

@ -108,9 +108,14 @@ class EmailConfig(Config):
if self.trusted_third_party_id_servers: if self.trusted_third_party_id_servers:
# XXX: It's a little confusing that account_threepid_delegate_email is modified # XXX: It's a little confusing that account_threepid_delegate_email is modified
# both in RegistrationConfig and here. We should factor this bit out # both in RegistrationConfig and here. We should factor this bit out
self.account_threepid_delegate_email = self.trusted_third_party_id_servers[
0 first_trusted_identity_server = self.trusted_third_party_id_servers[0]
] # type: Optional[str]
# trusted_third_party_id_servers does not contain a scheme whereas
# account_threepid_delegate_email is expected to. Presume https
self.account_threepid_delegate_email = (
"https://" + first_trusted_identity_server
) # type: Optional[str]
self.using_identity_server_from_trusted_list = True self.using_identity_server_from_trusted_list = True
else: else:
raise ConfigError( raise ConfigError(