diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-05-08 17:01:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-08 17:01:30 +0100 |
commit | 1473058b5eb14b5128c0b6ee6e88e89602ad96c5 (patch) | |
tree | ebfe72dca7d2beeb32ce9b5ba16ad200df023388 /synapse/handlers/directory.py | |
parent | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_invite (diff) | |
download | synapse-1473058b5eb14b5128c0b6ee6e88e89602ad96c5.tar.xz |
Do checks on aliases for incoming m.room.aliases events (#5128)
Follow-up to #5124 Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended.
Diffstat (limited to 'synapse/handlers/directory.py')
-rw-r--r-- | synapse/handlers/directory.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index 50c587aa61..a12f9508d8 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -19,7 +19,7 @@ import string from twisted.internet import defer -from synapse.api.constants import EventTypes +from synapse.api.constants import MAX_ALIAS_LENGTH, EventTypes from synapse.api.errors import ( AuthError, CodeMessageException, @@ -36,7 +36,6 @@ logger = logging.getLogger(__name__) class DirectoryHandler(BaseHandler): - MAX_ALIAS_LENGTH = 255 def __init__(self, hs): super(DirectoryHandler, self).__init__(hs) @@ -105,10 +104,10 @@ class DirectoryHandler(BaseHandler): user_id = requester.user.to_string() - if len(room_alias.to_string()) > self.MAX_ALIAS_LENGTH: + if len(room_alias.to_string()) > MAX_ALIAS_LENGTH: raise SynapseError( 400, - "Can't create aliases longer than %s characters" % self.MAX_ALIAS_LENGTH, + "Can't create aliases longer than %s characters" % MAX_ALIAS_LENGTH, Codes.INVALID_PARAM, ) |