From a9cb39a5663264f30105dabd69f1a40878d7cedd Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 2 Apr 2020 14:01:25 +0100 Subject: [PATCH] Handle invite_room_state --- clientapi/producers/roomserver.go | 4 +++- federationapi/routing/invite.go | 6 +++++- go.mod | 2 +- go.sum | 2 ++ roomserver/api/input.go | 3 ++- roomserver/api/output.go | 2 ++ roomserver/input/events.go | 5 +++++ 7 files changed, 20 insertions(+), 4 deletions(-) diff --git a/clientapi/producers/roomserver.go b/clientapi/producers/roomserver.go index 7a6865b21..4e8ef6a81 100644 --- a/clientapi/producers/roomserver.go +++ b/clientapi/producers/roomserver.go @@ -105,10 +105,12 @@ func (c *RoomserverProducer) SendInputRoomEvents( // If we are in the room then the event should be sent using the SendEvents method. func (c *RoomserverProducer) SendInvite( ctx context.Context, inviteEvent gomatrixserverlib.HeaderedEvent, + inviteRoomState []gomatrixserverlib.InviteV2StrippedState, ) error { request := api.InputRoomEventsRequest{ InputInviteEvents: []api.InputInviteEvent{{ - Event: inviteEvent, + Event: inviteEvent, + InviteRoomState: inviteRoomState, }}, } var response api.InputRoomEventsResponse diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go index a2a979453..6c3e12e23 100644 --- a/federationapi/routing/invite.go +++ b/federationapi/routing/invite.go @@ -85,7 +85,11 @@ func Invite( ) // Add the invite event to the roomserver. - if err = producer.SendInvite(httpReq.Context(), signedEvent.Headered(inviteReq.RoomVersion())); err != nil { + if err = producer.SendInvite( + httpReq.Context(), + signedEvent.Headered(inviteReq.RoomVersion()), + inviteReq.InviteRoomState(), + ); err != nil { util.GetLogger(httpReq.Context()).WithError(err).Error("producer.SendInvite failed") return jsonerror.InternalServerError() } diff --git a/go.mod b/go.mod index 2c8c6d37d..0692a8c6b 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/matrix-org/go-http-js-libp2p v0.0.0-20200318135427-31631a9ef51f github.com/matrix-org/go-sqlite3-js v0.0.0-20200325174927-327088cdef10 github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26 - github.com/matrix-org/gomatrixserverlib v0.0.0-20200402100901-4537e9f1c07f + github.com/matrix-org/gomatrixserverlib v0.0.0-20200402125525-d41fbcbf48fb github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 github.com/mattn/go-sqlite3 v2.0.2+incompatible diff --git a/go.sum b/go.sum index 82e781eef..509d68ca9 100644 --- a/go.sum +++ b/go.sum @@ -132,6 +132,8 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20200124100636-0c2ec91d1df5 h1:km github.com/matrix-org/gomatrixserverlib v0.0.0-20200124100636-0c2ec91d1df5/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= github.com/matrix-org/gomatrixserverlib v0.0.0-20200402100901-4537e9f1c07f h1:3flspujT88u6NgS0jgo/IypwT7TsvIXCvasFwzwh9WQ= github.com/matrix-org/gomatrixserverlib v0.0.0-20200402100901-4537e9f1c07f/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200402125525-d41fbcbf48fb h1:YG4nvzOrC/PC8EMZGV684f2PgznSM3x73aXtRA8vIJo= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200402125525-d41fbcbf48fb/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 h1:osLoFdOy+ChQqVUn2PeTDETFftVkl4w9t/OW18g3lnk= github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1/go.mod h1:cXoYQIENbdWIQHt1SyCo6Bl3C3raHwJ0wgVrXHSqf+A= github.com/matrix-org/util v0.0.0-20171127121716-2e2df66af2f5 h1:W7l5CP4V7wPyPb4tYE11dbmeAOwtFQBTW0rf4OonOS8= diff --git a/roomserver/api/input.go b/roomserver/api/input.go index f07cc0221..66ce826bd 100644 --- a/roomserver/api/input.go +++ b/roomserver/api/input.go @@ -85,7 +85,8 @@ type TransactionID struct { // the usual context a matrix room event would have. We usually do not have // access to the events needed to check the event auth rules for the invite. type InputInviteEvent struct { - Event gomatrixserverlib.HeaderedEvent `json:"event"` + Event gomatrixserverlib.HeaderedEvent `json:"event"` + InviteRoomState []gomatrixserverlib.InviteV2StrippedState `json:"invite_room_state"` } // InputRoomEventsRequest is a request to InputRoomEvents diff --git a/roomserver/api/output.go b/roomserver/api/output.go index 4e7adff79..fcced6966 100644 --- a/roomserver/api/output.go +++ b/roomserver/api/output.go @@ -118,6 +118,8 @@ type OutputNewRoomEvent struct { type OutputNewInviteEvent struct { // The "m.room.member" invite event. Event gomatrixserverlib.HeaderedEvent `json:"event"` + // The stripped room state supplied with the invite. + InviteRoomState []gomatrixserverlib.InviteV2StrippedState `json:"invite_room_state"` } // An OutputRetireInviteEvent is written whenever an existing invite is no longer diff --git a/roomserver/input/events.go b/roomserver/input/events.go index a152880e1..f226e1dea 100644 --- a/roomserver/input/events.go +++ b/roomserver/input/events.go @@ -244,6 +244,11 @@ func processInviteEvent( } event := input.Event.Unwrap() + + if err = event.SetUnsignedField("invite_room_state", input.InviteRoomState); err != nil { + return err + } + outputUpdates, err := updateToInviteMembership(updater, &event, nil, input.Event.RoomVersion) if err != nil { return err