From e4ae1a1bb73482e5e17b6e416f4bf0bbf75922a0 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 11 Aug 2020 14:16:14 +0100 Subject: [PATCH] Use transaction origin, update whitelist --- federationapi/routing/send.go | 2 +- sytest-whitelist | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go index bef80281c..cad779219 100644 --- a/federationapi/routing/send.go +++ b/federationapi/routing/send.go @@ -168,7 +168,7 @@ func (t *txnReq) processTransaction() (*gomatrixserverlib.RespSend, *util.JSONRe util.GetLogger(t.context).WithError(err).Warnf("Transaction: Failed to parse event JSON of event %s", string(pdu)) continue } - if currentstateAPI.IsServerBannedFromRoom(t.context, t.stateAPI, event.RoomID(), event.Origin()) { + if currentstateAPI.IsServerBannedFromRoom(t.context, t.stateAPI, event.RoomID(), t.Origin) { results[event.EventID()] = gomatrixserverlib.PDUResult{ Error: "Forbidden by server ACLs", } diff --git a/sytest-whitelist b/sytest-whitelist index 875cc092d..b21d45206 100644 --- a/sytest-whitelist +++ b/sytest-whitelist @@ -436,3 +436,12 @@ User directory correctly update on display name change User in shared private room does appear in user directory User in dir while user still shares private rooms Can get 'm.room.name' state for a departed room (SPEC-216) +Banned servers cannot send events +Banned servers cannot /make_join +Banned servers cannot /send_join +Banned servers cannot /make_leave +Banned servers cannot /send_leave +Banned servers cannot /invite +Banned servers cannot get room state +Banned servers cannot /event_auth +Banned servers cannot get missing events