diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index fc4edb7f04..23beb3187e 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -13,14 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from twisted.internet import defer
+import logging
from synapse.api.errors import SynapseError
-from synapse.types import UserID, get_domain_from_id, RoomID, GroupID
-
-
-import logging
-import urllib
+from synapse.types import GroupID, RoomID, UserID, get_domain_from_id
+from twisted.internet import defer
logger = logging.getLogger(__name__)
@@ -698,9 +695,11 @@ class GroupsServerHandler(object):
def create_group(self, group_id, user_id, content):
group = yield self.check_group_is_ours(group_id)
- _validate_group_id(group_id)
-
logger.info("Attempting to create group with ID: %r", group_id)
+
+ # parsing the id into a GroupID validates it.
+ group_id_obj = GroupID.from_string(group_id)
+
if group:
raise SynapseError(400, "Group already exists")
@@ -710,7 +709,7 @@ class GroupsServerHandler(object):
raise SynapseError(
403, "Only server admin can create group on this server",
)
- localpart = GroupID.from_string(group_id).localpart
+ localpart = group_id_obj.localpart
if not localpart.startswith(self.hs.config.group_creation_prefix):
raise SynapseError(
400,
@@ -786,18 +785,3 @@ def _parse_visibility_from_contents(content):
is_public = True
return is_public
-
-
-def _validate_group_id(group_id):
- """Validates the group ID is valid for creation on this home server
- """
- localpart = GroupID.from_string(group_id).localpart
-
- if localpart.lower() != localpart:
- raise SynapseError(400, "Group ID must be lower case")
-
- if urllib.quote(localpart.encode('utf-8')) != localpart:
- raise SynapseError(
- 400,
- "Group ID can only contain characters a-z, 0-9, or '_-./'",
- )
|
