mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 15:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

only enable translation logic on pseudo ID rooms

Browse source 
- see added TODO for more info
This commit is contained in:
Sam Wedgwood 2023-08-16 15:50:52 +01:00
parent 96e5690b44
commit c090e7f6bf
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
clientapi/routing/state.go
View file

@ -217,34 +217,47 @@ func OnIncomingStateTypeRequest(
var worldReadable bool var worldReadable bool
var wantLatestState bool var wantLatestState bool
parsedRoomID, err := spec.NewRoomID(roomID) roomVer, err := rsAPI.QueryRoomVersionForRoom(ctx, roomID)
if err != nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusNotFound, Code: http.StatusForbidden,
JSON: spec.InvalidParam("invalid room ID"), JSON: spec.Forbidden(fmt.Sprintf("Unknown room %q or user %q has never joined this room", roomID, device.UserID)),
} }
} }
// Handle user ID state keys appropriately // Only enable translation logic on pseudo ID rooms
newStateKey, invalidUserIDOrNoSender, err := synctypes.FromClientStateKey(*parsedRoomID, stateKey, func(roomID spec.RoomID, userID spec.UserID) (*spec.SenderID, error) { // TODO: remove the if check, synctypes.FromClientStateKey handles non-pseudo ID rooms,
return rsAPI.QuerySenderIDForUser(ctx, roomID, userID) // but has some logic to be worked out (see comment in synctypes.FromClientStateKey for details)
}) if roomVer == gomatrixserverlib.RoomVersionPseudoIDs {
if err != nil { parsedRoomID, err := spec.NewRoomID(roomID)
if invalidUserIDOrNoSender { if err != nil {
// Currently treat this as no state found - see comment for FromClientStateKey
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusNotFound, Code: http.StatusNotFound,
JSON: spec.NotFound(fmt.Sprintf("Cannot find state event for %q", evType)), JSON: spec.InvalidParam("invalid room ID"),
}
} else {
util.GetLogger(ctx).WithError(err).Error("synctypes.FromClientStateKey failed")
return util.JSONResponse{
Code: http.StatusInternalServerError,
JSON: spec.Unknown("internal server error"),
} }
} }
// Handle user ID state keys appropriately
newStateKey, invalidUserIDOrNoSender, err := synctypes.FromClientStateKey(*parsedRoomID, stateKey, func(roomID spec.RoomID, userID spec.UserID) (*spec.SenderID, error) {
return rsAPI.QuerySenderIDForUser(ctx, roomID, userID)
})
if err != nil {
if invalidUserIDOrNoSender {
// Currently treat this as no state found - see comment for FromClientStateKey
return util.JSONResponse{
Code: http.StatusNotFound,
JSON: spec.NotFound(fmt.Sprintf("Cannot find state event for %q", evType)),
}
} else {
util.GetLogger(ctx).WithError(err).Error("synctypes.FromClientStateKey failed")
return util.JSONResponse{
Code: http.StatusInternalServerError,
JSON: spec.Unknown("internal server error"),
}
}
}
stateKey = *newStateKey
} }
stateKey = *newStateKey
// Always fetch visibility so that we can work out whether to show // Always fetch visibility so that we can work out whether to show
// the latest events or the last event from when the user was joined. // the latest events or the last event from when the user was joined.