mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-14 05:12:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bump GMSL to pull in v12 sorting bugfix (#3633)

Browse source 
Also keeps processing PDUs even if one of them was bad c.f
https://github.com/element-hq/synapse/issues/7543 suspect moderation
tooling is causing invalid PDUs to be sent, meaning this is now expected
to fail:
```
FAILURE: #655: Server rejects invalid JSON in a version 6 room
```
This commit is contained in:
Kegan Dougal 2025-08-13 13:56:34 +01:00 • committed by GitHub
parent 0945374736
commit 13fb97c1ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/transactionrequest.go
View file

@ -134,6 +134,8 @@ func (t *TxnReq) ProcessTransaction(ctx context.Context) (*fclient.RespSend, *ut
}
event, err := verImpl.NewEventFromUntrustedJSON(pdu)
if err != nil {
/* Do not reject the entire transaction for a single bad PDU, that's dumb.
if _, ok := err.(gomatrixserverlib.BadJSONError); ok {
// Room version 6 states that homeservers should strictly enforce canonical JSON
// on PDUs.
@ -146,7 +148,7 @@ func (t *TxnReq) ProcessTransaction(ctx context.Context) (*fclient.RespSend, *ut
Code: 400,
JSON: spec.BadJSON("PDU contains bad JSON"),
}
}
} */
util.GetLogger(ctx).WithError(err).Debugf("Transaction: Failed to parse event JSON of event %s", string(pdu))
continue
}