mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-22 19:51:39 +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>
237 lines
8.0 KiB
Go
237 lines
8.0 KiB
Go
// Copyright 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 main
|
|
|
|
import (
|
|
"crypto/ed25519"
|
|
"flag"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/gorilla/mux"
|
|
gostream "github.com/libp2p/go-libp2p-gostream"
|
|
p2phttp "github.com/libp2p/go-libp2p-http"
|
|
p2pdisc "github.com/libp2p/go-libp2p/p2p/discovery"
|
|
"github.com/matrix-org/dendrite/appservice"
|
|
"github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/embed"
|
|
"github.com/matrix-org/dendrite/eduserver"
|
|
"github.com/matrix-org/dendrite/federationapi"
|
|
"github.com/matrix-org/dendrite/internal/httputil"
|
|
"github.com/matrix-org/dendrite/keyserver"
|
|
"github.com/matrix-org/dendrite/roomserver"
|
|
"github.com/matrix-org/dendrite/setup"
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
"github.com/matrix-org/dendrite/setup/mscs"
|
|
"github.com/matrix-org/dendrite/userapi"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
|
|
"github.com/matrix-org/dendrite/eduserver/cache"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
|
|
_ "github.com/mattn/go-sqlite3"
|
|
)
|
|
|
|
func createKeyDB(
|
|
base *P2PDendrite,
|
|
db *gomatrixserverlib.KeyRing,
|
|
) {
|
|
mdns := mDNSListener{
|
|
host: base.LibP2P,
|
|
keydb: db,
|
|
}
|
|
serv, err := p2pdisc.NewMdnsService(
|
|
base.LibP2PContext,
|
|
base.LibP2P,
|
|
time.Second*10,
|
|
"_matrix-dendrite-p2p._tcp",
|
|
)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
serv.RegisterNotifee(&mdns)
|
|
}
|
|
|
|
func createFederationClient(
|
|
base *P2PDendrite,
|
|
) *gomatrixserverlib.FederationClient {
|
|
fmt.Println("Running in libp2p federation mode")
|
|
fmt.Println("Warning: Federation with non-libp2p homeservers will not work in this mode yet!")
|
|
tr := &http.Transport{}
|
|
tr.RegisterProtocol(
|
|
"matrix",
|
|
p2phttp.NewTransport(base.LibP2P, p2phttp.ProtocolOption("/matrix")),
|
|
)
|
|
return gomatrixserverlib.NewFederationClient(
|
|
base.Base.Cfg.Global.ServerName, base.Base.Cfg.Global.KeyID,
|
|
base.Base.Cfg.Global.PrivateKey,
|
|
gomatrixserverlib.WithTransport(tr),
|
|
)
|
|
}
|
|
|
|
func createClient(
|
|
base *P2PDendrite,
|
|
) *gomatrixserverlib.Client {
|
|
tr := &http.Transport{}
|
|
tr.RegisterProtocol(
|
|
"matrix",
|
|
p2phttp.NewTransport(base.LibP2P, p2phttp.ProtocolOption("/matrix")),
|
|
)
|
|
return gomatrixserverlib.NewClient(
|
|
gomatrixserverlib.WithTransport(tr),
|
|
)
|
|
}
|
|
|
|
func main() {
|
|
instanceName := flag.String("name", "dendrite-p2p", "the name of this P2P demo instance")
|
|
instancePort := flag.Int("port", 8080, "the port that the client API will listen on")
|
|
flag.Parse()
|
|
|
|
filename := fmt.Sprintf("%s-private.key", *instanceName)
|
|
_, err := os.Stat(filename)
|
|
var privKey ed25519.PrivateKey
|
|
if os.IsNotExist(err) {
|
|
_, privKey, _ = ed25519.GenerateKey(nil)
|
|
if err = ioutil.WriteFile(filename, privKey, 0600); err != nil {
|
|
fmt.Printf("Couldn't write private key to file '%s': %s\n", filename, err)
|
|
}
|
|
} else {
|
|
privKey, err = ioutil.ReadFile(filename)
|
|
if err != nil {
|
|
fmt.Printf("Couldn't read private key from file '%s': %s\n", filename, err)
|
|
_, privKey, _ = ed25519.GenerateKey(nil)
|
|
}
|
|
}
|
|
|
|
cfg := config.Dendrite{}
|
|
cfg.Defaults(true)
|
|
cfg.Global.ServerName = "p2p"
|
|
cfg.Global.PrivateKey = privKey
|
|
cfg.Global.KeyID = gomatrixserverlib.KeyID(fmt.Sprintf("ed25519:%s", *instanceName))
|
|
cfg.FederationAPI.FederationMaxRetries = 6
|
|
cfg.Global.JetStream.StoragePath = config.Path(fmt.Sprintf("%s/", *instanceName))
|
|
cfg.UserAPI.AccountDatabase.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-account.db", *instanceName))
|
|
cfg.UserAPI.DeviceDatabase.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-device.db", *instanceName))
|
|
cfg.MediaAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-mediaapi.db", *instanceName))
|
|
cfg.SyncAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-syncapi.db", *instanceName))
|
|
cfg.RoomServer.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-roomserver.db", *instanceName))
|
|
cfg.FederationAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-federationapi.db", *instanceName))
|
|
cfg.AppServiceAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-appservice.db", *instanceName))
|
|
cfg.KeyServer.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-e2ekey.db", *instanceName))
|
|
cfg.MSCs.MSCs = []string{"msc2836"}
|
|
cfg.MSCs.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-mscs.db", *instanceName))
|
|
if err = cfg.Derive(); err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
base := NewP2PDendrite(&cfg, "Monolith")
|
|
defer base.Base.Close() // nolint: errcheck
|
|
|
|
accountDB := base.Base.CreateAccountsDB()
|
|
federation := createFederationClient(base)
|
|
keyAPI := keyserver.NewInternalAPI(&base.Base, &base.Base.Cfg.KeyServer, federation)
|
|
userAPI := userapi.NewInternalAPI(accountDB, &cfg.UserAPI, nil, keyAPI)
|
|
keyAPI.SetUserAPI(userAPI)
|
|
|
|
rsAPI := roomserver.NewInternalAPI(
|
|
&base.Base,
|
|
)
|
|
eduInputAPI := eduserver.NewInternalAPI(
|
|
&base.Base, cache.New(), userAPI,
|
|
)
|
|
asAPI := appservice.NewInternalAPI(&base.Base, userAPI, rsAPI)
|
|
rsAPI.SetAppserviceAPI(asAPI)
|
|
fsAPI := federationapi.NewInternalAPI(
|
|
&base.Base, federation, rsAPI, base.Base.Caches, nil, true,
|
|
)
|
|
keyRing := fsAPI.KeyRing()
|
|
rsAPI.SetFederationAPI(fsAPI, keyRing)
|
|
provider := newPublicRoomsProvider(base.LibP2PPubsub, rsAPI)
|
|
err = provider.Start()
|
|
if err != nil {
|
|
panic("failed to create new public rooms provider: " + err.Error())
|
|
}
|
|
|
|
createKeyDB(
|
|
base, keyRing,
|
|
)
|
|
|
|
monolith := setup.Monolith{
|
|
Config: base.Base.Cfg,
|
|
AccountDB: accountDB,
|
|
Client: createClient(base),
|
|
FedClient: federation,
|
|
KeyRing: keyRing,
|
|
|
|
AppserviceAPI: asAPI,
|
|
EDUInternalAPI: eduInputAPI,
|
|
FederationAPI: fsAPI,
|
|
RoomserverAPI: rsAPI,
|
|
UserAPI: userAPI,
|
|
KeyAPI: keyAPI,
|
|
ExtPublicRoomsProvider: provider,
|
|
}
|
|
monolith.AddAllPublicRoutes(
|
|
base.Base.ProcessContext,
|
|
base.Base.PublicClientAPIMux,
|
|
base.Base.PublicFederationAPIMux,
|
|
base.Base.PublicKeyAPIMux,
|
|
base.Base.PublicWellKnownAPIMux,
|
|
base.Base.PublicMediaAPIMux,
|
|
base.Base.SynapseAdminMux,
|
|
)
|
|
if err := mscs.Enable(&base.Base, &monolith); err != nil {
|
|
logrus.WithError(err).Fatalf("Failed to enable MSCs")
|
|
}
|
|
|
|
httpRouter := mux.NewRouter().SkipClean(true).UseEncodedPath()
|
|
httpRouter.PathPrefix(httputil.InternalPathPrefix).Handler(base.Base.InternalAPIMux)
|
|
httpRouter.PathPrefix(httputil.PublicClientPathPrefix).Handler(base.Base.PublicClientAPIMux)
|
|
httpRouter.PathPrefix(httputil.PublicMediaPathPrefix).Handler(base.Base.PublicMediaAPIMux)
|
|
embed.Embed(httpRouter, *instancePort, "Yggdrasil Demo")
|
|
|
|
libp2pRouter := mux.NewRouter().SkipClean(true).UseEncodedPath()
|
|
libp2pRouter.PathPrefix(httputil.PublicFederationPathPrefix).Handler(base.Base.PublicFederationAPIMux)
|
|
libp2pRouter.PathPrefix(httputil.PublicKeyPathPrefix).Handler(base.Base.PublicKeyAPIMux)
|
|
libp2pRouter.PathPrefix(httputil.PublicMediaPathPrefix).Handler(base.Base.PublicMediaAPIMux)
|
|
|
|
// Expose the matrix APIs directly rather than putting them under a /api path.
|
|
go func() {
|
|
httpBindAddr := fmt.Sprintf(":%d", *instancePort)
|
|
logrus.Info("Listening on ", httpBindAddr)
|
|
logrus.Fatal(http.ListenAndServe(httpBindAddr, httpRouter))
|
|
}()
|
|
// Expose the matrix APIs also via libp2p
|
|
if base.LibP2P != nil {
|
|
go func() {
|
|
logrus.Info("Listening on libp2p host ID ", base.LibP2P.ID())
|
|
listener, err := gostream.Listen(base.LibP2P, "/matrix")
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
defer func() {
|
|
logrus.Fatal(listener.Close())
|
|
}()
|
|
logrus.Fatal(http.Serve(listener, libp2pRouter))
|
|
}()
|
|
}
|
|
|
|
// We want to block forever to let the HTTP and HTTPS handler serve the APIs
|
|
base.Base.WaitForShutdown()
|
|
}
|