mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 01:31:55 +00:00
fix test_auto_create_auto_join_where_no_consent (#4886)
This commit is contained in:
parent
e9eeca1314
commit
88f0675967
1
changelog.d/4886.bugfix
Normal file
1
changelog.d/4886.bugfix
Normal file
@ -0,0 +1 @@
|
|||||||
|
fix test_auto_create_auto_join_where_no_consent.
|
1
changelog.d/4886.misc
Normal file
1
changelog.d/4886.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
fix test_auto_create_auto_join_where_no_consent.
|
@ -243,7 +243,14 @@ class EventCreationHandler(object):
|
|||||||
|
|
||||||
self.spam_checker = hs.get_spam_checker()
|
self.spam_checker = hs.get_spam_checker()
|
||||||
|
|
||||||
if self.config.block_events_without_consent_error is not None:
|
self._block_events_without_consent_error = (
|
||||||
|
self.config.block_events_without_consent_error
|
||||||
|
)
|
||||||
|
|
||||||
|
# we need to construct a ConsentURIBuilder here, as it checks that the necessary
|
||||||
|
# config options, but *only* if we have a configuration for which we are
|
||||||
|
# going to need it.
|
||||||
|
if self._block_events_without_consent_error:
|
||||||
self._consent_uri_builder = ConsentURIBuilder(self.config)
|
self._consent_uri_builder = ConsentURIBuilder(self.config)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
@ -378,7 +385,7 @@ class EventCreationHandler(object):
|
|||||||
Raises:
|
Raises:
|
||||||
ConsentNotGivenError: if the user has not given consent yet
|
ConsentNotGivenError: if the user has not given consent yet
|
||||||
"""
|
"""
|
||||||
if self.config.block_events_without_consent_error is None:
|
if self._block_events_without_consent_error is None:
|
||||||
return
|
return
|
||||||
|
|
||||||
# exempt AS users from needing consent
|
# exempt AS users from needing consent
|
||||||
@ -405,7 +412,7 @@ class EventCreationHandler(object):
|
|||||||
consent_uri = self._consent_uri_builder.build_user_consent_uri(
|
consent_uri = self._consent_uri_builder.build_user_consent_uri(
|
||||||
requester.user.localpart,
|
requester.user.localpart,
|
||||||
)
|
)
|
||||||
msg = self.config.block_events_without_consent_error % {
|
msg = self._block_events_without_consent_error % {
|
||||||
'consent_uri': consent_uri,
|
'consent_uri': consent_uri,
|
||||||
}
|
}
|
||||||
raise ConsentNotGivenError(
|
raise ConsentNotGivenError(
|
||||||
|
@ -23,6 +23,7 @@ from synapse.api.constants import LoginType
|
|||||||
from synapse.api.errors import (
|
from synapse.api.errors import (
|
||||||
AuthError,
|
AuthError,
|
||||||
Codes,
|
Codes,
|
||||||
|
ConsentNotGivenError,
|
||||||
InvalidCaptchaError,
|
InvalidCaptchaError,
|
||||||
LimitExceededError,
|
LimitExceededError,
|
||||||
RegistrationError,
|
RegistrationError,
|
||||||
@ -311,6 +312,10 @@ class RegistrationHandler(BaseHandler):
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
yield self._join_user_to_room(fake_requester, r)
|
yield self._join_user_to_room(fake_requester, r)
|
||||||
|
except ConsentNotGivenError as e:
|
||||||
|
# Technically not necessary to pull out this error though
|
||||||
|
# moving away from bare excepts is a good thing to do.
|
||||||
|
logger.error("Failed to join new user to %r: %r", r, e)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Failed to join new user to %r: %r", r, e)
|
logger.error("Failed to join new user to %r: %r", r, e)
|
||||||
|
|
||||||
|
@ -187,12 +187,32 @@ class RegistrationTestCase(unittest.TestCase):
|
|||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def test_auto_create_auto_join_where_no_consent(self):
|
def test_auto_create_auto_join_where_no_consent(self):
|
||||||
self.hs.config.user_consent_at_registration = True
|
"""Test to ensure that the first user is not auto-joined to a room if
|
||||||
self.hs.config.block_events_without_consent_error = "Error"
|
they have not given general consent.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Given:-
|
||||||
|
# * a user must give consent,
|
||||||
|
# * they have not given that consent
|
||||||
|
# * The server is configured to auto-join to a room
|
||||||
|
# (and autocreate if necessary)
|
||||||
|
|
||||||
|
event_creation_handler = self.hs.get_event_creation_handler()
|
||||||
|
# (Messing with the internals of event_creation_handler is fragile
|
||||||
|
# but can't see a better way to do this. One option could be to subclass
|
||||||
|
# the test with custom config.)
|
||||||
|
event_creation_handler._block_events_without_consent_error = ("Error")
|
||||||
|
event_creation_handler._consent_uri_builder = Mock()
|
||||||
room_alias_str = "#room:test"
|
room_alias_str = "#room:test"
|
||||||
self.hs.config.auto_join_rooms = [room_alias_str]
|
self.hs.config.auto_join_rooms = [room_alias_str]
|
||||||
|
|
||||||
|
# When:-
|
||||||
|
# * the user is registered and post consent actions are called
|
||||||
res = yield self.handler.register(localpart='jeff')
|
res = yield self.handler.register(localpart='jeff')
|
||||||
yield self.handler.post_consent_actions(res[0])
|
yield self.handler.post_consent_actions(res[0])
|
||||||
|
|
||||||
|
# Then:-
|
||||||
|
# * Ensure that they have not been joined to the room
|
||||||
rooms = yield self.store.get_rooms_for_user(res[0])
|
rooms = yield self.store.get_rooms_for_user(res[0])
|
||||||
self.assertEqual(len(rooms), 0)
|
self.assertEqual(len(rooms), 0)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user