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

Move defaults up into code

Browse source
This commit is contained in:
Erik Johnston 2019-02-15 10:53:39 +00:00
parent 02c729d6b0
commit b99c532c1c
1 changed files with 42 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
synapse/config/room_directory.py
View file

@ -20,19 +20,37 @@ from ._base import Config, ConfigError
class RoomDirectoryConfig(Config): class RoomDirectoryConfig(Config):
def read_config(self, config): def read_config(self, config):
alias_creation_rules = config["alias_creation_rules"] alias_creation_rules = config.get("alias_creation_rules")
if alias_creation_rules is not None:
self._alias_creation_rules = [ self._alias_creation_rules = [
_RoomDirectoryRule("alias_creation_rules", rule) _RoomDirectoryRule("alias_creation_rules", rule)
for rule in alias_creation_rules for rule in alias_creation_rules
] ]
else:
self._alias_creation_rules = [
_RoomDirectoryRule(
"alias_creation_rules", {
"action": "allow",
}
)
]
room_list_publication_rules = config["room_list_publication_rules"] room_list_publication_rules = config.get("room_list_publication_rules")
if room_list_publication_rules is not None:
self._room_list_publication_rules = [ self._room_list_publication_rules = [
_RoomDirectoryRule("room_list_publication_rules", rule) _RoomDirectoryRule("room_list_publication_rules", rule)
for rule in room_list_publication_rules for rule in room_list_publication_rules
] ]
else:
self._room_list_publication_rules = [
_RoomDirectoryRule(
"room_list_publication_rules", {
"action": "allow",
}
)
]
def default_config(self, config_dir_path, server_name, **kwargs): def default_config(self, config_dir_path, server_name, **kwargs):
return """ return """
@ -56,11 +74,13 @@ class RoomDirectoryConfig(Config):
# room_id: Matches against the room ID the alias is being pointed at # room_id: Matches against the room ID the alias is being pointed at
# action: Whether to "allow" or "deny" the request if the rule matches # action: Whether to "allow" or "deny" the request if the rule matches
# #
alias_creation_rules: # The default is:
- user_id: "*" #
alias: "*" # alias_creation_rules:
room_id: "*" # - user_id: "*"
action: allow # alias: "*"
# room_id: "*"
# action: allow
# The `room_list_publication_rules` option controls who can publish and # The `room_list_publication_rules` option controls who can publish and
# which rooms can be published in the public room list. # which rooms can be published in the public room list.
@ -83,11 +103,13 @@ class RoomDirectoryConfig(Config):
# associated with the room # associated with the room
# action: Whether to "allow" or "deny" the request if the rule matches # action: Whether to "allow" or "deny" the request if the rule matches
# #
room_list_publication_rules: # The default is:
- user_id: "*" #
alias: "*" # room_list_publication_rules:
room_id: "*" # - user_id: "*"
action: allow # alias: "*"
# room_id: "*"
# action: allow
""" """
def is_alias_creation_allowed(self, user_id, room_id, alias): def is_alias_creation_allowed(self, user_id, room_id, alias):