mirror of
https://github.com/matrix-org/dendrite.git
synced 2024-11-23 06:41:56 -06: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>
142 lines
5 KiB
Go
142 lines
5 KiB
Go
// Copyright 2018 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 appservice
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"net/http"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/gorilla/mux"
|
|
appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
|
|
"github.com/matrix-org/dendrite/appservice/consumers"
|
|
"github.com/matrix-org/dendrite/appservice/inthttp"
|
|
"github.com/matrix-org/dendrite/appservice/query"
|
|
"github.com/matrix-org/dendrite/appservice/storage"
|
|
"github.com/matrix-org/dendrite/appservice/types"
|
|
"github.com/matrix-org/dendrite/appservice/workers"
|
|
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"
|
|
)
|
|
|
|
// AddInternalRoutes registers HTTP handlers for internal API calls
|
|
func AddInternalRoutes(router *mux.Router, queryAPI appserviceAPI.AppServiceQueryAPI) {
|
|
inthttp.AddRoutes(queryAPI, router)
|
|
}
|
|
|
|
// 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,
|
|
userAPI userapi.UserInternalAPI,
|
|
rsAPI roomserverAPI.RoomserverInternalAPI,
|
|
) appserviceAPI.AppServiceQueryAPI {
|
|
client := &http.Client{
|
|
Timeout: time.Second * 30,
|
|
Transport: &http.Transport{
|
|
DisableKeepAlives: true,
|
|
TLSClientConfig: &tls.Config{
|
|
InsecureSkipVerify: base.Cfg.AppServiceAPI.DisableTLSValidation,
|
|
},
|
|
},
|
|
}
|
|
js, _, _ := jetstream.Prepare(&base.Cfg.Global.JetStream)
|
|
|
|
// Create a connection to the appservice postgres DB
|
|
appserviceDB, err := storage.NewDatabase(&base.Cfg.AppServiceAPI.Database)
|
|
if err != nil {
|
|
logrus.WithError(err).Panicf("failed to connect to appservice db")
|
|
}
|
|
|
|
// Wrap application services in a type that relates the application service and
|
|
// a sync.Cond object that can be used to notify workers when there are new
|
|
// events to be sent out.
|
|
workerStates := make([]types.ApplicationServiceWorkerState, len(base.Cfg.Derived.ApplicationServices))
|
|
for i, appservice := range base.Cfg.Derived.ApplicationServices {
|
|
m := sync.Mutex{}
|
|
ws := types.ApplicationServiceWorkerState{
|
|
AppService: appservice,
|
|
Cond: sync.NewCond(&m),
|
|
}
|
|
workerStates[i] = ws
|
|
|
|
// Create bot account for this AS if it doesn't already exist
|
|
if err = generateAppServiceAccount(userAPI, appservice); err != nil {
|
|
logrus.WithFields(logrus.Fields{
|
|
"appservice": appservice.ID,
|
|
}).WithError(err).Panicf("failed to generate bot account for appservice")
|
|
}
|
|
}
|
|
|
|
// Create appserivce query API with an HTTP client that will be used for all
|
|
// outbound and inbound requests (inbound only for the internal API)
|
|
appserviceQueryAPI := &query.AppServiceQueryAPI{
|
|
HTTPClient: client,
|
|
Cfg: base.Cfg,
|
|
}
|
|
|
|
// Only consume if we actually have ASes to track, else we'll just chew cycles needlessly.
|
|
// We can't add ASes at runtime so this is safe to do.
|
|
if len(workerStates) > 0 {
|
|
consumer := consumers.NewOutputRoomEventConsumer(
|
|
base.ProcessContext, base.Cfg, js, appserviceDB,
|
|
rsAPI, workerStates,
|
|
)
|
|
if err := consumer.Start(); err != nil {
|
|
logrus.WithError(err).Panicf("failed to start appservice roomserver consumer")
|
|
}
|
|
}
|
|
|
|
// Create application service transaction workers
|
|
if err := workers.SetupTransactionWorkers(client, appserviceDB, workerStates); err != nil {
|
|
logrus.WithError(err).Panicf("failed to start app service transaction workers")
|
|
}
|
|
return appserviceQueryAPI
|
|
}
|
|
|
|
// generateAppServiceAccounts creates a dummy account based off the
|
|
// `sender_localpart` field of each application service if it doesn't
|
|
// exist already
|
|
func generateAppServiceAccount(
|
|
userAPI userapi.UserInternalAPI,
|
|
as config.ApplicationService,
|
|
) error {
|
|
var accRes userapi.PerformAccountCreationResponse
|
|
err := userAPI.PerformAccountCreation(context.Background(), &userapi.PerformAccountCreationRequest{
|
|
AccountType: userapi.AccountTypeUser,
|
|
Localpart: as.SenderLocalpart,
|
|
AppServiceID: as.ID,
|
|
OnConflict: userapi.ConflictUpdate,
|
|
}, &accRes)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
var devRes userapi.PerformDeviceCreationResponse
|
|
err = userAPI.PerformDeviceCreation(context.Background(), &userapi.PerformDeviceCreationRequest{
|
|
Localpart: as.SenderLocalpart,
|
|
AccessToken: as.ASToken,
|
|
DeviceID: &as.SenderLocalpart,
|
|
DeviceDisplayName: &as.SenderLocalpart,
|
|
NoDeviceListUpdate: true,
|
|
}, &devRes)
|
|
return err
|
|
}
|