Properly check for frozendicts in event auth code. (#14864)

Check for for an instance of a mapping instead of a dict.

This only affects room version 10 when frozen events are enabled.
This commit is contained in:
Patrick Cloke 2023-01-18 09:27:57 -05:00 committed by GitHub
parent e1b2c7095d
commit 4d6b1d3c47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

1
changelog.d/14864.bugfix Normal file
View file

@ -0,0 +1 @@
Fix a bug introduced in Synapse 1.64.0 when using room version 10 with frozen events enabled.

View file

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import collections.abc
import logging import logging
import typing import typing
from typing import ( from typing import (
@ -877,7 +878,7 @@ def _check_power_levels(
if not isinstance(v, int): if not isinstance(v, int):
raise SynapseError(400, f"{v!r} must be an integer.") raise SynapseError(400, f"{v!r} must be an integer.")
if k in {"events", "notifications", "users"}: if k in {"events", "notifications", "users"}:
if not isinstance(v, dict) or not all( if not isinstance(v, collections.abc.Mapping) or not all(
isinstance(v, int) for v in v.values() isinstance(v, int) for v in v.values()
): ):
raise SynapseError( raise SynapseError(