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>
154 lines
4.7 KiB
Go
154 lines
4.7 KiB
Go
// Copyright 2019-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 postgres
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"encoding/json"
|
|
|
|
"github.com/matrix-org/dendrite/internal"
|
|
"github.com/matrix-org/dendrite/internal/sqlutil"
|
|
"github.com/matrix-org/dendrite/syncapi/storage/tables"
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
const sendToDeviceSchema = `
|
|
CREATE SEQUENCE IF NOT EXISTS syncapi_send_to_device_id;
|
|
|
|
-- Stores send-to-device messages.
|
|
CREATE TABLE IF NOT EXISTS syncapi_send_to_device (
|
|
-- The ID that uniquely identifies this message.
|
|
id BIGINT PRIMARY KEY DEFAULT nextval('syncapi_send_to_device_id'),
|
|
-- The user ID to send the message to.
|
|
user_id TEXT NOT NULL,
|
|
-- The device ID to send the message to.
|
|
device_id TEXT NOT NULL,
|
|
-- The event content JSON.
|
|
content TEXT NOT NULL
|
|
);
|
|
`
|
|
|
|
const insertSendToDeviceMessageSQL = `
|
|
INSERT INTO syncapi_send_to_device (user_id, device_id, content)
|
|
VALUES ($1, $2, $3)
|
|
RETURNING id
|
|
`
|
|
|
|
const selectSendToDeviceMessagesSQL = `
|
|
SELECT id, user_id, device_id, content
|
|
FROM syncapi_send_to_device
|
|
WHERE user_id = $1 AND device_id = $2 AND id > $3 AND id <= $4
|
|
ORDER BY id ASC
|
|
`
|
|
|
|
const deleteSendToDeviceMessagesSQL = `
|
|
DELETE FROM syncapi_send_to_device
|
|
WHERE user_id = $1 AND device_id = $2 AND id < $3
|
|
`
|
|
|
|
const selectMaxSendToDeviceIDSQL = "" +
|
|
"SELECT MAX(id) FROM syncapi_send_to_device"
|
|
|
|
type sendToDeviceStatements struct {
|
|
insertSendToDeviceMessageStmt *sql.Stmt
|
|
selectSendToDeviceMessagesStmt *sql.Stmt
|
|
deleteSendToDeviceMessagesStmt *sql.Stmt
|
|
selectMaxSendToDeviceIDStmt *sql.Stmt
|
|
}
|
|
|
|
func NewPostgresSendToDeviceTable(db *sql.DB) (tables.SendToDevice, error) {
|
|
s := &sendToDeviceStatements{}
|
|
_, err := db.Exec(sendToDeviceSchema)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if s.insertSendToDeviceMessageStmt, err = db.Prepare(insertSendToDeviceMessageSQL); err != nil {
|
|
return nil, err
|
|
}
|
|
if s.selectSendToDeviceMessagesStmt, err = db.Prepare(selectSendToDeviceMessagesSQL); err != nil {
|
|
return nil, err
|
|
}
|
|
if s.deleteSendToDeviceMessagesStmt, err = db.Prepare(deleteSendToDeviceMessagesSQL); err != nil {
|
|
return nil, err
|
|
}
|
|
if s.selectMaxSendToDeviceIDStmt, err = db.Prepare(selectMaxSendToDeviceIDSQL); err != nil {
|
|
return nil, err
|
|
}
|
|
return s, nil
|
|
}
|
|
|
|
func (s *sendToDeviceStatements) InsertSendToDeviceMessage(
|
|
ctx context.Context, txn *sql.Tx, userID, deviceID, content string,
|
|
) (pos types.StreamPosition, err error) {
|
|
err = sqlutil.TxStmt(txn, s.insertSendToDeviceMessageStmt).QueryRowContext(ctx, userID, deviceID, content).Scan(&pos)
|
|
return
|
|
}
|
|
|
|
func (s *sendToDeviceStatements) SelectSendToDeviceMessages(
|
|
ctx context.Context, txn *sql.Tx, userID, deviceID string, from, to types.StreamPosition,
|
|
) (lastPos types.StreamPosition, events []types.SendToDeviceEvent, err error) {
|
|
rows, err := sqlutil.TxStmt(txn, s.selectSendToDeviceMessagesStmt).QueryContext(ctx, userID, deviceID, from, to)
|
|
if err != nil {
|
|
return
|
|
}
|
|
defer internal.CloseAndLogIfError(ctx, rows, "SelectSendToDeviceMessages: rows.close() failed")
|
|
|
|
for rows.Next() {
|
|
var id types.StreamPosition
|
|
var userID, deviceID, content string
|
|
if err = rows.Scan(&id, &userID, &deviceID, &content); err != nil {
|
|
return
|
|
}
|
|
event := types.SendToDeviceEvent{
|
|
ID: id,
|
|
UserID: userID,
|
|
DeviceID: deviceID,
|
|
}
|
|
if err = json.Unmarshal([]byte(content), &event.SendToDeviceEvent); err != nil {
|
|
logrus.WithError(err).Errorf("Failed to unmarshal send-to-device message")
|
|
continue
|
|
}
|
|
if id > lastPos {
|
|
lastPos = id
|
|
}
|
|
events = append(events, event)
|
|
}
|
|
if lastPos == 0 {
|
|
lastPos = to
|
|
}
|
|
return lastPos, events, rows.Err()
|
|
}
|
|
|
|
func (s *sendToDeviceStatements) DeleteSendToDeviceMessages(
|
|
ctx context.Context, txn *sql.Tx, userID, deviceID string, pos types.StreamPosition,
|
|
) (err error) {
|
|
_, err = sqlutil.TxStmt(txn, s.deleteSendToDeviceMessagesStmt).ExecContext(ctx, userID, deviceID, pos)
|
|
return
|
|
}
|
|
|
|
func (s *sendToDeviceStatements) SelectMaxSendToDeviceMessageID(
|
|
ctx context.Context, txn *sql.Tx,
|
|
) (id int64, err error) {
|
|
var nullableID sql.NullInt64
|
|
stmt := sqlutil.TxStmt(txn, s.selectMaxSendToDeviceIDStmt)
|
|
err = stmt.QueryRowContext(ctx).Scan(&nullableID)
|
|
if nullableID.Valid {
|
|
id = nullableID.Int64
|
|
}
|
|
return
|
|
}
|