MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 00:23:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #556 from matrix-org/daniel/config

Browse source 
Rename config field to reflect yaml name
This commit is contained in:
Daniel Wagner-Hall 2016-02-03 14:55:54 +00:00
commit 66bb255fcd
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
synapse/config/registration.py
View file

@ -23,11 +23,11 @@ from distutils.util import strtobool
class RegistrationConfig(Config): class RegistrationConfig(Config):
def read_config(self, config): def read_config(self, config):
self.disable_registration = not bool( self.enable_registration = bool(
strtobool(str(config["enable_registration"])) strtobool(str(config["enable_registration"]))
) )
if "disable_registration" in config: if "disable_registration" in config:
self.disable_registration = bool( self.enable_registration = not bool(
strtobool(str(config["disable_registration"])) strtobool(str(config["disable_registration"]))
) )
@ -78,6 +78,6 @@ class RegistrationConfig(Config):
def read_arguments(self, args): def read_arguments(self, args):
if args.enable_registration is not None: if args.enable_registration is not None:
self.disable_registration = not bool( self.enable_registration = bool(
strtobool(str(args.enable_registration)) strtobool(str(args.enable_registration))
) )

4
synapse/rest/client/v1/register.py
View file

@ -59,7 +59,7 @@ class RegisterRestServlet(ClientV1RestServlet):
# } # }
# TODO: persistent storage # TODO: persistent storage
self.sessions = {} self.sessions = {}
self.disable_registration = hs.config.disable_registration self.enable_registration = hs.config.enable_registration
def on_GET(self, request): def on_GET(self, request):
if self.hs.config.enable_registration_captcha: if self.hs.config.enable_registration_captcha:
@ -113,7 +113,7 @@ class RegisterRestServlet(ClientV1RestServlet):
is_using_shared_secret = login_type == LoginType.SHARED_SECRET is_using_shared_secret = login_type == LoginType.SHARED_SECRET
can_register = ( can_register = (
not self.disable_registration self.enable_registration
or is_application_server or is_application_server
or is_using_shared_secret or is_using_shared_secret
) )

2
synapse/rest/client/v2_alpha/register.py
View file

@ -117,7 +117,7 @@ class RegisterRestServlet(RestServlet):
return return
# == Normal User Registration == (everyone else) # == Normal User Registration == (everyone else)
if self.hs.config.disable_registration: if not self.hs.config.enable_registration:
raise SynapseError(403, "Registration has been disabled") raise SynapseError(403, "Registration has been disabled")
guest_access_token = body.get("guest_access_token", None) guest_access_token = body.get("guest_access_token", None)

2
tests/rest/client/v1/test_events.py
View file

@ -122,7 +122,7 @@ class EventStreamPermissionsTestCase(RestTestCase):
self.ratelimiter = hs.get_ratelimiter() self.ratelimiter = hs.get_ratelimiter()
self.ratelimiter.send_message.return_value = (True, 0) self.ratelimiter.send_message.return_value = (True, 0)
hs.config.enable_registration_captcha = False hs.config.enable_registration_captcha = False
hs.config.disable_registration = False hs.config.enable_registration = True
hs.get_handlers().federation_handler = Mock() hs.get_handlers().federation_handler = Mock()

4
tests/rest/client/v2_alpha/test_register.py
View file

@ -41,7 +41,7 @@ class RegisterRestServletTestCase(unittest.TestCase):
self.hs.hostname = "superbig~testing~thing.com" self.hs.hostname = "superbig~testing~thing.com"
self.hs.get_auth = Mock(return_value=self.auth) self.hs.get_auth = Mock(return_value=self.auth)
self.hs.get_handlers = Mock(return_value=self.handlers) self.hs.get_handlers = Mock(return_value=self.handlers)
self.hs.config.disable_registration = False self.hs.config.enable_registration = True
# init the thing we're testing # init the thing we're testing
self.servlet = RegisterRestServlet(self.hs) self.servlet = RegisterRestServlet(self.hs)
@ -120,7 +120,7 @@ class RegisterRestServletTestCase(unittest.TestCase):
})) }))
def test_POST_disabled_registration(self): def test_POST_disabled_registration(self):
self.hs.config.disable_registration = True self.hs.config.enable_registration = False
self.request_data = json.dumps({ self.request_data = json.dumps({
"username": "kermit", "username": "kermit",
"password": "monkey" "password": "monkey"

2
tests/utils.py
View file

@ -46,7 +46,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs):
config = Mock() config = Mock()
config.signing_key = [MockKey()] config.signing_key = [MockKey()]
config.event_cache_size = 1 config.event_cache_size = 1
config.disable_registration = False config.enable_registration = True
config.macaroon_secret_key = "not even a little secret" config.macaroon_secret_key = "not even a little secret"
config.server_name = "server.under.test" config.server_name = "server.under.test"
config.trusted_third_party_id_servers = [] config.trusted_third_party_id_servers = []