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>
218 lines
5.7 KiB
Go
218 lines
5.7 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/matrix-org/dendrite/internal/caching"
|
|
"github.com/matrix-org/dendrite/roomserver/state"
|
|
"github.com/matrix-org/dendrite/roomserver/storage"
|
|
"github.com/matrix-org/dendrite/roomserver/types"
|
|
"github.com/matrix-org/dendrite/setup"
|
|
"github.com/matrix-org/dendrite/setup/base"
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
// This is a utility for inspecting state snapshots and running state resolution
|
|
// against real snapshots in an actual database.
|
|
// It takes one or more state snapshot NIDs as arguments, along with a room version
|
|
// to use for unmarshalling events, and will produce resolved output.
|
|
//
|
|
// Usage: ./resolve-state --roomversion=version snapshot [snapshot ...]
|
|
// e.g. ./resolve-state --roomversion=5 1254 1235 1282
|
|
|
|
var roomVersion = flag.String("roomversion", "5", "the room version to parse events as")
|
|
var filterType = flag.String("filtertype", "", "the event types to filter on")
|
|
var difference = flag.Bool("difference", false, "whether to calculate the difference between snapshots")
|
|
|
|
// nolint:gocyclo
|
|
func main() {
|
|
ctx := context.Background()
|
|
cfg := setup.ParseFlags(true)
|
|
cfg.Logging = append(cfg.Logging[:0], config.LogrusHook{
|
|
Type: "std",
|
|
Level: "error",
|
|
})
|
|
cfg.ClientAPI.RegistrationDisabled = true
|
|
base := base.NewBaseDendrite(cfg, "ResolveState", base.DisableMetrics)
|
|
args := flag.Args()
|
|
|
|
fmt.Println("Room version", *roomVersion)
|
|
|
|
snapshotNIDs := []types.StateSnapshotNID{}
|
|
for _, arg := range args {
|
|
if i, err := strconv.Atoi(arg); err == nil {
|
|
snapshotNIDs = append(snapshotNIDs, types.StateSnapshotNID(i))
|
|
}
|
|
}
|
|
|
|
fmt.Println("Fetching", len(snapshotNIDs), "snapshot NIDs")
|
|
|
|
roomserverDB, err := storage.Open(
|
|
base, &cfg.RoomServer.Database,
|
|
caching.NewRistrettoCache(128*1024*1024, time.Hour, true),
|
|
)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
stateres := state.NewStateResolution(roomserverDB, &types.RoomInfo{
|
|
RoomVersion: gomatrixserverlib.RoomVersion(*roomVersion),
|
|
})
|
|
|
|
if *difference {
|
|
if len(snapshotNIDs) != 2 {
|
|
panic("need exactly two state snapshot NIDs to calculate difference")
|
|
}
|
|
var removed, added []types.StateEntry
|
|
removed, added, err = stateres.DifferenceBetweeenStateSnapshots(ctx, snapshotNIDs[0], snapshotNIDs[1])
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
var eventNIDs []types.EventNID
|
|
for _, entry := range append(removed, added...) {
|
|
eventNIDs = append(eventNIDs, entry.EventNID)
|
|
}
|
|
|
|
var eventEntries []types.Event
|
|
eventEntries, err = roomserverDB.Events(ctx, eventNIDs)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
events := make(map[types.EventNID]*gomatrixserverlib.Event, len(eventEntries))
|
|
for _, entry := range eventEntries {
|
|
events[entry.EventNID] = entry.Event
|
|
}
|
|
|
|
if len(removed) > 0 {
|
|
fmt.Println("Removed:")
|
|
for _, r := range removed {
|
|
event := events[r.EventNID]
|
|
fmt.Println()
|
|
fmt.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey())
|
|
fmt.Printf(" %s\n", string(event.Content()))
|
|
}
|
|
}
|
|
|
|
if len(removed) > 0 && len(added) > 0 {
|
|
fmt.Println()
|
|
}
|
|
|
|
if len(added) > 0 {
|
|
fmt.Println("Added:")
|
|
for _, a := range added {
|
|
event := events[a.EventNID]
|
|
fmt.Println()
|
|
fmt.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey())
|
|
fmt.Printf(" %s\n", string(event.Content()))
|
|
}
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
var stateEntries []types.StateEntry
|
|
for _, snapshotNID := range snapshotNIDs {
|
|
var entries []types.StateEntry
|
|
entries, err = stateres.LoadStateAtSnapshot(ctx, snapshotNID)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
stateEntries = append(stateEntries, entries...)
|
|
}
|
|
|
|
var eventNIDs []types.EventNID
|
|
for _, entry := range stateEntries {
|
|
eventNIDs = append(eventNIDs, entry.EventNID)
|
|
}
|
|
|
|
fmt.Println("Fetching", len(eventNIDs), "state events")
|
|
eventEntries, err := roomserverDB.Events(ctx, eventNIDs)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
authEventIDMap := make(map[string]struct{})
|
|
events := make([]*gomatrixserverlib.Event, len(eventEntries))
|
|
for i := range eventEntries {
|
|
events[i] = eventEntries[i].Event
|
|
for _, authEventID := range eventEntries[i].AuthEventIDs() {
|
|
authEventIDMap[authEventID] = struct{}{}
|
|
}
|
|
}
|
|
|
|
authEventIDs := make([]string, 0, len(authEventIDMap))
|
|
for authEventID := range authEventIDMap {
|
|
authEventIDs = append(authEventIDs, authEventID)
|
|
}
|
|
|
|
fmt.Println("Fetching", len(authEventIDs), "auth events")
|
|
authEventEntries, err := roomserverDB.EventsFromIDs(ctx, authEventIDs)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
authEvents := make([]*gomatrixserverlib.Event, len(authEventEntries))
|
|
for i := range authEventEntries {
|
|
authEvents[i] = authEventEntries[i].Event
|
|
}
|
|
|
|
fmt.Println("Resolving state")
|
|
var resolved Events
|
|
resolved, err = gomatrixserverlib.ResolveConflicts(
|
|
gomatrixserverlib.RoomVersion(*roomVersion),
|
|
events,
|
|
authEvents,
|
|
)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
fmt.Println("Resolved state contains", len(resolved), "events")
|
|
sort.Sort(resolved)
|
|
filteringEventType := *filterType
|
|
count := 0
|
|
for _, event := range resolved {
|
|
if filteringEventType != "" && event.Type() != filteringEventType {
|
|
continue
|
|
}
|
|
count++
|
|
fmt.Println()
|
|
fmt.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey())
|
|
fmt.Printf(" %s\n", string(event.Content()))
|
|
}
|
|
|
|
fmt.Println()
|
|
fmt.Println("Returned", count, "state events after filtering")
|
|
}
|
|
|
|
type Events []*gomatrixserverlib.Event
|
|
|
|
func (e Events) Len() int {
|
|
return len(e)
|
|
}
|
|
|
|
func (e Events) Swap(i, j int) {
|
|
e[i], e[j] = e[j], e[i]
|
|
}
|
|
|
|
func (e Events) Less(i, j int) bool {
|
|
typeDelta := strings.Compare(e[i].Type(), e[j].Type())
|
|
if typeDelta < 0 {
|
|
return true
|
|
}
|
|
if typeDelta > 0 {
|
|
return false
|
|
}
|
|
stateKeyDelta := strings.Compare(*e[i].StateKey(), *e[j].StateKey())
|
|
return stateKeyDelta < 0
|
|
}
|