mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-09 15:13:12 -06:00
* Verify that the user ID for registration matches the spec, and the auth data (#10) * Blacklist some sytest tests that are failing in our environment * Commenting out test that isn't reliably passing or failing, probably a race * refresh latest dendrite main * pull latest from dendrite-fork subtree * refresh latest dendrite main * pull dendrite subtree and resolve merge conflicts * check that userID matches the signed message * verify that the user ID for registration is CAIP-10 compliant and MXID compliant * removed space Co-authored-by: Brian Meek <brian@hntlabs.com> Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> * Fix nats.go commit (#2540) Signed-off-by: Jean Lucas <jean@4ray.co> * Don't return `end` if there are not more messages (#2542) * Be more spec compliant * Move lazyLoadMembers to own method * Return an error if trying to invite a malformed user ID (#2543) * Add `evacuateUser` endpoint, use it when deactivating accounts (#2545) * Add `evacuateUser` endpoint, use it when deactivating accounts * Populate the API * Clean up user devices when deactivating * Include invites, delete pushers * Silence presence logs (#2547) * Blacklist `Guest users can join guest_access rooms` test until it can be investigated * Disable WebAssembly builds for now * Try to fix backfilling (#2548) * Try to fix backfilling * Return start/end to not confuse clients * Update GMSL * Update GMSL * Roomserver producers package (#2546) * Give the roomserver a producers package * Change init point * Populate ACLs API * Fix build issues * `RoomEventProducer` naming * Version 0.8.9 (#2549) * Version 0.8.9 * Update changelog * Takwaiw/fix concurrent registration bug (#12) * fix concurrent registration bug. Rename decentralizedid * remove unused module * add regressed test to blacklist Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> * Test_UserStatistics Fix expected results to match observed results * Takwaiw/dendrite publickey (#2) * Implementation of MSC 3782 Add publickey login as a new auth type. Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> * Implement EIP-4361 sign in with Ethereum (#5) * Blacklist some sytest tests that are failing in our environment * Commenting out test that isn't reliably passing or failing, probably a race * refresh latest dendrite main * refresh latest dendrite main * dendrite implementation of eip-4361 * simplify nonce generation Co-authored-by: Brian Meek <brian@hntlabs.com> Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> * Use rand.Seed to seed the random function generator (#6) * Blacklist some sytest tests that are failing in our environment * Commenting out test that isn't reliably passing or failing, probably a race * refresh latest dendrite main * use rand.Seed to seed the random function Co-authored-by: Brian Meek <brian@hntlabs.com> Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> * Create session ID during registration (#8) * Blacklist some sytest tests that are failing in our environment * Commenting out test that isn't reliably passing or failing, probably a race * refresh latest dendrite main * pull latest from dendrite-fork subtree * refresh latest dendrite main * Create session ID during registration Co-authored-by: Brian Meek <brian@hntlabs.com> Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> * Verify that the user ID for registration matches the spec, and the auth data (#10) * Blacklist some sytest tests that are failing in our environment * Commenting out test that isn't reliably passing or failing, probably a race * refresh latest dendrite main * pull latest from dendrite-fork subtree * refresh latest dendrite main * pull dendrite subtree and resolve merge conflicts * check that userID matches the signed message * verify that the user ID for registration is CAIP-10 compliant and MXID compliant * removed space Co-authored-by: Brian Meek <brian@hntlabs.com> Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> * Takwaiw/fix concurrent registration bug (#12) * fix concurrent registration bug. Rename decentralizedid * remove unused module * add regressed test to blacklist Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> * removed unused module * feat+fix: Ignore unknown keys and verify required fields are present in appservice registration files (#2550) * fix: ignore unknown keys in appservice configs fixes matrix-org/dendrite#1567 * feat: verify required fields in appservice configs * Use new testrig for key changes tests (#2552) * Use new testrig for tests * Log the error message * Fix QuerySharedUsers for the SyncAPI keychange consumer (#2554) * Make more use of base.BaseDendrite * Fix QuerySharedUsers if no UserIDs are supplied * Return clearer error when no state NID exists for an event (#2555) * Wrap error from `SnapshotNIDFromEventID` * Hopefully fix read receipts timestamps (#2557) This should avoid coercions between signed and unsigned ints which might fix problems like `sql: converting argument $5 type: uint64 values with high bit set are not supported`. * fix concurrency issue when checking session ID (#14) Co-authored-by: Tak Wai Wong <tak@hntlabs.com> * merge latest changes from dendrite main (#15) Co-authored-by: Tak Wai Wong <tak@hntlabs.com> * Login and Register tests for public key ethereum (#16) * TestLoginPublicKeyNewSession * use asserts * setup, test, asserts * TestLoginPublicKeyValidAuthTypeMissingSession * invalid session id test * create a helper newSession function * TestLoginPublicKeyEthereumMissingUserId * TestLoginPublicKeyEthereumAccountNotAvailable * TestLoginPublicKeyEthereumInvalidUserId * createEip4361TestMessage * TestLoginPublicKeyEthereumMissingSignature * TestLoginPublicKeyEthereum * re-enable all publickey signin tests * move common publickey test util to its own file * register_public_key.go stub * refactored common ethereum test helpers to its own folder * refactor test helpers * return error in test helpers * fix regressions with ServerName * TestRegistrationUnimplementedAlgo * TestNewRegistration * TestNewRegistrationSession * verify new login session * remove assert * perform account creation * TestRegisterEthereum * Enable all tests * move helper functions into test file Co-authored-by: Tak Wai Wong <tak@hntlabs.com> Co-authored-by: Brian Meek <brian@hntlabs.com> Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> Co-authored-by: Jean Lucas <jean@4ray.co> Co-authored-by: Till <2353100+S7evinK@users.noreply.github.com> Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com> Co-authored-by: Tak Wai Wong <tak@hntlabs.com> Co-authored-by: Kabir Kwatra <kabir@kwatra.me>
173 lines
5.5 KiB
Go
173 lines
5.5 KiB
Go
// Copyright 2022 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 consumers
|
|
|
|
import (
|
|
"context"
|
|
"strconv"
|
|
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
"github.com/matrix-org/dendrite/setup/jetstream"
|
|
"github.com/matrix-org/dendrite/setup/process"
|
|
"github.com/matrix-org/dendrite/syncapi/notifier"
|
|
"github.com/matrix-org/dendrite/syncapi/storage"
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
"github.com/matrix-org/dendrite/userapi/api"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"github.com/nats-io/nats.go"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// OutputTypingEventConsumer consumes events that originated in the EDU server.
|
|
type PresenceConsumer struct {
|
|
ctx context.Context
|
|
jetstream nats.JetStreamContext
|
|
nats *nats.Conn
|
|
durable string
|
|
requestTopic string
|
|
presenceTopic string
|
|
db storage.Database
|
|
stream types.StreamProvider
|
|
notifier *notifier.Notifier
|
|
deviceAPI api.SyncUserAPI
|
|
cfg *config.SyncAPI
|
|
}
|
|
|
|
// NewPresenceConsumer creates a new PresenceConsumer.
|
|
// Call Start() to begin consuming events.
|
|
func NewPresenceConsumer(
|
|
process *process.ProcessContext,
|
|
cfg *config.SyncAPI,
|
|
js nats.JetStreamContext,
|
|
nats *nats.Conn,
|
|
db storage.Database,
|
|
notifier *notifier.Notifier,
|
|
stream types.StreamProvider,
|
|
deviceAPI api.SyncUserAPI,
|
|
) *PresenceConsumer {
|
|
return &PresenceConsumer{
|
|
ctx: process.Context(),
|
|
nats: nats,
|
|
jetstream: js,
|
|
durable: cfg.Matrix.JetStream.Durable("SyncAPIPresenceConsumer"),
|
|
presenceTopic: cfg.Matrix.JetStream.Prefixed(jetstream.OutputPresenceEvent),
|
|
requestTopic: cfg.Matrix.JetStream.Prefixed(jetstream.RequestPresence),
|
|
db: db,
|
|
notifier: notifier,
|
|
stream: stream,
|
|
deviceAPI: deviceAPI,
|
|
cfg: cfg,
|
|
}
|
|
}
|
|
|
|
// Start consuming typing events.
|
|
func (s *PresenceConsumer) Start() error {
|
|
// Normal NATS subscription, used by Request/Reply
|
|
_, err := s.nats.Subscribe(s.requestTopic, func(msg *nats.Msg) {
|
|
userID := msg.Header.Get(jetstream.UserID)
|
|
presence, err := s.db.GetPresence(context.Background(), userID)
|
|
m := &nats.Msg{
|
|
Header: nats.Header{},
|
|
}
|
|
if err != nil {
|
|
m.Header.Set("error", err.Error())
|
|
if err = msg.RespondMsg(m); err != nil {
|
|
logrus.WithError(err).Error("Unable to respond to messages")
|
|
}
|
|
return
|
|
}
|
|
if presence == nil {
|
|
presence = &types.PresenceInternal{
|
|
UserID: userID,
|
|
}
|
|
}
|
|
|
|
deviceRes := api.QueryDevicesResponse{}
|
|
if err = s.deviceAPI.QueryDevices(s.ctx, &api.QueryDevicesRequest{UserID: userID}, &deviceRes); err != nil {
|
|
m.Header.Set("error", err.Error())
|
|
if err = msg.RespondMsg(m); err != nil {
|
|
logrus.WithError(err).Error("Unable to respond to messages")
|
|
}
|
|
return
|
|
}
|
|
|
|
for i := range deviceRes.Devices {
|
|
if int64(presence.LastActiveTS) < deviceRes.Devices[i].LastSeenTS {
|
|
presence.LastActiveTS = gomatrixserverlib.Timestamp(deviceRes.Devices[i].LastSeenTS)
|
|
}
|
|
}
|
|
|
|
m.Header.Set(jetstream.UserID, presence.UserID)
|
|
m.Header.Set("presence", presence.ClientFields.Presence)
|
|
if presence.ClientFields.StatusMsg != nil {
|
|
m.Header.Set("status_msg", *presence.ClientFields.StatusMsg)
|
|
}
|
|
m.Header.Set("last_active_ts", strconv.Itoa(int(presence.LastActiveTS)))
|
|
|
|
if err = msg.RespondMsg(m); err != nil {
|
|
logrus.WithError(err).Error("Unable to respond to messages")
|
|
return
|
|
}
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !s.cfg.Matrix.Presence.EnableInbound && !s.cfg.Matrix.Presence.EnableOutbound {
|
|
return nil
|
|
}
|
|
return jetstream.JetStreamConsumer(
|
|
s.ctx, s.jetstream, s.presenceTopic, s.durable, s.onMessage,
|
|
nats.DeliverAll(), nats.ManualAck(), nats.HeadersOnly(),
|
|
)
|
|
}
|
|
|
|
func (s *PresenceConsumer) onMessage(ctx context.Context, msg *nats.Msg) bool {
|
|
userID := msg.Header.Get(jetstream.UserID)
|
|
presence := msg.Header.Get("presence")
|
|
timestamp := msg.Header.Get("last_active_ts")
|
|
fromSync, _ := strconv.ParseBool(msg.Header.Get("from_sync"))
|
|
logrus.Tracef("syncAPI received presence event: %+v", msg.Header)
|
|
|
|
if fromSync { // do not process local presence changes; we already did this synchronously.
|
|
return true
|
|
}
|
|
|
|
ts, err := strconv.ParseUint(timestamp, 10, 64)
|
|
if err != nil {
|
|
return true
|
|
}
|
|
|
|
var statusMsg *string = nil
|
|
if data, ok := msg.Header["status_msg"]; ok && len(data) > 0 {
|
|
newMsg := msg.Header.Get("status_msg")
|
|
statusMsg = &newMsg
|
|
}
|
|
// already checked, so no need to check error
|
|
p, _ := types.PresenceFromString(presence)
|
|
|
|
s.EmitPresence(ctx, userID, p, statusMsg, gomatrixserverlib.Timestamp(ts), fromSync)
|
|
return true
|
|
}
|
|
|
|
func (s *PresenceConsumer) EmitPresence(ctx context.Context, userID string, presence types.Presence, statusMsg *string, ts gomatrixserverlib.Timestamp, fromSync bool) {
|
|
pos, err := s.db.UpdatePresence(ctx, userID, presence, statusMsg, ts, fromSync)
|
|
if err != nil {
|
|
logrus.WithError(err).WithField("user", userID).WithField("presence", presence).Warn("failed to updated presence for user")
|
|
return
|
|
}
|
|
s.stream.Advance(pos)
|
|
s.notifier.OnNewPresence(types.StreamingToken{PresencePosition: pos}, userID)
|
|
}
|