From 9dffeb9b67fd923cd26dc1d51a50260f8102f320 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 3 Jul 2020 10:25:26 +0100 Subject: [PATCH] Fix joins to rooms that we know about that have room IDs with our server part (#1178) --- roomserver/internal/perform_join.go | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/roomserver/internal/perform_join.go b/roomserver/internal/perform_join.go index 1a450889..c5480a5b 100644 --- a/roomserver/internal/perform_join.go +++ b/roomserver/internal/perform_join.go @@ -124,7 +124,13 @@ func (r *RoomserverInternalAPI) performJoinRoomByID( Msg: fmt.Sprintf("Room ID %q is invalid: %s", req.RoomIDOrAlias, err), } } - req.ServerNames = append(req.ServerNames, domain) + + // If the server name in the room ID isn't ours then it's a + // possible candidate for finding the room via federation. Add + // it to the list of servers to try. + if domain != r.Cfg.Matrix.ServerName { + req.ServerNames = append(req.ServerNames, domain) + } // Prepare the template for the join event. userID := req.UserID @@ -233,13 +239,18 @@ func (r *RoomserverInternalAPI) performJoinRoomByID( } case eventutil.ErrRoomNoExists: - // The room doesn't exist. First of all check if the room is a local - // room. If it is then there's nothing more to do - the room just - // hasn't been created yet. + // The room doesn't exist locally. If the room ID looks like it should + // be ours then this probably means that we've nuked our database at + // some point. if domain == r.Cfg.Matrix.ServerName { - return "", &api.PerformError{ - Code: api.PerformErrorNoRoom, - Msg: fmt.Sprintf("Room ID %q does not exist", req.RoomIDOrAlias), + // If there are no more server names to try then give up here. + // Otherwise we'll try a federated join as normal, since it's quite + // possible that the room still exists on other servers. + if len(req.ServerNames) == 0 { + return "", &api.PerformError{ + Code: api.PerformErrorNoRoom, + Msg: fmt.Sprintf("Room ID %q does not exist", req.RoomIDOrAlias), + } } }