mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-15 10:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Only use []string as Prev/AuthEvents

Browse source
This commit is contained in:
Till Faelligen 2023-05-23 09:50:43 +02:00
parent 9682928f19
commit 6bc0fae46f
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
12 changed files with 31 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/createroom.go
View file

@ -470,7 +470,7 @@ func createRoom(
} }
} }
if i > 0 { if i > 0 {
builder.PrevEvents = []gomatrixserverlib.EventReference{{EventID: builtEvents[i-1].EventID(), EventSHA256: spec.Base64FromEventID(builtEvents[i-1].EventID())}} builder.PrevEvents = []string{builtEvents[i-1].EventID()}
} }
var ev gomatrixserverlib.PDU var ev gomatrixserverlib.PDU
if err = builder.AddAuthEvents(&authEvents); err != nil { if err = builder.AddAuthEvents(&authEvents); err != nil {

7
federationapi/routing/leave.go
View file

@ -131,6 +131,13 @@ func MakeLeave(
} }
} }
// TODO: Remove. This ensures we send event references instead of eventIDs
switch event.Version() {
case gomatrixserverlib.RoomVersionV1, gomatrixserverlib.RoomVersionV2:
proto.PrevEvents = gomatrixserverlib.ToEventReferenc(event.PrevEventIDs())
proto.AuthEvents = gomatrixserverlib.ToEventReferenc(event.AuthEventIDs())
}
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusOK, Code: http.StatusOK,
JSON: map[string]interface{}{ JSON: map[string]interface{}{

29
internal/eventutil/events.go
View file

@ -129,18 +129,12 @@ func addPrevEventsToEvent(
return ErrRoomNoExists{} return ErrRoomNoExists{}
} }
verImpl, err := gomatrixserverlib.GetRoomVersion(queryRes.RoomVersion)
if err != nil {
return fmt.Errorf("GetRoomVersion: %w", err)
}
eventFormat := verImpl.EventFormat()
builder.Depth = queryRes.Depth builder.Depth = queryRes.Depth
authEvents := gomatrixserverlib.NewAuthEvents(nil) authEvents := gomatrixserverlib.NewAuthEvents(nil)
for i := range queryRes.StateEvents { for i := range queryRes.StateEvents {
err = authEvents.AddEvent(queryRes.StateEvents[i].PDU) err := authEvents.AddEvent(queryRes.StateEvents[i].PDU)
if err != nil { if err != nil {
return fmt.Errorf("authEvents.AddEvent: %w", err) return fmt.Errorf("authEvents.AddEvent: %w", err)
} }
@ -151,22 +145,7 @@ func addPrevEventsToEvent(
return fmt.Errorf("eventsNeeded.AuthEventReferences: %w", err) return fmt.Errorf("eventsNeeded.AuthEventReferences: %w", err)
} }
truncAuth, truncPrev := truncateAuthAndPrevEvents(refs, queryRes.LatestEvents) builder.AuthEvents, builder.PrevEvents = 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 return nil
} }
@ -176,8 +155,8 @@ func addPrevEventsToEvent(
// NOTSPEC: The limits here feel a bit arbitrary but they are currently // NOTSPEC: The limits here feel a bit arbitrary but they are currently
// here because of https://github.com/matrix-org/matrix-doc/issues/2307 // here because of https://github.com/matrix-org/matrix-doc/issues/2307
// and because Synapse will just drop events that don't comply. // and because Synapse will just drop events that don't comply.
func truncateAuthAndPrevEvents(auth, prev []gomatrixserverlib.EventReference) ( func truncateAuthAndPrevEvents(auth, prev []string) (
truncAuth, truncPrev []gomatrixserverlib.EventReference, truncAuth, truncPrev []string,
) { ) {
truncAuth, truncPrev = auth, prev truncAuth, truncPrev = auth, prev
if len(truncAuth) > 10 { if len(truncAuth) > 10 {

2
roomserver/api/query.go
View file

@ -49,7 +49,7 @@ type QueryLatestEventsAndStateResponse struct {
RoomVersion gomatrixserverlib.RoomVersion `json:"room_version"` RoomVersion gomatrixserverlib.RoomVersion `json:"room_version"`
// The latest events in the room. // The latest events in the room.
// These are used to set the prev_events when sending an event. // These are used to set the prev_events when sending an event.
LatestEvents []gomatrixserverlib.EventReference `json:"latest_events"` LatestEvents []string `json:"latest_events"`
// The state events requested. // The state events requested.
// This list will be in an arbitrary order. // This list will be in an arbitrary order.
// These are used to set the auth_events when sending an event. // These are used to set the auth_events when sending an event.

4
roomserver/internal/input/input_events.go
View file

@ -883,9 +883,7 @@ func (r *Inputer) kickGuests(ctx context.Context, event gomatrixserverlib.PDU, r
Origin: senderDomain, Origin: senderDomain,
SendAsServer: string(senderDomain), SendAsServer: string(senderDomain),
}) })
prevEvents = []gomatrixserverlib.EventReference{ prevEvents = []string{event.EventID()}
{EventID: event.EventID(), EventSHA256: spec.Base64FromEventID(event.EventID())},
}
} }
inputReq := &api.InputRoomEventsRequest{ inputReq := &api.InputRoomEventsRequest{

6
roomserver/internal/input/input_missing.go
View file

@ -520,9 +520,9 @@ func (t *missingStateReq) getMissingEvents(ctx context.Context, e gomatrixserver
return nil, false, false, fmt.Errorf("t.DB.LatestEventIDs: %w", err) return nil, false, false, fmt.Errorf("t.DB.LatestEventIDs: %w", err)
} }
latestEvents := make([]string, len(latest)) latestEvents := make([]string, len(latest))
for i, ev := range latest { for i := range latest {
latestEvents[i] = ev.EventID latestEvents[i] = latest[i]
t.hadEvent(ev.EventID) t.hadEvent(latest[i])
} }
var missingResp *fclient.RespMissingEvents var missingResp *fclient.RespMissingEvents

8
roomserver/internal/perform/perform_admin.go
View file

@ -131,9 +131,7 @@ func (r *Admin) PerformAdminEvacuateRoom(
SendAsServer: string(senderDomain), SendAsServer: string(senderDomain),
}) })
affected = append(affected, stateKey) affected = append(affected, stateKey)
prevEvents = []gomatrixserverlib.EventReference{ prevEvents = []string{event.EventID()}
{EventID: event.EventID(), EventSHA256: spec.Base64FromEventID(event.EventID())},
}
} }
inputReq := &api.InputRoomEventsRequest{ inputReq := &api.InputRoomEventsRequest{
@ -253,9 +251,9 @@ func (r *Admin) PerformAdminDownloadState(
for _, fwdExtremity := range fwdExtremities { for _, fwdExtremity := range fwdExtremities {
var state gomatrixserverlib.StateResponse var state gomatrixserverlib.StateResponse
state, err = r.Inputer.FSAPI.LookupState(ctx, r.Inputer.ServerName, serverName, roomID, fwdExtremity.EventID, roomInfo.RoomVersion) state, err = r.Inputer.FSAPI.LookupState(ctx, r.Inputer.ServerName, serverName, roomID, fwdExtremity, roomInfo.RoomVersion)
if err != nil { if err != nil {
return fmt.Errorf("r.Inputer.FSAPI.LookupState (%q): %s", fwdExtremity.EventID, err) return fmt.Errorf("r.Inputer.FSAPI.LookupState (%q): %s", fwdExtremity, err)
} }
for _, authEvent := range state.GetAuthEvents().UntrustedEvents(roomInfo.RoomVersion) { for _, authEvent := range state.GetAuthEvents().UntrustedEvents(roomInfo.RoomVersion) {
if err = gomatrixserverlib.VerifyEventSignatures(ctx, authEvent, r.Inputer.KeyRing); err != nil { if err = gomatrixserverlib.VerifyEventSignatures(ctx, authEvent, r.Inputer.KeyRing); err != nil {

2
roomserver/internal/perform/perform_inbound_peek.go
View file

@ -64,7 +64,7 @@ func (r *InboundPeeker) PerformInboundPeek(
if err != nil { if err != nil {
return err return err
} }
latestEvents, err := r.DB.EventsFromIDs(ctx, info, []string{latestEventRefs[0].EventID}) latestEvents, err := r.DB.EventsFromIDs(ctx, info, []string{latestEventRefs[0]})
if err != nil { if err != nil {
return err return err
} }

2
roomserver/internal/perform/perform_upgrade.go
View file

@ -471,7 +471,7 @@ func (r *Upgrader) sendInitialEvents(ctx context.Context, evTime time.Time, user
return fmt.Errorf("failed to set content of new %q event: %w", proto.Type, err) return fmt.Errorf("failed to set content of new %q event: %w", proto.Type, err)
} }
if i > 0 { if i > 0 {
proto.PrevEvents = []gomatrixserverlib.EventReference{{EventID: builtEvents[i-1].EventID(), EventSHA256: spec.Base64FromEventID(builtEvents[i-1].EventID())}} proto.PrevEvents = []string{builtEvents[i-1].EventID()}
} }
var verImpl gomatrixserverlib.IRoomVersion var verImpl gomatrixserverlib.IRoomVersion

4
roomserver/storage/interface.go
View file

@ -102,7 +102,7 @@ type Database interface {
// Look up event references for the latest events in the room and the current state snapshot. // Look up event references for the latest events in the room and the current state snapshot.
// Returns the latest events, the current state and the maximum depth of the latest events plus 1. // Returns the latest events, the current state and the maximum depth of the latest events plus 1.
// Returns an error if there was a problem talking to the database. // Returns an error if there was a problem talking to the database.
LatestEventIDs(ctx context.Context, roomNID types.RoomNID) ([]gomatrixserverlib.EventReference, types.StateSnapshotNID, int64, error) LatestEventIDs(ctx context.Context, roomNID types.RoomNID) ([]string, types.StateSnapshotNID, int64, error)
// Look up the active invites targeting a user in a room and return the // Look up the active invites targeting a user in a room and return the
// numeric state key IDs for the user IDs who sent them along with the event IDs for the invites. // numeric state key IDs for the user IDs who sent them along with the event IDs for the invites.
// Returns an error if there was a problem talking to the database. // Returns an error if there was a problem talking to the database.
@ -206,7 +206,7 @@ type RoomDatabase interface {
BulkSelectSnapshotsFromEventIDs(ctx context.Context, eventIDs []string) (map[types.StateSnapshotNID][]string, error) BulkSelectSnapshotsFromEventIDs(ctx context.Context, eventIDs []string) (map[types.StateSnapshotNID][]string, error)
StateEntriesForTuples(ctx context.Context, stateBlockNIDs []types.StateBlockNID, stateKeyTuples []types.StateKeyTuple) ([]types.StateEntryList, error) StateEntriesForTuples(ctx context.Context, stateBlockNIDs []types.StateBlockNID, stateKeyTuples []types.StateKeyTuple) ([]types.StateEntryList, error)
AddState(ctx context.Context, roomNID types.RoomNID, stateBlockNIDs []types.StateBlockNID, state []types.StateEntry) (types.StateSnapshotNID, error) AddState(ctx context.Context, roomNID types.RoomNID, stateBlockNIDs []types.StateBlockNID, state []types.StateEntry) (types.StateSnapshotNID, error)
LatestEventIDs(ctx context.Context, roomNID types.RoomNID) ([]gomatrixserverlib.EventReference, types.StateSnapshotNID, int64, error) LatestEventIDs(ctx context.Context, roomNID types.RoomNID) ([]string, types.StateSnapshotNID, int64, error)
GetOrCreateRoomInfo(ctx context.Context, event gomatrixserverlib.PDU) (*types.RoomInfo, error) GetOrCreateRoomInfo(ctx context.Context, event gomatrixserverlib.PDU) (*types.RoomInfo, error)
GetOrCreateEventTypeNID(ctx context.Context, eventType string) (eventTypeNID types.EventTypeNID, err error) GetOrCreateEventTypeNID(ctx context.Context, eventType string) (eventTypeNID types.EventTypeNID, err error)
GetOrCreateEventStateKeyNID(ctx context.Context, eventStateKey *string) (types.EventStateKeyNID, error) GetOrCreateEventStateKeyNID(ctx context.Context, eventStateKey *string) (types.EventStateKeyNID, error)

9
roomserver/storage/shared/storage.go
View file

@ -398,15 +398,13 @@ func (d *EventDatabase) eventsFromIDs(ctx context.Context, txn *sql.Tx, roomInfo
return d.events(ctx, txn, roomInfo.RoomVersion, nids) return d.events(ctx, txn, roomInfo.RoomVersion, nids)
} }
func (d *Database) LatestEventIDs( func (d *Database) LatestEventIDs(ctx context.Context, roomNID types.RoomNID) (references []string, currentStateSnapshotNID types.StateSnapshotNID, depth int64, err error) {
ctx context.Context, roomNID types.RoomNID,
) (references []gomatrixserverlib.EventReference, currentStateSnapshotNID types.StateSnapshotNID, depth int64, err error) {
var eventNIDs []types.EventNID var eventNIDs []types.EventNID
eventNIDs, currentStateSnapshotNID, err = d.RoomsTable.SelectLatestEventNIDs(ctx, nil, roomNID) eventNIDs, currentStateSnapshotNID, err = d.RoomsTable.SelectLatestEventNIDs(ctx, nil, roomNID)
if err != nil { if err != nil {
return return
} }
references, err = d.EventsTable.BulkSelectEventReference(ctx, nil, eventNIDs) eventNIDMap, err := d.EventsTable.BulkSelectEventID(ctx, nil, eventNIDs)
if err != nil { if err != nil {
return return
} }
@ -414,6 +412,9 @@ func (d *Database) LatestEventIDs(
if err != nil { if err != nil {
return return
} }
for _, eventID := range eventNIDMap {
references = append(references, eventID)
}
return return
} }

4
test/room.go
View file

@ -75,7 +75,7 @@ func NewRoom(t *testing.T, creator *User, modifiers ...roomModifier) *Room {
return r return r
} }
func (r *Room) MustGetAuthEventRefsForEvent(t *testing.T, needed gomatrixserverlib.StateNeeded) []gomatrixserverlib.EventReference { func (r *Room) MustGetAuthEventRefsForEvent(t *testing.T, needed gomatrixserverlib.StateNeeded) []string {
t.Helper() t.Helper()
a, err := needed.AuthEventReferences(&r.authEvents) a, err := needed.AuthEventReferences(&r.authEvents)
if err != nil { if err != nil {
@ -176,7 +176,7 @@ func (r *Room) CreateEvent(t *testing.T, creator *User, eventType string, conten
t.Fatalf("CreateEvent[%s]: failed to SetContent: %s", eventType, err) t.Fatalf("CreateEvent[%s]: failed to SetContent: %s", eventType, err)
} }
if depth > 1 { if depth > 1 {
builder.PrevEvents = []gomatrixserverlib.EventReference{{EventSHA256: spec.Base64FromEventID(r.events[len(r.events)-1].EventID()), EventID: r.events[len(r.events)-1].EventID()}} builder.PrevEvents = []string{r.events[len(r.events)-1].EventID()}
} }
err = builder.AddAuthEvents(&r.authEvents) err = builder.AddAuthEvents(&r.authEvents)