From 25e4b90f898fdadf12528a9d4fd2430766d9213c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Wed, 1 Jun 2022 17:50:36 +0200 Subject: [PATCH 1/3] Check `state_key` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- synapse/push/baserules.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py index 819bc9e9b680..6c0cc5a6ce82 100644 --- a/synapse/push/baserules.py +++ b/synapse/push/baserules.py @@ -290,7 +290,13 @@ def make_base_prepend_rules( "key": "type", "pattern": "m.room.server_acl", "_cache_key": "_room_server_acl", - } + }, + { + "kind": "event_match", + "key": "state_key", + "pattern": "", + "_cache_key": "_room_server_acl_state_key", + }, ], "actions": [], }, From daefa934d5a160e2be96df82d99658623fac7e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Wed, 1 Jun 2022 17:53:54 +0200 Subject: [PATCH 2/3] Add changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- changelog.d/12939.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/12939.feature diff --git a/changelog.d/12939.feature b/changelog.d/12939.feature new file mode 100644 index 000000000000..e4f24f20fc76 --- /dev/null +++ b/changelog.d/12939.feature @@ -0,0 +1 @@ +MSC3786: Check `state_key`. \ No newline at end of file From 4abd46fba714b1055890044e0b28ac164cf4781e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 27 Jun 2022 16:58:10 +0200 Subject: [PATCH 3/3] Update changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- changelog.d/12939.bugfix | 1 + changelog.d/12939.feature | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 changelog.d/12939.bugfix delete mode 100644 changelog.d/12939.feature diff --git a/changelog.d/12939.bugfix b/changelog.d/12939.bugfix new file mode 100644 index 000000000000..d9061cf8e548 --- /dev/null +++ b/changelog.d/12939.bugfix @@ -0,0 +1 @@ +Update [MSC3786](https://github.com/matrix-org/matrix-spec-proposals/pull/3786) implementation to check `state_key`. diff --git a/changelog.d/12939.feature b/changelog.d/12939.feature deleted file mode 100644 index e4f24f20fc76..000000000000 --- a/changelog.d/12939.feature +++ /dev/null @@ -1 +0,0 @@ -MSC3786: Check `state_key`. \ No newline at end of file