diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2022-10-11 14:41:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 14:41:06 +0200 |
| commit | 422cff7df6df3ac3691829fbce3fbd486f399869 (patch) | |
| tree | 7000a881c174bedb36ed343b35b00d6834aa9dac | |
| parent | Fix pinning Rust deps in docker images (#14129) (diff) | |
| download | synapse-422cff7df6df3ac3691829fbce3fbd486f399869.tar.xz | |
Fallback if 'approved' isn't included in a registration replication request (#14135)
| -rw-r--r-- | changelog.d/14135.bugfix | 1 | ||||
| -rw-r--r-- | synapse/replication/http/register.py | 18 |
2 files changed, 18 insertions, 1 deletions
diff --git a/changelog.d/14135.bugfix b/changelog.d/14135.bugfix new file mode 100644 index 0000000000..6d1d7816e8 --- /dev/null +++ b/changelog.d/14135.bugfix @@ -0,0 +1 @@ +Fix a bug introduced in Synapse 1.69.0rc1 which would cause registration replication requests to fail if the worker sending the request is not running Synapse 1.69. diff --git a/synapse/replication/http/register.py b/synapse/replication/http/register.py index 61abb529c8..976c283360 100644 --- a/synapse/replication/http/register.py +++ b/synapse/replication/http/register.py @@ -39,6 +39,16 @@ class ReplicationRegisterServlet(ReplicationEndpoint): self.store = hs.get_datastores().main self.registration_handler = hs.get_registration_handler() + # Default value if the worker that sent the replication request did not include + # an 'approved' property. + if ( + hs.config.experimental.msc3866.enabled + and hs.config.experimental.msc3866.require_approval_for_new_accounts + ): + self._approval_default = False + else: + self._approval_default = True + @staticmethod async def _serialize_payload( # type: ignore[override] user_id: str, @@ -92,6 +102,12 @@ class ReplicationRegisterServlet(ReplicationEndpoint): await self.registration_handler.check_registration_ratelimit(content["address"]) + # Always default admin users to approved (since it means they were created by + # an admin). + approved_default = self._approval_default + if content["admin"]: + approved_default = True + await self.registration_handler.register_with_store( user_id=user_id, password_hash=content["password_hash"], @@ -103,7 +119,7 @@ class ReplicationRegisterServlet(ReplicationEndpoint): user_type=content["user_type"], address=content["address"], shadow_banned=content["shadow_banned"], - approved=content["approved"], + approved=content.get("approved", approved_default), ) return 200, {} |