mirror of
https://github.com/hoernschen/dendrite.git
synced 2024-12-27 07:28:27 +00:00
161f145176
* Add NATS JetStream support Update shopify/sarama * Fix addresses * Don't change Addresses in Defaults * Update saramajetstream * Add missing error check Keep typing events for at least one minute * Use all configured NATS addresses * Update saramajetstream * Try setting up with NATS * Make sure NATS uses own persistent directory (TODO: make this configurable) * Update go.mod/go.sum * Jetstream package * Various other refactoring * Build fixes * Config tweaks, make random jetstream storage path for CI * Disable interest policies * Try to sane default on jetstream base path * Try to use in-memory for CI * Restore storage/retention * Update nats.go dependency * Adapt changes to config * Remove unneeded TopicFor * Dep update * Revert "Remove unneeded TopicFor" This reverts commitf5a4e4a339
. * Revert changes made to streams * Fix build problems * Update nats-server * Update go.mod/go.sum * Roomserver input API queuing using NATS * Fix topic naming * Prometheus metrics * More refactoring to remove saramajetstream * Add missing topic * Don't try to populate map that doesn't exist * Roomserver output topic * Update go.mod/go.sum * Message acknowledgements * Ack tweaks * Try to resume transaction re-sends * Try to resume transaction re-sends * Update to matrix-org/gomatrixserverlib@91dadfb * Remove internal.PartitionStorer from components that don't consume keychanges * Try to reduce re-allocations a bit in resolveConflictsV2 * Tweak delivery options on RS input * Publish send-to-device messages into correct JetStream subject * Async and sync roomserver input * Update dendrite-config.yaml * Remove roomserver tests for now (they need rewriting) * Remove roomserver test again (was merged back in) * Update documentation * Docker updates * More Docker updates * Update Docker readme again * Fix lint issues * Send final event in `processEvent` synchronously (since this might stop Sytest from being so upset) * Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that * Go 1.16 instead of Go 1.13 for upgrade tests and Complement * Revert "Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that" This reverts commit368675283f
. * Don't report any errors on `/send` to see what fun that creates * Fix panics on closed channel sends * Enforce state key matches sender * Do the same for leave * Various tweaks to make tests happier Squashed commit of the following: commit13f9028e7a
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 15:47:14 2022 +0000 Do the same for leave commite6be7f05c3
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 15:33:42 2022 +0000 Enforce state key matches sender commit85ede6d64b
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 14:07:04 2022 +0000 Fix panics on closed channel sends commit9755494a98
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 13:38:22 2022 +0000 Don't report any errors on `/send` to see what fun that creates commit3bb4f87b5d
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 13:00:26 2022 +0000 Revert "Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that" This reverts commit368675283f
. commitfe2673ed7b
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 12:09:34 2022 +0000 Go 1.16 instead of Go 1.13 for upgrade tests and Complement commit368675283f
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 11:51:45 2022 +0000 Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that commitb028dfc085
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 10:29:08 2022 +0000 Send final event in `processEvent` synchronously (since this might stop Sytest from being so upset) * Merge in NATS Server v2.6.6 and nats.go v1.13 into the in-process connection fork * Add `jetstream.WithJetStreamMessage` to make ack/nak-ing less messy, use process context in consumers * Fix consumer component name in federation API * Add comment explaining where streams are defined * Tweaks to roomserver input with comments * Finish that sentence that I apparently forgot to finish in INSTALL.md * Bump version number of config to 2 * Add comments around asynchronous sends to roomserver in processEventWithMissingState * More useful error message when the config version does not match * Set version in generate-config * Fix version in config.Defaults Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
229 lines
6.7 KiB
Go
229 lines
6.7 KiB
Go
// Copyright 2017 Vector Creations Ltd
|
|
// Copyright 2017-2018 New Vector Ltd
|
|
// Copyright 2019-2020 The Matrix.org Foundation C.I.C.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package input
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"time"
|
|
|
|
"github.com/matrix-org/dendrite/eduserver/api"
|
|
"github.com/matrix-org/dendrite/eduserver/cache"
|
|
keyapi "github.com/matrix-org/dendrite/keyserver/api"
|
|
userapi "github.com/matrix-org/dendrite/userapi/api"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"github.com/nats-io/nats.go"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// EDUServerInputAPI implements api.EDUServerInputAPI
|
|
type EDUServerInputAPI struct {
|
|
// Cache to store the current typing members in each room.
|
|
Cache *cache.EDUCache
|
|
// The kafka topic to output new typing events to.
|
|
OutputTypingEventTopic string
|
|
// The kafka topic to output new send to device events to.
|
|
OutputSendToDeviceEventTopic string
|
|
// The kafka topic to output new receipt events to
|
|
OutputReceiptEventTopic string
|
|
// The kafka topic to output new key change events to
|
|
OutputKeyChangeEventTopic string
|
|
// kafka producer
|
|
JetStream nats.JetStreamContext
|
|
// Internal user query API
|
|
UserAPI userapi.UserInternalAPI
|
|
// our server name
|
|
ServerName gomatrixserverlib.ServerName
|
|
}
|
|
|
|
// InputTypingEvent implements api.EDUServerInputAPI
|
|
func (t *EDUServerInputAPI) InputTypingEvent(
|
|
ctx context.Context,
|
|
request *api.InputTypingEventRequest,
|
|
response *api.InputTypingEventResponse,
|
|
) error {
|
|
ite := &request.InputTypingEvent
|
|
if ite.Typing {
|
|
// user is typing, update our current state of users typing.
|
|
expireTime := ite.OriginServerTS.Time().Add(
|
|
time.Duration(ite.TimeoutMS) * time.Millisecond,
|
|
)
|
|
t.Cache.AddTypingUser(ite.UserID, ite.RoomID, &expireTime)
|
|
} else {
|
|
t.Cache.RemoveUser(ite.UserID, ite.RoomID)
|
|
}
|
|
|
|
return t.sendTypingEvent(ite)
|
|
}
|
|
|
|
// InputTypingEvent implements api.EDUServerInputAPI
|
|
func (t *EDUServerInputAPI) InputSendToDeviceEvent(
|
|
ctx context.Context,
|
|
request *api.InputSendToDeviceEventRequest,
|
|
response *api.InputSendToDeviceEventResponse,
|
|
) error {
|
|
ise := &request.InputSendToDeviceEvent
|
|
return t.sendToDeviceEvent(ise)
|
|
}
|
|
|
|
// InputCrossSigningKeyUpdate implements api.EDUServerInputAPI
|
|
func (t *EDUServerInputAPI) InputCrossSigningKeyUpdate(
|
|
ctx context.Context,
|
|
request *api.InputCrossSigningKeyUpdateRequest,
|
|
response *api.InputCrossSigningKeyUpdateResponse,
|
|
) error {
|
|
eventJSON, err := json.Marshal(&keyapi.DeviceMessage{
|
|
Type: keyapi.TypeCrossSigningUpdate,
|
|
OutputCrossSigningKeyUpdate: &api.OutputCrossSigningKeyUpdate{
|
|
CrossSigningKeyUpdate: request.CrossSigningKeyUpdate,
|
|
},
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
logrus.WithFields(logrus.Fields{
|
|
"user_id": request.UserID,
|
|
}).Infof("Producing to topic '%s'", t.OutputKeyChangeEventTopic)
|
|
|
|
_, err = t.JetStream.PublishMsg(&nats.Msg{
|
|
Subject: t.OutputKeyChangeEventTopic,
|
|
Header: nats.Header{},
|
|
Data: eventJSON,
|
|
})
|
|
return err
|
|
}
|
|
|
|
func (t *EDUServerInputAPI) sendTypingEvent(ite *api.InputTypingEvent) error {
|
|
ev := &api.TypingEvent{
|
|
Type: gomatrixserverlib.MTyping,
|
|
RoomID: ite.RoomID,
|
|
UserID: ite.UserID,
|
|
Typing: ite.Typing,
|
|
}
|
|
ote := &api.OutputTypingEvent{
|
|
Event: *ev,
|
|
}
|
|
|
|
if ev.Typing {
|
|
expireTime := ite.OriginServerTS.Time().Add(
|
|
time.Duration(ite.TimeoutMS) * time.Millisecond,
|
|
)
|
|
ote.ExpireTime = &expireTime
|
|
}
|
|
|
|
eventJSON, err := json.Marshal(ote)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
logrus.WithFields(logrus.Fields{
|
|
"room_id": ite.RoomID,
|
|
"user_id": ite.UserID,
|
|
"typing": ite.Typing,
|
|
}).Infof("Producing to topic '%s'", t.OutputTypingEventTopic)
|
|
|
|
_, err = t.JetStream.PublishMsg(&nats.Msg{
|
|
Subject: t.OutputTypingEventTopic,
|
|
Header: nats.Header{},
|
|
Data: eventJSON,
|
|
})
|
|
return err
|
|
}
|
|
|
|
func (t *EDUServerInputAPI) sendToDeviceEvent(ise *api.InputSendToDeviceEvent) error {
|
|
devices := []string{}
|
|
_, domain, err := gomatrixserverlib.SplitID('@', ise.UserID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// If the event is targeted locally then we want to expand the wildcard
|
|
// out into individual device IDs so that we can send them to each respective
|
|
// device. If the event isn't targeted locally then we can't expand the
|
|
// wildcard as we don't know about the remote devices, so instead we leave it
|
|
// as-is, so that the federation sender can send it on with the wildcard intact.
|
|
if domain == t.ServerName && ise.DeviceID == "*" {
|
|
var res userapi.QueryDevicesResponse
|
|
err = t.UserAPI.QueryDevices(context.TODO(), &userapi.QueryDevicesRequest{
|
|
UserID: ise.UserID,
|
|
}, &res)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for _, dev := range res.Devices {
|
|
devices = append(devices, dev.ID)
|
|
}
|
|
} else {
|
|
devices = append(devices, ise.DeviceID)
|
|
}
|
|
|
|
logrus.WithFields(logrus.Fields{
|
|
"user_id": ise.UserID,
|
|
"num_devices": len(devices),
|
|
"type": ise.Type,
|
|
}).Infof("Producing to topic '%s'", t.OutputSendToDeviceEventTopic)
|
|
for _, device := range devices {
|
|
ote := &api.OutputSendToDeviceEvent{
|
|
UserID: ise.UserID,
|
|
DeviceID: device,
|
|
SendToDeviceEvent: ise.SendToDeviceEvent,
|
|
}
|
|
|
|
eventJSON, err := json.Marshal(ote)
|
|
if err != nil {
|
|
logrus.WithError(err).Error("sendToDevice failed json.Marshal")
|
|
return err
|
|
}
|
|
|
|
if _, err = t.JetStream.PublishMsg(&nats.Msg{
|
|
Subject: t.OutputSendToDeviceEventTopic,
|
|
Data: eventJSON,
|
|
}); err != nil {
|
|
logrus.WithError(err).Error("sendToDevice failed t.Producer.SendMessage")
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// InputReceiptEvent implements api.EDUServerInputAPI
|
|
// TODO: Intelligently batch requests sent by the same user (e.g wait a few milliseconds before emitting output events)
|
|
func (t *EDUServerInputAPI) InputReceiptEvent(
|
|
ctx context.Context,
|
|
request *api.InputReceiptEventRequest,
|
|
response *api.InputReceiptEventResponse,
|
|
) error {
|
|
logrus.WithFields(logrus.Fields{}).Infof("Producing to topic '%s'", t.OutputReceiptEventTopic)
|
|
output := &api.OutputReceiptEvent{
|
|
UserID: request.InputReceiptEvent.UserID,
|
|
RoomID: request.InputReceiptEvent.RoomID,
|
|
EventID: request.InputReceiptEvent.EventID,
|
|
Type: request.InputReceiptEvent.Type,
|
|
Timestamp: request.InputReceiptEvent.Timestamp,
|
|
}
|
|
js, err := json.Marshal(output)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
_, err = t.JetStream.PublishMsg(&nats.Msg{
|
|
Subject: t.OutputReceiptEventTopic,
|
|
Data: js,
|
|
})
|
|
return err
|
|
}
|