mirror of
https://github.com/1f349/dendrite.git
synced 2024-12-23 16:54:08 +00:00
bcb89ada5e
* fix conversion from int to string yields a string of one rune, not a string of digits * Add receipts table to syncapi * Use StreamingToken as the since value * Add required method to testEDUProducer * Make receipt json creation "easier" to read * Add receipts api to the eduserver * Add receipts endpoint * Add eduserver kafka consumer * Add missing kafka config * Add passing tests to whitelist Signed-off-by: Till Faelligen <tfaelligen@gmail.com> * Fix copy & paste error * Fix column count error * Make outbound federation receipts pass * Make "Inbound federation rejects receipts from wrong remote" pass * Don't use errors package * - Add TODO for batching requests - Rename variable * Return a better error message * - Use OutputReceiptEvent instead of InputReceiptEvent as result - Don't use the errors package for errors - Defer CloseAndLogIfError to close rows - Fix Copyright * Better creation/usage of JoinResponse * Query all joined rooms instead of just one * Update gomatrixserverlib * Add sqlite3 migration * Add postgres migration * Ensure required sequence exists before running migrations * Clarification on comment * - Fix a bug when creating client receipts - Use concrete types instead of interface{} * Remove dead code Use key for timestamp * Fix postgres query... * Remove single purpose struct * Use key/value directly * Only apply receipts on initial sync or if edu positions differ, otherwise we'll be sending the same receipts over and over again. * Actually update the id, so it is correctly send in syncs * Set receipt on request to /read_markers * Fix issue with receipts getting overwritten * Use fmt.Errorf instead of pkg/errors * Revert "Add postgres migration" This reverts commit 722fe5a04628882b787d096942459961db159b06. * Revert "Add sqlite3 migration" This reverts commit d113b03f6495a4b8f8bcf158a3d00b510b4240cc. * Fix selectRoomReceipts query * Make golangci-lint happy Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
206 lines
6.1 KiB
Go
206 lines
6.1 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/Shopify/sarama"
|
|
"github.com/matrix-org/dendrite/eduserver/api"
|
|
"github.com/matrix-org/dendrite/eduserver/cache"
|
|
userapi "github.com/matrix-org/dendrite/userapi/api"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"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
|
|
// kafka producer
|
|
Producer sarama.SyncProducer
|
|
// 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)
|
|
}
|
|
|
|
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)
|
|
|
|
m := &sarama.ProducerMessage{
|
|
Topic: string(t.OutputTypingEventTopic),
|
|
Key: sarama.StringEncoder(ite.RoomID),
|
|
Value: sarama.ByteEncoder(eventJSON),
|
|
}
|
|
|
|
_, _, err = t.Producer.SendMessage(m)
|
|
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
|
|
}
|
|
|
|
m := &sarama.ProducerMessage{
|
|
Topic: string(t.OutputSendToDeviceEventTopic),
|
|
Key: sarama.StringEncoder(ote.UserID),
|
|
Value: sarama.ByteEncoder(eventJSON),
|
|
}
|
|
|
|
_, _, err = t.Producer.SendMessage(m)
|
|
if 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
|
|
}
|
|
m := &sarama.ProducerMessage{
|
|
Topic: t.OutputReceiptEventTopic,
|
|
Key: sarama.StringEncoder(request.InputReceiptEvent.RoomID + ":" + request.InputReceiptEvent.UserID),
|
|
Value: sarama.ByteEncoder(js),
|
|
}
|
|
_, _, err = t.Producer.SendMessage(m)
|
|
return err
|
|
}
|