mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-08 07:23:10 -06:00
Squashed commit of the following: commitb5c55faf98Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jul 1 12:00:32 2022 +0100 Version 0.8.9 (#2549) * Version 0.8.9 * Update changelog commitb50a24c666Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jul 1 10:54:07 2022 +0100 Roomserver producers package (#2546) * Give the roomserver a producers package * Change init point * Populate ACLs API * Fix build issues * `RoomEventProducer` naming commit89cd0e8fc1Author: Till <2353100+S7evinK@users.noreply.github.com> Date: Fri Jul 1 11:49:26 2022 +0200 Try to fix backfilling (#2548) * Try to fix backfilling * Return start/end to not confuse clients * Update GMSL * Update GMSL commit086f182e24Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jul 1 09:50:06 2022 +0100 Disable WebAssembly builds for now commit54bed4c593Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jul 1 09:37:54 2022 +0100 Blacklist `Guest users can join guest_access rooms` test until it can be investigated commit561c159ad7Author: Till <2353100+S7evinK@users.noreply.github.com> Date: Thu Jun 30 12:34:37 2022 +0200 Silence presence logs (#2547) commit519bc1124bAuthor: Neil Alexander <neilalexander@users.noreply.github.com> Date: Wed Jun 29 15:29:39 2022 +0100 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 commit2dea466685Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Wed Jun 29 12:32:24 2022 +0100 Return an error if trying to invite a malformed user ID (#2543) commit2086992cafAuthor: Till <2353100+S7evinK@users.noreply.github.com> Date: Wed Jun 29 10:49:12 2022 +0200 Don't return `end` if there are not more messages (#2542) * Be more spec compliant * Move lazyLoadMembers to own method commit920a20821bAuthor: Jean Lucas <jean@4ray.co> Date: Mon Jun 27 04:15:19 2022 -0400 Fix nats.go commit (#2540) Signed-off-by: Jean Lucas <jean@4ray.co> commit7120eb6bc9Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Wed Jun 15 14:27:07 2022 +0100 Add `InputDeviceListUpdate` to the keyserver, remove old input API (#2536) * Add `InputDeviceListUpdate` to the keyserver, remove old input API * Fix copyright * Log more information when a device list update fails commit1b90cc9536Author: Till <2353100+S7evinK@users.noreply.github.com> Date: Wed Jun 15 12:50:02 2022 +0200 Fix rare panic when returning user devices over federation (#2534) commit4c2a10f1a6Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Mon Jun 13 15:11:10 2022 +0100 Handle state before, send history visibility in output (#2532) * Check state before event * Tweaks * Refactor a bit, include in output events * Don't waste time if soft failed either * Tweak control flow, comments, use GMSL history visibility type commitc500958583Author: Emanuele Aliberti <dev@mtka.eu> Date: Mon Jun 13 13:08:46 2022 +0200 generic CaddyFile in front of Dendrite (monolith) (#2531) for Caddy 2.5.x Co-authored-by: emanuele.aliberti <emanuele.aliberti@mtka.eu> commite1136f4d3eAuthor: Till Faelligen <davidf@element.io> Date: Mon Jun 13 11:46:59 2022 +0200 Make the linter happy again commit0a7f7dc716Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Mon Jun 13 10:16:30 2022 +0100 Add `--difference` to `resolve-state` tool commit89d2adadbdAuthor: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jun 10 10:58:04 2022 +0100 Attempt to raise the file descriptor limit at startup (#2527) commit1030072285Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jun 10 10:18:32 2022 +0100 Rename the page to "Optimise your installation" commit16ed1633b6Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jun 10 10:15:14 2022 +0100 Highlighting in docs commite2a64773ceAuthor: Neil Alexander <neilalexander@users.noreply.github.com> Date: Fri Jun 10 10:14:15 2022 +0100 Add new next steps page to the documentation commit660f7839f5Author: Till <2353100+S7evinK@users.noreply.github.com> Date: Thu Jun 9 18:38:07 2022 +0200 Correctly redact events over federation (#2526) * Ensure we check powerlevel/origin before redacting an event * Add passing test * Use pl.UserLevel * Make check more readable, also check for the sender
219 lines
5.7 KiB
Go
219 lines
5.7 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"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")
|
|
|
|
cache, err := caching.NewInMemoryLRUCache(true)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
roomserverDB, err := storage.Open(base, &cfg.RoomServer.Database, cache)
|
|
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
|
|
}
|