mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-06 14:33:10 -06:00
Squashed commit of the following: commitb5c55faf98Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jul 1 12:00:32 2022 +0100 Version 0.8.9 (#2549) * Version 0.8.9 * Update changelog commitb50a24c666Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jul 1 10:54:07 2022 +0100 Roomserver producers package (#2546) * Give the roomserver a producers package * Change init point * Populate ACLs API * Fix build issues * `RoomEventProducer` naming commit89cd0e8fc1Author: Till <2353100+S7evinK@users.noreply.github.com> Date: Fri Jul 1 11:49:26 2022 +0200 Try to fix backfilling (#2548) * Try to fix backfilling * Return start/end to not confuse clients * Update GMSL * Update GMSL commit086f182e24Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jul 1 09:50:06 2022 +0100 Disable WebAssembly builds for now commit54bed4c593Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jul 1 09:37:54 2022 +0100 Blacklist `Guest users can join guest_access rooms` test until it can be investigated commit561c159ad7Author: Till <2353100+S7evinK@users.noreply.github.com> Date: Thu Jun 30 12:34:37 2022 +0200 Silence presence logs (#2547) commit519bc1124bAuthor: Neil Alexander <neilalexander@users.noreply.github.com> Date: Wed Jun 29 15:29:39 2022 +0100 Add `evacuateUser` endpoint, use it when deactivating accounts (#2545) * Add `evacuateUser` endpoint, use it when deactivating accounts * Populate the API * Clean up user devices when deactivating * Include invites, delete pushers commit2dea466685Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Wed Jun 29 12:32:24 2022 +0100 Return an error if trying to invite a malformed user ID (#2543) commit2086992cafAuthor: Till <2353100+S7evinK@users.noreply.github.com> Date: Wed Jun 29 10:49:12 2022 +0200 Don't return `end` if there are not more messages (#2542) * Be more spec compliant * Move lazyLoadMembers to own method commit920a20821bAuthor: Jean Lucas <jean@4ray.co> Date: Mon Jun 27 04:15:19 2022 -0400 Fix nats.go commit (#2540) Signed-off-by: Jean Lucas <jean@4ray.co> commit7120eb6bc9Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Wed Jun 15 14:27:07 2022 +0100 Add `InputDeviceListUpdate` to the keyserver, remove old input API (#2536) * Add `InputDeviceListUpdate` to the keyserver, remove old input API * Fix copyright * Log more information when a device list update fails commit1b90cc9536Author: Till <2353100+S7evinK@users.noreply.github.com> Date: Wed Jun 15 12:50:02 2022 +0200 Fix rare panic when returning user devices over federation (#2534) commit4c2a10f1a6Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Mon Jun 13 15:11:10 2022 +0100 Handle state before, send history visibility in output (#2532) * Check state before event * Tweaks * Refactor a bit, include in output events * Don't waste time if soft failed either * Tweak control flow, comments, use GMSL history visibility type commitc500958583Author: Emanuele Aliberti <dev@mtka.eu> Date: Mon Jun 13 13:08:46 2022 +0200 generic CaddyFile in front of Dendrite (monolith) (#2531) for Caddy 2.5.x Co-authored-by: emanuele.aliberti <emanuele.aliberti@mtka.eu> commite1136f4d3eAuthor: Till Faelligen <davidf@element.io> Date: Mon Jun 13 11:46:59 2022 +0200 Make the linter happy again commit0a7f7dc716Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Mon Jun 13 10:16:30 2022 +0100 Add `--difference` to `resolve-state` tool commit89d2adadbdAuthor: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jun 10 10:58:04 2022 +0100 Attempt to raise the file descriptor limit at startup (#2527) commit1030072285Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jun 10 10:18:32 2022 +0100 Rename the page to "Optimise your installation" commit16ed1633b6Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jun 10 10:15:14 2022 +0100 Highlighting in docs commite2a64773ceAuthor: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jun 10 10:14:15 2022 +0100 Add new next steps page to the documentation commit660f7839f5Author: Till <2353100+S7evinK@users.noreply.github.com> Date: Thu Jun 9 18:38:07 2022 +0200 Correctly redact events over federation (#2526) * Ensure we check powerlevel/origin before redacting an event * Add passing test * Use pl.UserLevel * Make check more readable, also check for the sender
173 lines
5.5 KiB
Go
173 lines
5.5 KiB
Go
// Copyright 2022 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 consumers
|
|
|
|
import (
|
|
"context"
|
|
"strconv"
|
|
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
"github.com/matrix-org/dendrite/setup/jetstream"
|
|
"github.com/matrix-org/dendrite/setup/process"
|
|
"github.com/matrix-org/dendrite/syncapi/notifier"
|
|
"github.com/matrix-org/dendrite/syncapi/storage"
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
"github.com/matrix-org/dendrite/userapi/api"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"github.com/nats-io/nats.go"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// OutputTypingEventConsumer consumes events that originated in the EDU server.
|
|
type PresenceConsumer struct {
|
|
ctx context.Context
|
|
jetstream nats.JetStreamContext
|
|
nats *nats.Conn
|
|
durable string
|
|
requestTopic string
|
|
presenceTopic string
|
|
db storage.Database
|
|
stream types.StreamProvider
|
|
notifier *notifier.Notifier
|
|
deviceAPI api.SyncUserAPI
|
|
cfg *config.SyncAPI
|
|
}
|
|
|
|
// NewPresenceConsumer creates a new PresenceConsumer.
|
|
// Call Start() to begin consuming events.
|
|
func NewPresenceConsumer(
|
|
process *process.ProcessContext,
|
|
cfg *config.SyncAPI,
|
|
js nats.JetStreamContext,
|
|
nats *nats.Conn,
|
|
db storage.Database,
|
|
notifier *notifier.Notifier,
|
|
stream types.StreamProvider,
|
|
deviceAPI api.SyncUserAPI,
|
|
) *PresenceConsumer {
|
|
return &PresenceConsumer{
|
|
ctx: process.Context(),
|
|
nats: nats,
|
|
jetstream: js,
|
|
durable: cfg.Matrix.JetStream.Durable("SyncAPIPresenceConsumer"),
|
|
presenceTopic: cfg.Matrix.JetStream.Prefixed(jetstream.OutputPresenceEvent),
|
|
requestTopic: cfg.Matrix.JetStream.Prefixed(jetstream.RequestPresence),
|
|
db: db,
|
|
notifier: notifier,
|
|
stream: stream,
|
|
deviceAPI: deviceAPI,
|
|
cfg: cfg,
|
|
}
|
|
}
|
|
|
|
// Start consuming typing events.
|
|
func (s *PresenceConsumer) Start() error {
|
|
// Normal NATS subscription, used by Request/Reply
|
|
_, err := s.nats.Subscribe(s.requestTopic, func(msg *nats.Msg) {
|
|
userID := msg.Header.Get(jetstream.UserID)
|
|
presence, err := s.db.GetPresence(context.Background(), userID)
|
|
m := &nats.Msg{
|
|
Header: nats.Header{},
|
|
}
|
|
if err != nil {
|
|
m.Header.Set("error", err.Error())
|
|
if err = msg.RespondMsg(m); err != nil {
|
|
logrus.WithError(err).Error("Unable to respond to messages")
|
|
}
|
|
return
|
|
}
|
|
if presence == nil {
|
|
presence = &types.PresenceInternal{
|
|
UserID: userID,
|
|
}
|
|
}
|
|
|
|
deviceRes := api.QueryDevicesResponse{}
|
|
if err = s.deviceAPI.QueryDevices(s.ctx, &api.QueryDevicesRequest{UserID: userID}, &deviceRes); err != nil {
|
|
m.Header.Set("error", err.Error())
|
|
if err = msg.RespondMsg(m); err != nil {
|
|
logrus.WithError(err).Error("Unable to respond to messages")
|
|
}
|
|
return
|
|
}
|
|
|
|
for i := range deviceRes.Devices {
|
|
if int64(presence.LastActiveTS) < deviceRes.Devices[i].LastSeenTS {
|
|
presence.LastActiveTS = gomatrixserverlib.Timestamp(deviceRes.Devices[i].LastSeenTS)
|
|
}
|
|
}
|
|
|
|
m.Header.Set(jetstream.UserID, presence.UserID)
|
|
m.Header.Set("presence", presence.ClientFields.Presence)
|
|
if presence.ClientFields.StatusMsg != nil {
|
|
m.Header.Set("status_msg", *presence.ClientFields.StatusMsg)
|
|
}
|
|
m.Header.Set("last_active_ts", strconv.Itoa(int(presence.LastActiveTS)))
|
|
|
|
if err = msg.RespondMsg(m); err != nil {
|
|
logrus.WithError(err).Error("Unable to respond to messages")
|
|
return
|
|
}
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !s.cfg.Matrix.Presence.EnableInbound && !s.cfg.Matrix.Presence.EnableOutbound {
|
|
return nil
|
|
}
|
|
return jetstream.JetStreamConsumer(
|
|
s.ctx, s.jetstream, s.presenceTopic, s.durable, s.onMessage,
|
|
nats.DeliverAll(), nats.ManualAck(), nats.HeadersOnly(),
|
|
)
|
|
}
|
|
|
|
func (s *PresenceConsumer) onMessage(ctx context.Context, msg *nats.Msg) bool {
|
|
userID := msg.Header.Get(jetstream.UserID)
|
|
presence := msg.Header.Get("presence")
|
|
timestamp := msg.Header.Get("last_active_ts")
|
|
fromSync, _ := strconv.ParseBool(msg.Header.Get("from_sync"))
|
|
logrus.Tracef("syncAPI received presence event: %+v", msg.Header)
|
|
|
|
if fromSync { // do not process local presence changes; we already did this synchronously.
|
|
return true
|
|
}
|
|
|
|
ts, err := strconv.Atoi(timestamp)
|
|
if err != nil {
|
|
return true
|
|
}
|
|
|
|
var statusMsg *string = nil
|
|
if data, ok := msg.Header["status_msg"]; ok && len(data) > 0 {
|
|
newMsg := msg.Header.Get("status_msg")
|
|
statusMsg = &newMsg
|
|
}
|
|
// already checked, so no need to check error
|
|
p, _ := types.PresenceFromString(presence)
|
|
|
|
s.EmitPresence(ctx, userID, p, statusMsg, ts, fromSync)
|
|
return true
|
|
}
|
|
|
|
func (s *PresenceConsumer) EmitPresence(ctx context.Context, userID string, presence types.Presence, statusMsg *string, ts int, fromSync bool) {
|
|
pos, err := s.db.UpdatePresence(ctx, userID, presence, statusMsg, gomatrixserverlib.Timestamp(ts), fromSync)
|
|
if err != nil {
|
|
logrus.WithError(err).WithField("user", userID).WithField("presence", presence).Warn("failed to updated presence for user")
|
|
return
|
|
}
|
|
s.stream.Advance(pos)
|
|
s.notifier.OnNewPresence(types.StreamingToken{PresencePosition: pos}, userID)
|
|
}
|