mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-14 07:43:48 +01:00
Revert "Add "require_consent" parameter for registration"
This reverts commit 3320aaab3a
.
This commit is contained in:
parent
27a686e53b
commit
1c5b8c6222
3 changed files with 3 additions and 18 deletions
|
@ -150,7 +150,6 @@ class RegistrationHandler(BaseHandler):
|
||||||
threepid=None,
|
threepid=None,
|
||||||
user_type=None,
|
user_type=None,
|
||||||
default_display_name=None,
|
default_display_name=None,
|
||||||
require_consent=True,
|
|
||||||
address=None,
|
address=None,
|
||||||
bind_emails=[],
|
bind_emails=[],
|
||||||
):
|
):
|
||||||
|
@ -168,7 +167,6 @@ class RegistrationHandler(BaseHandler):
|
||||||
will be set to this. Defaults to 'localpart'.
|
will be set to this. Defaults to 'localpart'.
|
||||||
address (str|None): the IP address used to perform the registration.
|
address (str|None): the IP address used to perform the registration.
|
||||||
bind_emails (List[str]): list of emails to bind to this account.
|
bind_emails (List[str]): list of emails to bind to this account.
|
||||||
require_consent (bool): Should the user be required to give consent.
|
|
||||||
Returns:
|
Returns:
|
||||||
Deferred[str]: user_id
|
Deferred[str]: user_id
|
||||||
Raises:
|
Raises:
|
||||||
|
@ -213,7 +211,6 @@ class RegistrationHandler(BaseHandler):
|
||||||
admin=admin,
|
admin=admin,
|
||||||
user_type=user_type,
|
user_type=user_type,
|
||||||
address=address,
|
address=address,
|
||||||
require_consent=require_consent,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if self.hs.config.user_directory_search_all_users:
|
if self.hs.config.user_directory_search_all_users:
|
||||||
|
@ -247,7 +244,7 @@ class RegistrationHandler(BaseHandler):
|
||||||
user_id = None
|
user_id = None
|
||||||
attempts += 1
|
attempts += 1
|
||||||
|
|
||||||
if not self.hs.config.user_consent_at_registration and require_consent:
|
if not self.hs.config.user_consent_at_registration:
|
||||||
yield self._auto_join_rooms(user_id)
|
yield self._auto_join_rooms(user_id)
|
||||||
else:
|
else:
|
||||||
logger.info(
|
logger.info(
|
||||||
|
@ -528,7 +525,6 @@ class RegistrationHandler(BaseHandler):
|
||||||
ratelimit=False,
|
ratelimit=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
|
||||||
def register_with_store(
|
def register_with_store(
|
||||||
self,
|
self,
|
||||||
user_id,
|
user_id,
|
||||||
|
@ -540,7 +536,6 @@ class RegistrationHandler(BaseHandler):
|
||||||
admin=False,
|
admin=False,
|
||||||
user_type=None,
|
user_type=None,
|
||||||
address=None,
|
address=None,
|
||||||
require_consent=True,
|
|
||||||
):
|
):
|
||||||
"""Register user in the datastore.
|
"""Register user in the datastore.
|
||||||
|
|
||||||
|
@ -558,7 +553,7 @@ class RegistrationHandler(BaseHandler):
|
||||||
user_type (str|None): type of user. One of the values from
|
user_type (str|None): type of user. One of the values from
|
||||||
api.constants.UserTypes, or None for a normal user.
|
api.constants.UserTypes, or None for a normal user.
|
||||||
address (str|None): the IP address used to perform the registration.
|
address (str|None): the IP address used to perform the registration.
|
||||||
require_consent (bool): Should the user be required to give consent.
|
|
||||||
Returns:
|
Returns:
|
||||||
Deferred
|
Deferred
|
||||||
"""
|
"""
|
||||||
|
@ -589,12 +584,8 @@ class RegistrationHandler(BaseHandler):
|
||||||
admin=admin,
|
admin=admin,
|
||||||
user_type=user_type,
|
user_type=user_type,
|
||||||
address=address,
|
address=address,
|
||||||
require_consent=require_consent,
|
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
if require_consent is False:
|
|
||||||
yield self.store.user_set_consent_version(user_id, "no-consent-required")
|
|
||||||
|
|
||||||
return self.store.register_user(
|
return self.store.register_user(
|
||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
password_hash=password_hash,
|
password_hash=password_hash,
|
||||||
|
@ -606,7 +597,6 @@ class RegistrationHandler(BaseHandler):
|
||||||
user_type=user_type,
|
user_type=user_type,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def register_device(self, user_id, device_id, initial_display_name, is_guest=False):
|
def register_device(self, user_id, device_id, initial_display_name, is_guest=False):
|
||||||
"""Register a device for a user and generate an access token.
|
"""Register a device for a user and generate an access token.
|
||||||
|
|
|
@ -72,7 +72,6 @@ class ReplicationRegisterServlet(ReplicationEndpoint):
|
||||||
"admin": admin,
|
"admin": admin,
|
||||||
"user_type": user_type,
|
"user_type": user_type,
|
||||||
"address": address,
|
"address": address,
|
||||||
"require_consent": require_consent,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
|
@ -89,7 +88,6 @@ class ReplicationRegisterServlet(ReplicationEndpoint):
|
||||||
admin=content["admin"],
|
admin=content["admin"],
|
||||||
user_type=content["user_type"],
|
user_type=content["user_type"],
|
||||||
address=content["address"],
|
address=content["address"],
|
||||||
require_consent=content["require_consent"],
|
|
||||||
)
|
)
|
||||||
|
|
||||||
return (200, {})
|
return (200, {})
|
||||||
|
|
|
@ -525,9 +525,6 @@ class RegisterRestServlet(RestServlet):
|
||||||
# downcased one in `username` for the mac calculation
|
# downcased one in `username` for the mac calculation
|
||||||
user = body["username"].encode("utf-8")
|
user = body["username"].encode("utf-8")
|
||||||
|
|
||||||
# do not require consent for this user (for example, bots)
|
|
||||||
require_consent = body.get("require_consent", True)
|
|
||||||
|
|
||||||
# str() because otherwise hmac complains that 'unicode' does not
|
# str() because otherwise hmac complains that 'unicode' does not
|
||||||
# have the buffer interface
|
# have the buffer interface
|
||||||
got_mac = str(body["mac"])
|
got_mac = str(body["mac"])
|
||||||
|
@ -545,7 +542,7 @@ class RegisterRestServlet(RestServlet):
|
||||||
raise SynapseError(403, "HMAC incorrect")
|
raise SynapseError(403, "HMAC incorrect")
|
||||||
|
|
||||||
user_id = yield self.registration_handler.register_user(
|
user_id = yield self.registration_handler.register_user(
|
||||||
localpart=username, password=password, require_consent=require_consent,
|
localpart=username, password=password
|
||||||
)
|
)
|
||||||
|
|
||||||
result = yield self._create_registration_details(user_id, body)
|
result = yield self._create_registration_details(user_id, body)
|
||||||
|
|
Loading…
Reference in a new issue