mirror of
https://github.com/matrix-org/dendrite
synced 2024-11-17 07:10:51 +01:00
75a508cc27
Proposed fix for issue: https://github.com/matrix-org/dendrite/issues/2838 Suppose bob received invites to spaceA and spaceB. When Bob joins spaceA, we add an OutputEvent event to retire the invite. This sets the invite to "deleted" in the database. This makes sense. The bug is in stream_invites.go. Triggered when bob received a new invite for spaceB, and does a client sync. In the block (line 76) `for roomID := range retiredInvites if _, ok := req.Response.Rooms.Invite[roomID]; ok { continue } if _, ok := req.Response.Rooms.Join[roomID]; ok { continue } ... ` Bob is not in either maps even though he had just accepted the invite for spaceA. Consequently, the spaceA invite is treated as a retired invite, and a membership Leave event is generated. What bob sees is that after accepting the invite to spaceB, he lose access to spaceA. ### Pull Request Checklist <!-- Please read https://matrix-org.github.io/dendrite/development/contributing before submitting your pull request --> * [ ] I have added tests for PR _or_ I have justified why this PR doesn't need tests. * [x ] Pull request includes a [sign off below using a legally identifiable name](https://matrix-org.github.io/dendrite/development/contributing#sign-off) _or_ I have already signed off privately Signed-off-by: `Tak Wai Wong <tak@hntlabs.com>` Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
102 lines
2.7 KiB
Go
102 lines
2.7 KiB
Go
package streams
|
|
|
|
import (
|
|
"context"
|
|
"crypto/sha256"
|
|
"encoding/base64"
|
|
"math"
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
|
|
"github.com/matrix-org/dendrite/syncapi/storage"
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
)
|
|
|
|
type InviteStreamProvider struct {
|
|
DefaultStreamProvider
|
|
}
|
|
|
|
func (p *InviteStreamProvider) Setup(
|
|
ctx context.Context, snapshot storage.DatabaseTransaction,
|
|
) {
|
|
p.DefaultStreamProvider.Setup(ctx, snapshot)
|
|
|
|
p.latestMutex.Lock()
|
|
defer p.latestMutex.Unlock()
|
|
|
|
id, err := snapshot.MaxStreamPositionForInvites(ctx)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
p.latest = id
|
|
}
|
|
|
|
func (p *InviteStreamProvider) CompleteSync(
|
|
ctx context.Context,
|
|
snapshot storage.DatabaseTransaction,
|
|
req *types.SyncRequest,
|
|
) types.StreamPosition {
|
|
return p.IncrementalSync(ctx, snapshot, req, 0, p.LatestPosition(ctx))
|
|
}
|
|
|
|
func (p *InviteStreamProvider) IncrementalSync(
|
|
ctx context.Context,
|
|
snapshot storage.DatabaseTransaction,
|
|
req *types.SyncRequest,
|
|
from, to types.StreamPosition,
|
|
) types.StreamPosition {
|
|
r := types.Range{
|
|
From: from,
|
|
To: to,
|
|
}
|
|
|
|
invites, retiredInvites, maxID, err := snapshot.InviteEventsInRange(
|
|
ctx, req.Device.UserID, r,
|
|
)
|
|
if err != nil {
|
|
req.Log.WithError(err).Error("p.DB.InviteEventsInRange failed")
|
|
return from
|
|
}
|
|
|
|
for roomID, inviteEvent := range invites {
|
|
// skip ignored user events
|
|
if _, ok := req.IgnoredUsers.List[inviteEvent.Sender()]; ok {
|
|
continue
|
|
}
|
|
ir := types.NewInviteResponse(inviteEvent)
|
|
req.Response.Rooms.Invite[roomID] = ir
|
|
}
|
|
|
|
// When doing an initial sync, we don't want to add retired invites, as this
|
|
// can add rooms we were invited to, but already left.
|
|
if from == 0 {
|
|
return to
|
|
}
|
|
for roomID := range retiredInvites {
|
|
membership, _, err := snapshot.SelectMembershipForUser(ctx, roomID, req.Device.UserID, math.MaxInt64)
|
|
// Skip if the user is an existing member of the room.
|
|
// Otherwise, the NewLeaveResponse will eject the user from the room unintentionally
|
|
if membership == gomatrixserverlib.Join ||
|
|
err != nil {
|
|
continue
|
|
}
|
|
|
|
lr := types.NewLeaveResponse()
|
|
h := sha256.Sum256(append([]byte(roomID), []byte(strconv.FormatInt(int64(to), 10))...))
|
|
lr.Timeline.Events = append(lr.Timeline.Events, gomatrixserverlib.ClientEvent{
|
|
// fake event ID which muxes in the to position
|
|
EventID: "$" + base64.RawURLEncoding.EncodeToString(h[:]),
|
|
OriginServerTS: gomatrixserverlib.AsTimestamp(time.Now()),
|
|
RoomID: roomID,
|
|
Sender: req.Device.UserID,
|
|
StateKey: &req.Device.UserID,
|
|
Type: "m.room.member",
|
|
Content: gomatrixserverlib.RawJSON(`{"membership":"leave"}`),
|
|
})
|
|
req.Response.Rooms.Leave[roomID] = lr
|
|
}
|
|
|
|
return maxID
|
|
}
|