mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-10 06:53:00 +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 commit f5a4e4a339b6f94ec215778dca22204adaa893d1. * 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 commit 368675283fc44501f227639811bdb16dd5deef8c. * 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: commit 13f9028e7a63662759ce7c55504a9d2423058668 Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 15:47:14 2022 +0000 Do the same for leave commit e6be7f05c349fafbdddfe818337a17a60c867be1 Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 15:33:42 2022 +0000 Enforce state key matches sender commit 85ede6d64bf10ce9b91cdd6d80f87350ee55242f Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 14:07:04 2022 +0000 Fix panics on closed channel sends commit 9755494a98bed62450f8001d8128e40481d27e15 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 commit 3bb4f87b5dd56882febb4db5621db484c8789b7c 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 commit 368675283fc44501f227639811bdb16dd5deef8c. commit fe2673ed7be9559eaca134424e403a4faca100b0 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 commit 368675283fc44501f227639811bdb16dd5deef8c 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 commit b028dfc08577bcf52e6cb498026e15fa5d46d07c 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>
119 lines
3.9 KiB
Go
119 lines
3.9 KiB
Go
// Copyright 2021 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"
|
|
|
|
"github.com/matrix-org/dendrite/internal"
|
|
"github.com/matrix-org/dendrite/keyserver/api"
|
|
"github.com/matrix-org/dendrite/keyserver/storage"
|
|
"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/gomatrixserverlib"
|
|
"github.com/sirupsen/logrus"
|
|
|
|
"github.com/Shopify/sarama"
|
|
)
|
|
|
|
type OutputCrossSigningKeyUpdateConsumer struct {
|
|
eduServerConsumer *internal.ContinualConsumer
|
|
keyDB storage.Database
|
|
keyAPI api.KeyInternalAPI
|
|
serverName string
|
|
}
|
|
|
|
func NewOutputCrossSigningKeyUpdateConsumer(
|
|
process *process.ProcessContext,
|
|
cfg *config.Dendrite,
|
|
kafkaConsumer sarama.Consumer,
|
|
keyDB storage.Database,
|
|
keyAPI api.KeyInternalAPI,
|
|
) *OutputCrossSigningKeyUpdateConsumer {
|
|
// The keyserver both produces and consumes on the TopicOutputKeyChangeEvent
|
|
// topic. We will only produce events where the UserID matches our server name,
|
|
// and we will only consume events where the UserID does NOT match our server
|
|
// name (because the update came from a remote server).
|
|
consumer := internal.ContinualConsumer{
|
|
Process: process,
|
|
ComponentName: "keyserver/keyserver",
|
|
Topic: cfg.Global.JetStream.TopicFor(jetstream.OutputKeyChangeEvent),
|
|
Consumer: kafkaConsumer,
|
|
PartitionStore: keyDB,
|
|
}
|
|
s := &OutputCrossSigningKeyUpdateConsumer{
|
|
eduServerConsumer: &consumer,
|
|
keyDB: keyDB,
|
|
keyAPI: keyAPI,
|
|
serverName: string(cfg.Global.ServerName),
|
|
}
|
|
consumer.ProcessMessage = s.onMessage
|
|
|
|
return s
|
|
}
|
|
|
|
func (s *OutputCrossSigningKeyUpdateConsumer) Start() error {
|
|
return s.eduServerConsumer.Start()
|
|
}
|
|
|
|
// onMessage is called in response to a message received on the
|
|
// key change events topic from the key server.
|
|
func (t *OutputCrossSigningKeyUpdateConsumer) onMessage(msg *sarama.ConsumerMessage) error {
|
|
var m api.DeviceMessage
|
|
if err := json.Unmarshal(msg.Value, &m); err != nil {
|
|
logrus.WithError(err).Errorf("failed to read device message from key change topic")
|
|
return nil
|
|
}
|
|
if m.OutputCrossSigningKeyUpdate == nil {
|
|
// This probably shouldn't happen but stops us from panicking if we come
|
|
// across an update that doesn't satisfy either types.
|
|
return nil
|
|
}
|
|
switch m.Type {
|
|
case api.TypeCrossSigningUpdate:
|
|
return t.onCrossSigningMessage(m)
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func (s *OutputCrossSigningKeyUpdateConsumer) onCrossSigningMessage(m api.DeviceMessage) error {
|
|
output := m.CrossSigningKeyUpdate
|
|
_, host, err := gomatrixserverlib.SplitID('@', output.UserID)
|
|
if err != nil {
|
|
logrus.WithError(err).Errorf("eduserver output log: user ID parse failure")
|
|
return nil
|
|
}
|
|
if host == gomatrixserverlib.ServerName(s.serverName) {
|
|
// Ignore any messages that contain information about our own users, as
|
|
// they already originated from this server.
|
|
return nil
|
|
}
|
|
uploadReq := &api.PerformUploadDeviceKeysRequest{
|
|
UserID: output.UserID,
|
|
}
|
|
if output.MasterKey != nil {
|
|
uploadReq.MasterKey = *output.MasterKey
|
|
}
|
|
if output.SelfSigningKey != nil {
|
|
uploadReq.SelfSigningKey = *output.SelfSigningKey
|
|
}
|
|
uploadRes := &api.PerformUploadDeviceKeysResponse{}
|
|
s.keyAPI.PerformUploadDeviceKeys(context.TODO(), uploadReq, uploadRes)
|
|
return uploadRes.Error
|
|
}
|