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

Make redaction check easier to read; check redact PL

Browse source
This commit is contained in:
Till Faelligen 2023-03-02 11:28:36 +01:00
parent 6b1c9eafa9
commit b8aa0c7c92
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -283,6 +283,17 @@ func (r *Inputer) processRoomEvent(
logger.WithError(rejectionErr).Warnf("Event %s not allowed by auth events", event.EventID())
}
if event.Type() == gomatrixserverlib.MRoomRedaction {
ap, _ := authEvents.PowerLevels()
if ap != nil {
var powerLevels *gomatrixserverlib.PowerLevelContent
powerLevels, _ = ap.PowerLevels()
if powerLevels != nil {
redactAllowed = powerLevels.UserLevel(event.Sender()) >= powerLevels.Redact
}
}
}
// Accumulate the auth event NIDs.
authEventIDs := event.AuthEventIDs()
authEventNIDs := make([]types.EventNID, 0, len(authEventIDs))

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

@ -966,11 +966,14 @@ func (d *EventDatabase) MaybeRedactEvent(
return nil
}
// 1. The power level of the redaction event’s sender is greater than or equal to the redact level. (redactAllowed)
// 2. The domain of the redaction event’s sender matches that of the original event’s sender.
_, sender1, _ := gomatrixserverlib.SplitID('@', redactedEvent.Sender())
_, sender2, _ := gomatrixserverlib.SplitID('@', redactionEvent.Sender())
if !redactAllowed || sender1 != sender2 {
switch {
case redactAllowed:
// 1. The power level of the redaction event’s sender is greater than or equal to the redact level.
case sender1 == sender2:
// 2. The domain of the redaction event’s sender matches that of the original event’s sender.
default:
ignoreRedaction = true
return nil
}