Merge branch 'main' into neil/historicallyvalid

Author: neilalexander

.github/workflows/tests.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.23
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
 
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.18", "1.19"]
+        go: ["stable", "1.23"]
     steps:
       - uses: actions/checkout@v3
       - name: Setup go
@@ -50,7 +50,10 @@ jobs:
             ${{ runner.os }}-go${{ matrix.go }}-test-
       - run: go test -race -coverpkg=./... -coverprofile=cover.out $(go list ./...)
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   # run go test on Dendrite with different go versions
   test-dendrite:
@@ -80,11 +83,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.18", "1.19"]
+        go: ["stable", "1.23"]
     steps:
       - uses: actions/checkout@v3
         with:
-          repository: "matrix-org/dendrite"
+          repository: "element-hq/dendrite"
       - name: Install libolm
         run: sudo apt-get install libolm-dev libolm3
       - name: Setup go

.golangci.yml

@@ -2,22 +2,14 @@ run:
   timeout: 5m
 linters:
   enable:
-    - vet
-    - vetshadow
     - typecheck
-    - deadcode
     - gocyclo
-    - golint
-    - varcheck
-    - structcheck
-    - maligned
     - ineffassign
 #    - gosec - complains about weak cryptographic primitive sha1 and TLS InsecureSkipVerify set true in getTransport
     - misspell
     - unparam
     - goimports
-    - goconst
+#    - goconst
     - unconvert
     - errcheck
-    - interfacer
 #    - testify - not available in golangci-lint

README.md

