mirror of
https://github.com/matrix-org/dendrite
synced 2024-12-15 12:53:43 +01: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>
130 lines
4.6 KiB
Go
130 lines
4.6 KiB
Go
// Copyright 2017 Vector Creations Ltd
|
|
//
|
|
// 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 federationapi
|
|
|
|
import (
|
|
"github.com/gorilla/mux"
|
|
eduserverAPI "github.com/matrix-org/dendrite/eduserver/api"
|
|
"github.com/matrix-org/dendrite/federationapi/api"
|
|
federationAPI "github.com/matrix-org/dendrite/federationapi/api"
|
|
"github.com/matrix-org/dendrite/federationapi/consumers"
|
|
"github.com/matrix-org/dendrite/federationapi/internal"
|
|
"github.com/matrix-org/dendrite/federationapi/inthttp"
|
|
"github.com/matrix-org/dendrite/federationapi/queue"
|
|
"github.com/matrix-org/dendrite/federationapi/statistics"
|
|
"github.com/matrix-org/dendrite/federationapi/storage"
|
|
"github.com/matrix-org/dendrite/internal/caching"
|
|
keyserverAPI "github.com/matrix-org/dendrite/keyserver/api"
|
|
roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
|
|
"github.com/matrix-org/dendrite/setup/base"
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
"github.com/matrix-org/dendrite/setup/jetstream"
|
|
userapi "github.com/matrix-org/dendrite/userapi/api"
|
|
"github.com/sirupsen/logrus"
|
|
|
|
"github.com/matrix-org/dendrite/federationapi/routing"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
// AddInternalRoutes registers HTTP handlers for the internal API. Invokes functions
|
|
// on the given input API.
|
|
func AddInternalRoutes(router *mux.Router, intAPI api.FederationInternalAPI) {
|
|
inthttp.AddRoutes(intAPI, router)
|
|
}
|
|
|
|
// AddPublicRoutes sets up and registers HTTP handlers on the base API muxes for the FederationAPI component.
|
|
func AddPublicRoutes(
|
|
fedRouter, keyRouter, wellKnownRouter *mux.Router,
|
|
cfg *config.FederationAPI,
|
|
userAPI userapi.UserInternalAPI,
|
|
federation *gomatrixserverlib.FederationClient,
|
|
keyRing gomatrixserverlib.JSONVerifier,
|
|
rsAPI roomserverAPI.RoomserverInternalAPI,
|
|
federationAPI federationAPI.FederationInternalAPI,
|
|
eduAPI eduserverAPI.EDUServerInputAPI,
|
|
keyAPI keyserverAPI.KeyInternalAPI,
|
|
mscCfg *config.MSCs,
|
|
servers federationAPI.ServersInRoomProvider,
|
|
) {
|
|
routing.Setup(
|
|
fedRouter, keyRouter, wellKnownRouter, cfg, rsAPI,
|
|
eduAPI, federationAPI, keyRing,
|
|
federation, userAPI, keyAPI, mscCfg,
|
|
servers,
|
|
)
|
|
}
|
|
|
|
// NewInternalAPI returns a concerete implementation of the internal API. Callers
|
|
// can call functions directly on the returned API or via an HTTP interface using AddInternalRoutes.
|
|
func NewInternalAPI(
|
|
base *base.BaseDendrite,
|
|
federation *gomatrixserverlib.FederationClient,
|
|
rsAPI roomserverAPI.RoomserverInternalAPI,
|
|
caches *caching.Caches,
|
|
keyRing *gomatrixserverlib.KeyRing,
|
|
resetBlacklist bool,
|
|
) api.FederationInternalAPI {
|
|
cfg := &base.Cfg.FederationAPI
|
|
|
|
federationDB, err := storage.NewDatabase(&cfg.Database, base.Caches)
|
|
if err != nil {
|
|
logrus.WithError(err).Panic("failed to connect to federation sender db")
|
|
}
|
|
|
|
if resetBlacklist {
|
|
_ = federationDB.RemoveAllServersFromBlacklist()
|
|
}
|
|
|
|
stats := &statistics.Statistics{
|
|
DB: federationDB,
|
|
FailuresUntilBlacklist: cfg.FederationMaxRetries,
|
|
}
|
|
|
|
js, consumer, _ := jetstream.Prepare(&cfg.Matrix.JetStream)
|
|
|
|
queues := queue.NewOutgoingQueues(
|
|
federationDB, base.ProcessContext,
|
|
cfg.Matrix.DisableFederation,
|
|
cfg.Matrix.ServerName, federation, rsAPI, stats,
|
|
&queue.SigningInfo{
|
|
KeyID: cfg.Matrix.KeyID,
|
|
PrivateKey: cfg.Matrix.PrivateKey,
|
|
ServerName: cfg.Matrix.ServerName,
|
|
},
|
|
)
|
|
|
|
rsConsumer := consumers.NewOutputRoomEventConsumer(
|
|
base.ProcessContext, cfg, js, queues,
|
|
federationDB, rsAPI,
|
|
)
|
|
if err = rsConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panic("failed to start room server consumer")
|
|
}
|
|
|
|
tsConsumer := consumers.NewOutputEDUConsumer(
|
|
base.ProcessContext, cfg, js, queues, federationDB,
|
|
)
|
|
if err := tsConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panic("failed to start typing server consumer")
|
|
}
|
|
keyConsumer := consumers.NewKeyChangeConsumer(
|
|
base.ProcessContext, &base.Cfg.KeyServer, consumer, queues, federationDB, rsAPI,
|
|
)
|
|
if err := keyConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panic("failed to start key server consumer")
|
|
}
|
|
|
|
return internal.NewFederationInternalAPI(federationDB, cfg, rsAPI, federation, stats, caches, queues, keyRing)
|
|
}
|