mirror of
https://github.com/hoernschen/dendrite.git
synced 2024-12-26 15:08:28 +00:00
f05ce478f0
* Add Pushserver component with Pushers API Co-authored-by: Tommie Gannert <tommie@gannert.se> Co-authored-by: Dan Peleg <dan@globekeeper.com> * Wire Pushserver component Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com> * Add PushGatewayClient. The full event format is required for Sytest. * Add a pushrules module. * Change user API account creation to use the new pushrules module's defaults. Introduces "scope" as required by client API, and some small field tweaks to make some 61push Sytests pass. * Add push rules query/put API in Pushserver. This manipulates account data over User API, and fires sync messages for changes. Those sync messages should, according to an existing TODO in clientapi, be moved to userapi. Forks clientapi/producers/syncapi.go to pushserver/ for later extension. * Add clientapi routes for push rules to Pushserver. A cleanup would be to move more of the name-splitting logic into pushrules.go, to depollute routing.go. * Output rooms.join.unread_notifications in /sync. This is the read-side. Pushserver will be the write-side. * Implement pushserver/storage for notifications. * Use PushGatewayClient and the pushrules module in Pushserver's room consumer. * Use one goroutine per user to avoid locking up the entire server for one bad push gateway. * Split pushing by format. * Send one device per push. Sytest does not support coalescing multiple devices into one push. Matches Synapse. Either we change Sytest, or remove the group-by-url-and-format logic. * Write OutputNotificationData from push server. Sync API is already the consumer. * Implement read receipt consumers in Pushserver. Supports m.read and m.fully_read receipts. * Add clientapi route for /unstable/notifications. * Rename to UpsertPusher for clarity and handle pusher update * Fix linter errors * Ignore body.Close() error check * Fix push server internal http wiring * Add 40 newly passing 61push tests to whitelist * Add next 12 newly passing 61push tests to whitelist * Send notification data before notifying users in EDU server consumer * NATS JetStream * Goodbye sarama * Fix `NewStreamTokenFromString` * Consume on the correct topic for the roomserver * Don't panic, NAK instead * Move push notifications into the User API * Don't set null values since that apparently causes Element upsetti * Also set omitempty on conditions * Fix bug so that we don't override the push rules unnecessarily * Tweak defaults * Update defaults * More tweaks * Move `/notifications` onto `r0`/`v3` mux * User API will consume events and read/fully read markers from the sync API with stream positions, instead of consuming directly Co-authored-by: Piotr Kozimor <p1996k@gmail.com> Co-authored-by: Tommie Gannert <tommie@gannert.se> Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
90 lines
3.4 KiB
Go
90 lines
3.4 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 userapi
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/gorilla/mux"
|
|
"github.com/matrix-org/dendrite/internal/pushgateway"
|
|
keyapi "github.com/matrix-org/dendrite/keyserver/api"
|
|
rsapi "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"
|
|
"github.com/matrix-org/dendrite/userapi/api"
|
|
"github.com/matrix-org/dendrite/userapi/consumers"
|
|
"github.com/matrix-org/dendrite/userapi/internal"
|
|
"github.com/matrix-org/dendrite/userapi/inthttp"
|
|
"github.com/matrix-org/dendrite/userapi/producers"
|
|
"github.com/matrix-org/dendrite/userapi/storage"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// AddInternalRoutes registers HTTP handlers for the internal API. Invokes functions
|
|
// on the given input API.
|
|
func AddInternalRoutes(router *mux.Router, intAPI api.UserInternalAPI) {
|
|
inthttp.AddRoutes(router, intAPI)
|
|
}
|
|
|
|
// 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, db storage.Database, cfg *config.UserAPI,
|
|
appServices []config.ApplicationService, keyAPI keyapi.KeyInternalAPI,
|
|
rsAPI rsapi.RoomserverInternalAPI, pgClient pushgateway.Client,
|
|
) api.UserInternalAPI {
|
|
db, err := storage.NewDatabase(&cfg.AccountDatabase, cfg.Matrix.ServerName, cfg.BCryptCost, int64(api.DefaultLoginTokenLifetime*time.Millisecond), api.DefaultLoginTokenLifetime)
|
|
if err != nil {
|
|
logrus.WithError(err).Panicf("failed to connect to device db")
|
|
}
|
|
|
|
js := jetstream.Prepare(&cfg.Matrix.JetStream)
|
|
|
|
syncProducer := producers.NewSyncAPI(
|
|
db, js,
|
|
// TODO: user API should handle syncs for account data. Right now,
|
|
// it's handled by clientapi, and hence uses its topic. When user
|
|
// API handles it for all account data, we can remove it from
|
|
// here.
|
|
cfg.Matrix.JetStream.TopicFor(jetstream.OutputClientData),
|
|
cfg.Matrix.JetStream.TopicFor(jetstream.OutputNotificationData),
|
|
)
|
|
|
|
userAPI := &internal.UserInternalAPI{
|
|
DB: db,
|
|
SyncProducer: syncProducer,
|
|
ServerName: cfg.Matrix.ServerName,
|
|
AppServices: appServices,
|
|
KeyAPI: keyAPI,
|
|
DisableTLSValidation: cfg.PushGatewayDisableTLSValidation,
|
|
}
|
|
|
|
readConsumer := consumers.NewOutputReadUpdateConsumer(
|
|
base.ProcessContext, cfg, js, db, pgClient, userAPI, syncProducer,
|
|
)
|
|
if err := readConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panic("failed to start user API read update consumer")
|
|
}
|
|
|
|
eventConsumer := consumers.NewOutputStreamEventConsumer(
|
|
base.ProcessContext, cfg, js, db, pgClient, userAPI, rsAPI, syncProducer,
|
|
)
|
|
if err := eventConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panic("failed to start user API streamed event consumer")
|
|
}
|
|
|
|
return userAPI
|
|
}
|