@@ -3,4 +3,4 @@ gomatrixserverlib
 
 [![GoDoc](https://godoc.org/github.com/matrix-org/gomatrixserverlib?status.svg)](https://godoc.org/github.com/matrix-org/gomatrixserverlib)
 
-Go library for common functions needed by matrix servers. This library assumes Go 1.18+.
+Go library for common functions needed by matrix servers. This library assumes Go 1.22+.

authstate.go

@@ -65,7 +65,7 @@ type FederatedStateProvider struct {
 
 // StateIDsBeforeEvent implements StateProvider
 func (p *FederatedStateProvider) StateIDsBeforeEvent(ctx context.Context, event PDU) ([]string, error) {
-	res, err := p.FedClient.LookupStateIDs(ctx, p.Origin, p.Server, event.RoomID(), event.EventID())
+	res, err := p.FedClient.LookupStateIDs(ctx, p.Origin, p.Server, event.RoomID().String(), event.EventID())
 	if err != nil {
 		return nil, err
 	}
@@ -77,7 +77,7 @@ func (p *FederatedStateProvider) StateIDsBeforeEvent(ctx context.Context, event
 
 // StateBeforeEvent implements StateProvider
 func (p *FederatedStateProvider) StateBeforeEvent(ctx context.Context, roomVer RoomVersion, event PDU, eventIDs []string) (map[string]PDU, error) {
-	res, err := p.FedClient.LookupState(ctx, p.Origin, p.Server, event.RoomID(), event.EventID(), roomVer)
+	res, err := p.FedClient.LookupState(ctx, p.Origin, p.Server, event.RoomID().String(), event.EventID(), roomVer)
 	if err != nil {
 		return nil, err
 	}
@@ -165,7 +165,7 @@ func checkAllowedByAuthEvents(
 	event PDU, eventsByID map[string]PDU,
 	missingAuth EventProvider, userIDForSender spec.UserIDForSender,
 ) error {
-	authEvents := NewAuthEvents(nil)
+	authEvents, _ := NewAuthEvents(nil)
 
 	for _, ae := range event.AuthEventIDs() {
 	retryEvent:
@@ -214,7 +214,7 @@ func checkAllowedByAuthEvents(
 
 	// If we made it this far then we've successfully got as many of the auth events as
 	// as described by AuthEventIDs(). Check if they allow the event.
-	if err := Allowed(event, &authEvents, userIDForSender); err != nil {
+	if err := Allowed(event, authEvents, userIDForSender); err != nil {
 		return fmt.Errorf(
 			"gomatrixserverlib: event with ID %q is not allowed by its auth_events: %s",
 			event.EventID(), err.Error(),
@@ -335,7 +335,7 @@ func CheckSendJoinResponse(
 	}
 
 	eventsByID := map[string]PDU{}
-	authEventProvider := NewAuthEvents(nil)
+	authEventProvider, _ := NewAuthEvents(nil)
 
 	// Since checkAllowedByAuthEvents needs to be able to look up any of the
 	// auth events by ID only, we will build a map which contains references
@@ -369,7 +369,7 @@ func CheckSendJoinResponse(
 	}
 
 	// Now check that the join event is valid against the supplied state.
-	if err := Allowed(joinEvent, &authEventProvider, userIDForSender); err != nil {
+	if err := Allowed(joinEvent, authEventProvider, userIDForSender); err != nil {
 		return nil, fmt.Errorf(
 			"gomatrixserverlib: event with ID %q is not allowed by the current room state: %w",
 			joinEvent.EventID(), err,

backfill.go

@@ -99,7 +99,8 @@ func RequestBackfill(ctx context.Context, origin spec.ServerName, b BackfillRequ
 		}
 	}
 
-	return result, lastErr
+	// Since we pulled in results from multiple servers we need to sort again...
+	return ReverseTopologicalOrdering(result, TopologicalOrderByPrevEvents), lastErr
 }
 
 /*

eventV1.go

@@ -104,8 +104,12 @@ func (e *eventV1) Version() RoomVersion {
 	return e.roomVersion
 }
 
-func (e *eventV1) RoomID() string {
-	return e.eventFields.RoomID
+func (e *eventV1) RoomID() spec.RoomID {
+	roomID, err := spec.NewRoomID(e.eventFields.RoomID)
+	if err != nil {
+		panic(fmt.Errorf("RoomID is invalid: %w", err))
+	}
+	return *roomID
 }
 
 func (e *eventV1) Redacts() string {
@@ -211,8 +215,7 @@ func (e *eventV1) SetUnsignedField(path string, value interface{}) error {
 	eventJSON = CanonicalJSONAssumeValid(eventJSON)
 
 	res := gjson.GetBytes(eventJSON, "unsigned")
-	unsigned := RawJSONFromResult(res, eventJSON)
-	e.eventFields.Unsigned = unsigned
+	e.eventFields.Unsigned = []byte(res.Raw)
 
 	e.eventJSON = eventJSON
 
@@ -280,6 +283,10 @@ func newEventFromUntrustedJSONV1(eventJSON []byte, roomVersion IRoomVersion) (PD
 		return nil, err
 	}
 
+	if err := checkID(res.eventFields.RoomID, "room", '!'); err != nil {
+		return nil, err
+	}
+
 	// We know the JSON must be valid here.
 	eventJSON = CanonicalJSONAssumeValid(eventJSON)
 
@@ -323,6 +330,11 @@ func newEventFromTrustedJSONV1(eventJSON []byte, redacted bool, roomVersion IRoo
 	if err := json.Unmarshal(eventJSON, &res); err != nil {
 		return nil, err
 	}
+
+	if err := checkID(res.eventFields.RoomID, "room", '!'); err != nil {
+		return nil, fmt.Errorf("RoomID is invalid: %w", err)
+	}
+
 	res.eventJSON = eventJSON
 	res.roomVersion = roomVersion.Version()
 	res.redacted = redacted
@@ -334,6 +346,11 @@ func newEventFromTrustedJSONWithEventIDV1(eventID string, eventJSON []byte, reda
 	if err := json.Unmarshal(eventJSON, &res); err != nil {
 		return nil, err
 	}
+
+	if err := checkID(res.eventFields.RoomID, "room", '!'); err != nil {
+		return nil, err
+	}
+
 	res.EventIDRaw = eventID
 	res.eventJSON = eventJSON
 	res.roomVersion = roomVersion.Version()

eventV2.go

@@ -140,6 +140,11 @@ func newEventFromUntrustedJSONV2(eventJSON []byte, roomVersion IRoomVersion) (PD
 	if err = json.Unmarshal(eventJSON, &res); err != nil {
 		return nil, err
 	}
+
+	if err := checkID(res.eventFields.RoomID, "room", '!'); err != nil {
+		return nil, err
+	}
+
 	res.roomVersion = roomVersion.Version()
 
 	// We know the JSON must be valid here.
@@ -191,6 +196,9 @@ var lenientByteLimitRoomVersions = map[RoomVersion]struct{}{
 	RoomVersionV8:        {},
 	RoomVersionV9:        {},
 	RoomVersionV10:       {},
+	RoomVersionV11:       {},
+	RoomVersionV12:       {},
+	RoomVersionHydra:     {},
 	RoomVersionPseudoIDs: {},
 	"org.matrix.msc3787": {},
 	"org.matrix.msc3667": {},
@@ -245,10 +253,6 @@ func CheckFields(input PDU) error { // nolint: gocyclo
 		}
 	}
 
-	if err := checkID(input.RoomID(), "room", '!'); err != nil {
-		return err
-	}
-
 	switch input.Version() {
 	case RoomVersionPseudoIDs:
 	default:
@@ -265,6 +269,11 @@ func newEventFromTrustedJSONV2(eventJSON []byte, redacted bool, roomVersion IRoo
 	if err := json.Unmarshal(eventJSON, &res); err != nil {
 		return nil, err
 	}
+
+	if err := checkID(res.eventFields.RoomID, "room", '!'); err != nil {
+		return nil, err
+	}
+
 	res.roomVersion = roomVersion.Version()
 	res.redacted = redacted
 	res.eventJSON = eventJSON
@@ -276,6 +285,11 @@ func newEventFromTrustedJSONWithEventIDV2(eventID string, eventJSON []byte, reda
 	if err := json.Unmarshal(eventJSON, &res); err != nil {
 		return nil, err
 	}
+
+	if err := checkID(res.eventFields.RoomID, "room", '!'); err != nil {
+		return nil, err
+	}
+
 	res.roomVersion = roomVersion.Version()
 	res.eventJSON = eventJSON
 	res.EventIDRaw = eventID

eventV2_test.go

@@ -152,9 +152,11 @@ func TestCheckFields(t *testing.T) {
 				t.Run(tt.name+"-"+string(roomVersion), func(t *testing.T) {
 					ev, err := MustGetRoomVersion(roomVersion).NewEventBuilderFromProtoEvent(&tt.input).Build(time.Now(), "localhost", "ed25519:1", sk)
 					tt.wantErr(t, err)
-					err = CheckFields(ev)
-					tt.wantErr(t, err, fmt.Sprintf("CheckFields(%v)", tt.input))
-					t.Logf("%v", err)
+					if ev != nil {
+						err = CheckFields(ev)
+						tt.wantErr(t, err, fmt.Sprintf("CheckFields(%v)", tt.input))
+						t.Logf("%v", err)
+					}
 					switch e := err.(type) {
 					case EventValidationError:
 						assert.Equalf(t, tt.wantPersistable, e.Persistable, "unexpected persistable")