Drop support for calling /_matrix/client/v3/rooms/{roomId}/invite without an id_access_token

synapse/handlers/room.py

@@ -19,6 +19,7 @@
 import random
 import string
 from collections import OrderedDict
+from http import HTTPStatus
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -678,12 +679,6 @@ async def _move_aliases_to_new_room(
             # we returned the new room to the client at this point.
             logger.error("Unable to send updated alias events in new room: %s", e)
 
-    def _has_all_3pid_keys(self, invite_3pid: dict) -> bool:
-        return all(
-            key in invite_3pid
-            for key in ("medium", "address", "id_server", "id_access_token")
-        )
-
     async def create_room(
         self,
         requester: Requester,
@@ -711,8 +706,8 @@ async def create_room(
                 was, requested, `room_alias`. Secondly, the stream_id of the
                 last persisted event.
         Raises:
-            SynapseError if the room ID couldn't be stored, or something went
-            horribly wrong.
+            SynapseError if the room ID couldn't be stored, 3pid invitation config
+            validation failed, or something went horribly wrong.
             ResourceLimitError if server is blocked to some resource being
             exceeded
         """
@@ -740,10 +735,14 @@ async def create_room(
 
         # validate each entry for correctness
         for invite_3pid in invite_3pid_list:
-            if not self._has_all_3pid_keys(invite_3pid):
+            if not all(
+                key in invite_3pid
+                for key in ("medium", "address", "id_server", "id_access_token")
+            ):
                 raise SynapseError(
-                    400,
-                    f"`id_server` and `id_access_token` are required when doing 3pid invite, caused by {invite_3pid}",
+                    HTTPStatus.BAD_REQUEST,
+                    "all of: `medium`, `address`, `id_server` and `id_access_token` "
+                    f"are required when doing 3pid invite, caused by {invite_3pid}",
                     Codes.MISSING_PARAM,
                 )
 

synapse/rest/client/room.py

@@ -17,6 +17,7 @@
 import logging
 import re
 from enum import Enum
+from http import HTTPStatus
 from typing import TYPE_CHECKING, Awaitable, Dict, List, Optional, Tuple
 from urllib import parse as urlparse
 
@@ -916,9 +917,6 @@ def __init__(self, hs: "HomeServer"):
         self.room_member_handler = hs.get_room_member_handler()
         self.auth = hs.get_auth()
 
-    def _has_3pid_invite_keys(self, content: JsonDict) -> bool:
-        return all(key in content for key in ("medium", "address"))
-
     def register(self, http_server: HttpServer) -> None:
         # /rooms/$roomid/[invite|join|leave]
         PATTERNS = (
@@ -949,29 +947,31 @@ async def on_POST(
             # cheekily send invalid bodies.
             content = {}
 
-        if self._has_3pid_invite_keys(content):
+        if membership_action == "invite" and all(
+            key in content for key in ("medium", "address")
+        ):
             if not all(key in content for key in ("id_server", "id_access_token")):
                 raise SynapseError(
-                    400,
+                    HTTPStatus.BAD_REQUEST,
                     "`id_server` and `id_access_token` are required when doing 3pid invite",
                     Codes.MISSING_PARAM,
                 )
-            if membership_action == "invite":
-                try:
-                    await self.room_member_handler.do_3pid_invite(
-                        room_id,
-                        requester.user,
-                        content["medium"],
-                        content["address"],
-                        content["id_server"],
-                        requester,
-                        txn_id,
-                        content["id_access_token"],
-                    )
-                except ShadowBanError:
-                    # Pretend the request succeeded.
-                    pass
-                return 200, {}
+
+            try:
+                await self.room_member_handler.do_3pid_invite(
+                    room_id,
+                    requester.user,
+                    content["medium"],
+                    content["address"],
+                    content["id_server"],
+                    requester,
+                    txn_id,
+                    content["id_access_token"],
+                )
+            except ShadowBanError:
+                # Pretend the request succeeded.
+                pass
+            return 200, {}
 
         target = requester.user
         if membership_action in ["invite", "ban", "unban", "kick"]: