mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-11 16:13:10 -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>
188 lines
6.2 KiB
Go
188 lines
6.2 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 eventutil
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/matrix-org/dendrite/roomserver/api"
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
// ErrRoomNoExists is returned when trying to lookup the state of a room that
|
|
// doesn't exist
|
|
var ErrRoomNoExists = errors.New("room does not exist")
|
|
|
|
// QueryAndBuildEvent builds a Matrix event using the event builder and roomserver query
|
|
// API client provided. If also fills roomserver query API response (if provided)
|
|
// in case the function calling FillBuilder needs to use it.
|
|
// Returns ErrRoomNoExists if the state of the room could not be retrieved because
|
|
// the room doesn't exist
|
|
// Returns an error if something else went wrong
|
|
func QueryAndBuildEvent(
|
|
ctx context.Context,
|
|
builder *gomatrixserverlib.EventBuilder, cfg *config.Global, evTime time.Time,
|
|
rsAPI api.QueryLatestEventsAndStateAPI, queryRes *api.QueryLatestEventsAndStateResponse,
|
|
) (*gomatrixserverlib.HeaderedEvent, error) {
|
|
if queryRes == nil {
|
|
queryRes = &api.QueryLatestEventsAndStateResponse{}
|
|
}
|
|
|
|
eventsNeeded, err := queryRequiredEventsForBuilder(ctx, builder, rsAPI, queryRes)
|
|
if err != nil {
|
|
// This can pass through a ErrRoomNoExists to the caller
|
|
return nil, err
|
|
}
|
|
return BuildEvent(ctx, builder, cfg, evTime, eventsNeeded, queryRes)
|
|
}
|
|
|
|
// BuildEvent builds a Matrix event from the builder and QueryLatestEventsAndStateResponse
|
|
// provided.
|
|
func BuildEvent(
|
|
ctx context.Context,
|
|
builder *gomatrixserverlib.EventBuilder, cfg *config.Global, evTime time.Time,
|
|
eventsNeeded *gomatrixserverlib.StateNeeded, queryRes *api.QueryLatestEventsAndStateResponse,
|
|
) (*gomatrixserverlib.HeaderedEvent, error) {
|
|
err := addPrevEventsToEvent(builder, eventsNeeded, queryRes)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
event, err := builder.Build(
|
|
evTime, cfg.ServerName, cfg.KeyID,
|
|
cfg.PrivateKey, queryRes.RoomVersion,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return event.Headered(queryRes.RoomVersion), nil
|
|
}
|
|
|
|
// queryRequiredEventsForBuilder queries the roomserver for auth/prev events needed for this builder.
|
|
func queryRequiredEventsForBuilder(
|
|
ctx context.Context,
|
|
builder *gomatrixserverlib.EventBuilder,
|
|
rsAPI api.QueryLatestEventsAndStateAPI, queryRes *api.QueryLatestEventsAndStateResponse,
|
|
) (*gomatrixserverlib.StateNeeded, error) {
|
|
eventsNeeded, err := gomatrixserverlib.StateNeededForEventBuilder(builder)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("gomatrixserverlib.StateNeededForEventBuilder: %w", err)
|
|
}
|
|
|
|
if len(eventsNeeded.Tuples()) == 0 {
|
|
return nil, errors.New("expecting state tuples for event builder, got none")
|
|
}
|
|
|
|
// Ask the roomserver for information about this room
|
|
queryReq := api.QueryLatestEventsAndStateRequest{
|
|
RoomID: builder.RoomID,
|
|
StateToFetch: eventsNeeded.Tuples(),
|
|
}
|
|
return &eventsNeeded, rsAPI.QueryLatestEventsAndState(ctx, &queryReq, queryRes)
|
|
}
|
|
|
|
// addPrevEventsToEvent fills out the prev_events and auth_events fields in builder
|
|
func addPrevEventsToEvent(
|
|
builder *gomatrixserverlib.EventBuilder,
|
|
eventsNeeded *gomatrixserverlib.StateNeeded,
|
|
queryRes *api.QueryLatestEventsAndStateResponse,
|
|
) error {
|
|
if !queryRes.RoomExists {
|
|
return ErrRoomNoExists
|
|
}
|
|
|
|
eventFormat, err := queryRes.RoomVersion.EventFormat()
|
|
if err != nil {
|
|
return fmt.Errorf("queryRes.RoomVersion.EventFormat: %w", err)
|
|
}
|
|
|
|
builder.Depth = queryRes.Depth
|
|
|
|
authEvents := gomatrixserverlib.NewAuthEvents(nil)
|
|
|
|
for i := range queryRes.StateEvents {
|
|
err = authEvents.AddEvent(queryRes.StateEvents[i].Event)
|
|
if err != nil {
|
|
return fmt.Errorf("authEvents.AddEvent: %w", err)
|
|
}
|
|
}
|
|
|
|
refs, err := eventsNeeded.AuthEventReferences(&authEvents)
|
|
if err != nil {
|
|
return fmt.Errorf("eventsNeeded.AuthEventReferences: %w", err)
|
|
}
|
|
|
|
truncAuth, truncPrev := truncateAuthAndPrevEvents(refs, queryRes.LatestEvents)
|
|
switch eventFormat {
|
|
case gomatrixserverlib.EventFormatV1:
|
|
builder.AuthEvents = truncAuth
|
|
builder.PrevEvents = truncPrev
|
|
case gomatrixserverlib.EventFormatV2:
|
|
v2AuthRefs, v2PrevRefs := []string{}, []string{}
|
|
for _, ref := range truncAuth {
|
|
v2AuthRefs = append(v2AuthRefs, ref.EventID)
|
|
}
|
|
for _, ref := range truncPrev {
|
|
v2PrevRefs = append(v2PrevRefs, ref.EventID)
|
|
}
|
|
builder.AuthEvents = v2AuthRefs
|
|
builder.PrevEvents = v2PrevRefs
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// truncateAuthAndPrevEvents limits the number of events we add into
|
|
// an event as prev_events or auth_events.
|
|
// NOTSPEC: The limits here feel a bit arbitrary but they are currently
|
|
// here because of https://github.com/matrix-org/matrix-doc/issues/2307
|
|
// and because Synapse will just drop events that don't comply.
|
|
func truncateAuthAndPrevEvents(auth, prev []gomatrixserverlib.EventReference) (
|
|
truncAuth, truncPrev []gomatrixserverlib.EventReference,
|
|
) {
|
|
truncAuth, truncPrev = auth, prev
|
|
if len(truncAuth) > 10 {
|
|
truncAuth = truncAuth[:10]
|
|
}
|
|
if len(truncPrev) > 20 {
|
|
truncPrev = truncPrev[:20]
|
|
}
|
|
return
|
|
}
|
|
|
|
// RedactEvent redacts the given event and sets the unsigned field appropriately. This should be used by
|
|
// downstream components to the roomserver when an OutputTypeRedactedEvent occurs.
|
|
func RedactEvent(redactionEvent, redactedEvent *gomatrixserverlib.Event) error {
|
|
// sanity check
|
|
if redactionEvent.Type() != gomatrixserverlib.MRoomRedaction {
|
|
return fmt.Errorf("RedactEvent: redactionEvent isn't a redaction event, is '%s'", redactionEvent.Type())
|
|
}
|
|
redactedEvent.Redact()
|
|
if err := redactedEvent.SetUnsignedField("redacted_because", redactionEvent); err != nil {
|
|
return err
|
|
}
|
|
// NOTSPEC: sytest relies on this unspecced field existing :(
|
|
if err := redactedEvent.SetUnsignedField("redacted_by", redactionEvent.EventID()); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|