tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix empty account_validity config block (#6747)

Browse source
This commit is contained in:
Andrew Morgan 2020-01-20 16:21:59 +00:00 committed by GitHub
commit e9e066055f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/6747.bugfix Normal file
View file

@ -0,0 +1 @@
Fix bug when setting `account_validity` to an empty block in the config. Thanks to @Sorunome for reporting.

3
synapse/config/registration.py
View file

@ -29,6 +29,7 @@ class AccountValidityConfig(Config):
def __init__(self, config, synapse_config):
if config is None:
return
super(AccountValidityConfig, self).__init__()
self.enabled = config.get("enabled", False)
self.renew_by_email_enabled = "renew_at" in config
@ -93,7 +94,7 @@ class RegistrationConfig(Config):
)
self.account_validity = AccountValidityConfig(
config.get("account_validity", {}), config
config.get("account_validity") or {}, config
)
self.registrations_require_3pid = config.get("registrations_require_3pid", [])