From d183d8a8950def2f8923a72ba24e873358a49284 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Mon, 2 Mar 2020 10:18:24 -0500 Subject: [PATCH] Return a BAD_ALIAS error code if the alias does not point to the room. --- synapse/api/errors.py | 1 + synapse/handlers/message.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/synapse/api/errors.py b/synapse/api/errors.py index 0c2060160089..616942b057b0 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -66,6 +66,7 @@ class Codes(object): EXPIRED_ACCOUNT = "ORG_MATRIX_EXPIRED_ACCOUNT" INVALID_SIGNATURE = "M_INVALID_SIGNATURE" USER_DEACTIVATED = "M_USER_DEACTIVATED" + BAD_ALIAS = "M_BAD_ALIAS" class CodeMessageException(RuntimeError): diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 05ab19310cfb..0c84c6cec4de 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -912,7 +912,7 @@ def persist_and_notify_client_event( raise SynapseError( 400, "Room alias %s does not point to the room" % (room_alias_str,), - Codes.NOT_FOUND, + Codes.BAD_ALIAS, ) # Check that alt_aliases is the proper form. @@ -939,7 +939,7 @@ def persist_and_notify_client_event( 400, "Room alias %s does not point to the room" % (room_alias_str,), - Codes.NOT_FOUND, + Codes.BAD_ALIAS, ) federation_handler = self.hs.get_handlers().federation_handler