Merge pull request #6790 from matrix-org/rav/msc2260.1

* commit '281551f72':
  changelog
  Make /directory/room/<alias> handle restrictive power levels
  Set the PL for aliases events to 0.
  Factor out a `copy_power_levels_contents` method

1 files changed, 6 insertions, 1 deletions

diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py

index a07d2f1a17..8c5980cb0c 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -151,7 +151,12 @@ class DirectoryHandler(BaseHandler):
 
         yield self._create_association(room_alias, room_id, servers, creator=user_id)
         if send_event:
-            yield self.send_room_alias_update_event(requester, room_id)
+            try:
+                yield self.send_room_alias_update_event(requester, room_id)
+            except AuthError as e:
+                # sending the aliases event may fail due to the user not having
+                # permission in the room; this is permitted.
+                logger.info("Skipping updating aliases event due to auth error %s", e)
 
     @defer.inlineCallbacks
     def delete_association(self, requester, room_alias, send_event=True):