mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-08 07:23: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
144 lines
4.4 KiB
Go
144 lines
4.4 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"
|
|
"encoding/json"
|
|
"strconv"
|
|
|
|
"github.com/matrix-org/dendrite/federationapi/queue"
|
|
"github.com/matrix-org/dendrite/federationapi/storage"
|
|
fedTypes "github.com/matrix-org/dendrite/federationapi/types"
|
|
"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/types"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"github.com/nats-io/nats.go"
|
|
log "github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// OutputReceiptConsumer consumes events that originate in the clientapi.
|
|
type OutputPresenceConsumer struct {
|
|
ctx context.Context
|
|
jetstream nats.JetStreamContext
|
|
durable string
|
|
db storage.Database
|
|
queues *queue.OutgoingQueues
|
|
ServerName gomatrixserverlib.ServerName
|
|
topic string
|
|
outboundPresenceEnabled bool
|
|
}
|
|
|
|
// NewOutputPresenceConsumer creates a new OutputPresenceConsumer. Call Start() to begin consuming events.
|
|
func NewOutputPresenceConsumer(
|
|
process *process.ProcessContext,
|
|
cfg *config.FederationAPI,
|
|
js nats.JetStreamContext,
|
|
queues *queue.OutgoingQueues,
|
|
store storage.Database,
|
|
) *OutputPresenceConsumer {
|
|
return &OutputPresenceConsumer{
|
|
ctx: process.Context(),
|
|
jetstream: js,
|
|
queues: queues,
|
|
db: store,
|
|
ServerName: cfg.Matrix.ServerName,
|
|
durable: cfg.Matrix.JetStream.Durable("FederationAPIPresenceConsumer"),
|
|
topic: cfg.Matrix.JetStream.Prefixed(jetstream.OutputPresenceEvent),
|
|
outboundPresenceEnabled: cfg.Matrix.Presence.EnableOutbound,
|
|
}
|
|
}
|
|
|
|
// Start consuming from the clientapi
|
|
func (t *OutputPresenceConsumer) Start() error {
|
|
if !t.outboundPresenceEnabled {
|
|
return nil
|
|
}
|
|
return jetstream.JetStreamConsumer(
|
|
t.ctx, t.jetstream, t.topic, t.durable, t.onMessage,
|
|
nats.DeliverAll(), nats.ManualAck(), nats.HeadersOnly(),
|
|
)
|
|
}
|
|
|
|
// onMessage is called in response to a message received on the presence
|
|
// events topic from the client api.
|
|
func (t *OutputPresenceConsumer) onMessage(ctx context.Context, msg *nats.Msg) bool {
|
|
// only send presence events which originated from us
|
|
userID := msg.Header.Get(jetstream.UserID)
|
|
_, serverName, err := gomatrixserverlib.SplitID('@', userID)
|
|
if err != nil {
|
|
log.WithError(err).WithField("user_id", userID).Error("failed to extract domain from receipt sender")
|
|
return true
|
|
}
|
|
if serverName != t.ServerName {
|
|
return true
|
|
}
|
|
|
|
presence := msg.Header.Get("presence")
|
|
|
|
ts, err := strconv.Atoi(msg.Header.Get("last_active_ts"))
|
|
if err != nil {
|
|
return true
|
|
}
|
|
|
|
joined, err := t.db.GetAllJoinedHosts(ctx)
|
|
if err != nil {
|
|
log.WithError(err).Error("failed to get joined hosts")
|
|
return true
|
|
}
|
|
if len(joined) == 0 {
|
|
return true
|
|
}
|
|
|
|
var statusMsg *string = nil
|
|
if data, ok := msg.Header["status_msg"]; ok && len(data) > 0 {
|
|
status := msg.Header.Get("status_msg")
|
|
statusMsg = &status
|
|
}
|
|
|
|
p := types.PresenceInternal{LastActiveTS: gomatrixserverlib.Timestamp(ts)}
|
|
|
|
content := fedTypes.Presence{
|
|
Push: []fedTypes.PresenceContent{
|
|
{
|
|
CurrentlyActive: p.CurrentlyActive(),
|
|
LastActiveAgo: p.LastActiveAgo(),
|
|
Presence: presence,
|
|
StatusMsg: statusMsg,
|
|
UserID: userID,
|
|
},
|
|
},
|
|
}
|
|
|
|
edu := &gomatrixserverlib.EDU{
|
|
Type: gomatrixserverlib.MPresence,
|
|
Origin: string(t.ServerName),
|
|
}
|
|
if edu.Content, err = json.Marshal(content); err != nil {
|
|
log.WithError(err).Error("failed to marshal EDU JSON")
|
|
return true
|
|
}
|
|
|
|
log.Tracef("sending presence EDU to %d servers", len(joined))
|
|
if err = t.queues.SendEDU(edu, t.ServerName, joined); err != nil {
|
|
log.WithError(err).Error("failed to send EDU")
|
|
return false
|
|
}
|
|
|
|
return true
|
|
}
|