summary refs log tree commit diff
path: root/synapse/groups
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-10-19 13:45:09 +0100
committerGitHub <noreply@github.com>2017-10-19 13:45:09 +0100
commitb4a6b7f7208fa1b7596b91cc4f57e0bf3653c510 (patch)
tree89db7fae69a7c35632f8abefcc1c258c0b9ebccb /synapse/groups
parentMerge pull request #2558 from matrix-org/erikj/group_id_validation (diff)
parentFlake8 (diff)
downloadsynapse-b4a6b7f7208fa1b7596b91cc4f57e0bf3653c510.tar.xz
Merge pull request #2559 from matrix-org/erikj/group_id_validation
Add config to enable group creation
Diffstat (limited to 'synapse/groups')
-rw-r--r--synapse/groups/groups_server.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index e9b44c0971..fc4edb7f04 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -704,10 +704,20 @@ class GroupsServerHandler(object):
         if group:
             raise SynapseError(400, "Group already exists")
 
-        # TODO: Add config to enforce that only server admins can create rooms
         is_admin = yield self.auth.is_server_admin(UserID.from_string(user_id))
         if not is_admin:
-            raise SynapseError(403, "Only server admin can create group on this server")
+            if not self.hs.config.enable_group_creation:
+                raise SynapseError(
+                    403, "Only server admin can create group on this server",
+                )
+            localpart = GroupID.from_string(group_id).localpart
+            if not localpart.startswith(self.hs.config.group_creation_prefix):
+                raise SynapseError(
+                    400,
+                    "Can only create groups with prefix %r on this server" % (
+                        self.hs.config.group_creation_prefix,
+                    ),
+                )
 
         profile = content.get("profile", {})
         name = profile.get("name")