mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-25 21:21:35 +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>
208 lines
6.7 KiB
Go
208 lines
6.7 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 test
|
|
|
|
import (
|
|
"crypto/rand"
|
|
"crypto/rsa"
|
|
"crypto/x509"
|
|
"encoding/base64"
|
|
"encoding/pem"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"math/big"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"gopkg.in/yaml.v2"
|
|
)
|
|
|
|
const (
|
|
// ConfigFile is the name of the config file for a server.
|
|
ConfigFile = "dendrite.yaml"
|
|
// ServerKeyFile is the name of the file holding the matrix server private key.
|
|
ServerKeyFile = "server_key.pem"
|
|
// TLSCertFile is the name of the file holding the TLS certificate used for federation.
|
|
TLSCertFile = "tls_cert.pem"
|
|
// TLSKeyFile is the name of the file holding the TLS key used for federation.
|
|
TLSKeyFile = "tls_key.pem"
|
|
// MediaDir is the name of the directory used to store media.
|
|
MediaDir = "media"
|
|
)
|
|
|
|
// MakeConfig makes a config suitable for running integration tests.
|
|
// Generates new matrix and TLS keys for the server.
|
|
func MakeConfig(configDir, kafkaURI, database, host string, startPort int) (*config.Dendrite, int, error) {
|
|
var cfg config.Dendrite
|
|
cfg.Defaults(true)
|
|
|
|
port := startPort
|
|
assignAddress := func() config.HTTPAddress {
|
|
result := config.HTTPAddress(fmt.Sprintf("http://%s:%d", host, port))
|
|
port++
|
|
return result
|
|
}
|
|
|
|
serverKeyPath := filepath.Join(configDir, ServerKeyFile)
|
|
tlsCertPath := filepath.Join(configDir, TLSKeyFile)
|
|
tlsKeyPath := filepath.Join(configDir, TLSCertFile)
|
|
mediaBasePath := filepath.Join(configDir, MediaDir)
|
|
|
|
if err := NewMatrixKey(serverKeyPath); err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
if err := NewTLSKey(tlsKeyPath, tlsCertPath); err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
cfg.Version = config.Version
|
|
|
|
cfg.Global.ServerName = gomatrixserverlib.ServerName(assignAddress())
|
|
cfg.Global.PrivateKeyPath = config.Path(serverKeyPath)
|
|
|
|
cfg.FederationAPI.FederationCertificatePaths = []config.Path{config.Path(tlsCertPath)}
|
|
|
|
cfg.MediaAPI.BasePath = config.Path(mediaBasePath)
|
|
|
|
cfg.Global.JetStream.Addresses = []string{kafkaURI}
|
|
|
|
// TODO: Use different databases for the different schemas.
|
|
// Using the same database for every schema currently works because
|
|
// the table names are globally unique. But we might not want to
|
|
// rely on that in the future.
|
|
cfg.AppServiceAPI.Database.ConnectionString = config.DataSource(database)
|
|
cfg.FederationAPI.Database.ConnectionString = config.DataSource(database)
|
|
cfg.KeyServer.Database.ConnectionString = config.DataSource(database)
|
|
cfg.MediaAPI.Database.ConnectionString = config.DataSource(database)
|
|
cfg.RoomServer.Database.ConnectionString = config.DataSource(database)
|
|
cfg.SyncAPI.Database.ConnectionString = config.DataSource(database)
|
|
cfg.UserAPI.AccountDatabase.ConnectionString = config.DataSource(database)
|
|
cfg.UserAPI.DeviceDatabase.ConnectionString = config.DataSource(database)
|
|
|
|
cfg.AppServiceAPI.InternalAPI.Listen = assignAddress()
|
|
cfg.EDUServer.InternalAPI.Listen = assignAddress()
|
|
cfg.FederationAPI.InternalAPI.Listen = assignAddress()
|
|
cfg.KeyServer.InternalAPI.Listen = assignAddress()
|
|
cfg.MediaAPI.InternalAPI.Listen = assignAddress()
|
|
cfg.RoomServer.InternalAPI.Listen = assignAddress()
|
|
cfg.SyncAPI.InternalAPI.Listen = assignAddress()
|
|
cfg.UserAPI.InternalAPI.Listen = assignAddress()
|
|
|
|
cfg.AppServiceAPI.InternalAPI.Connect = cfg.AppServiceAPI.InternalAPI.Listen
|
|
cfg.EDUServer.InternalAPI.Connect = cfg.EDUServer.InternalAPI.Listen
|
|
cfg.FederationAPI.InternalAPI.Connect = cfg.FederationAPI.InternalAPI.Listen
|
|
cfg.KeyServer.InternalAPI.Connect = cfg.KeyServer.InternalAPI.Listen
|
|
cfg.MediaAPI.InternalAPI.Connect = cfg.MediaAPI.InternalAPI.Listen
|
|
cfg.RoomServer.InternalAPI.Connect = cfg.RoomServer.InternalAPI.Listen
|
|
cfg.SyncAPI.InternalAPI.Connect = cfg.SyncAPI.InternalAPI.Listen
|
|
cfg.UserAPI.InternalAPI.Connect = cfg.UserAPI.InternalAPI.Listen
|
|
|
|
return &cfg, port, nil
|
|
}
|
|
|
|
// WriteConfig writes the config file to the directory.
|
|
func WriteConfig(cfg *config.Dendrite, configDir string) error {
|
|
data, err := yaml.Marshal(cfg)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return ioutil.WriteFile(filepath.Join(configDir, ConfigFile), data, 0666)
|
|
}
|
|
|
|
// NewMatrixKey generates a new ed25519 matrix server key and writes it to a file.
|
|
func NewMatrixKey(matrixKeyPath string) (err error) {
|
|
var data [35]byte
|
|
_, err = rand.Read(data[:])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
keyOut, err := os.OpenFile(matrixKeyPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
defer (func() {
|
|
err = keyOut.Close()
|
|
})()
|
|
|
|
keyID := base64.RawURLEncoding.EncodeToString(data[:])
|
|
keyID = strings.ReplaceAll(keyID, "-", "")
|
|
keyID = strings.ReplaceAll(keyID, "_", "")
|
|
|
|
err = pem.Encode(keyOut, &pem.Block{
|
|
Type: "MATRIX PRIVATE KEY",
|
|
Headers: map[string]string{
|
|
"Key-ID": fmt.Sprintf("ed25519:%s", keyID[:6]),
|
|
},
|
|
Bytes: data[3:],
|
|
})
|
|
return err
|
|
}
|
|
|
|
const certificateDuration = time.Hour * 24 * 365 * 10
|
|
|
|
// NewTLSKey generates a new RSA TLS key and certificate and writes it to a file.
|
|
func NewTLSKey(tlsKeyPath, tlsCertPath string) error {
|
|
priv, err := rsa.GenerateKey(rand.Reader, 4096)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
notBefore := time.Now()
|
|
notAfter := notBefore.Add(certificateDuration)
|
|
serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
|
|
serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
template := x509.Certificate{
|
|
SerialNumber: serialNumber,
|
|
NotBefore: notBefore,
|
|
NotAfter: notAfter,
|
|
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
|
|
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
|
|
BasicConstraintsValid: true,
|
|
}
|
|
derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
certOut, err := os.Create(tlsCertPath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer certOut.Close() // nolint: errcheck
|
|
if err = pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes}); err != nil {
|
|
return err
|
|
}
|
|
|
|
keyOut, err := os.OpenFile(tlsKeyPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer keyOut.Close() // nolint: errcheck
|
|
err = pem.Encode(keyOut, &pem.Block{
|
|
Type: "RSA PRIVATE KEY",
|
|
Bytes: x509.MarshalPKCS1PrivateKey(priv),
|
|
})
|
|
return err
|
|
}
|