Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Avoid trusting the content when calculating presentable names. #9165

Merged
merged 7 commits into from
Jan 25, 2021
Merged

Avoid trusting the content when calculating presentable names. #9165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29941dd
Avoid trusting the content when calculating presentable names.
clokep Jan 19, 2021
1586878
Add tests for presentable names.
clokep Jan 20, 2021
c40d61b
Slight optimization -- avoid calculating something until it is needed.
clokep Jan 20, 2021
381b3d8
Slight tweak to tests.
clokep Jan 20, 2021
7b3fd05
Typo
clokep Jan 20, 2021
7acb3b4
Fix tests for Py3.5.
clokep Jan 20, 2021
b2c420b
Params -> Args
clokep Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/9165.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a longstanding bug where invalid data could cause errors when calculating the presentable room name for push.
clokep marked this conversation as resolved.
Show resolved Hide resolved
18 changes: 7 additions & 11 deletions synapse/push/presentable_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import re
from typing import TYPE_CHECKING, Dict, Iterable, Optional

from synapse.api.constants import EventTypes
from synapse.api.constants import EventTypes, Membership
from synapse.events import EventBase
from synapse.types import StateMap

Expand Down Expand Up @@ -63,7 +63,7 @@ async def calculate_room_name(
m_room_name = await store.get_event(
room_state_ids[(EventTypes.Name, "")], allow_none=True
)
if m_room_name and m_room_name.content and m_room_name.content["name"]:
if m_room_name and m_room_name.content and m_room_name.content.get("name"):
return m_room_name.content["name"]

# does it have a canonical alias?
Expand All @@ -74,7 +74,7 @@ async def calculate_room_name(
if (
canon_alias
and canon_alias.content
and canon_alias.content["alias"]
and canon_alias.content.get("alias")
and _looks_like_an_alias(canon_alias.content["alias"])
):
return canon_alias.content["alias"]
Expand All @@ -94,7 +94,7 @@ async def calculate_room_name(

if (
my_member_event is not None
and my_member_event.content["membership"] == "invite"
and my_member_event.content.get("membership") == Membership.INVITE
):
if (EventTypes.Member, my_member_event.sender) in room_state_ids:
inviter_member_event = await store.get_event(
Expand All @@ -120,8 +120,8 @@ async def calculate_room_name(
all_members = [
ev
for ev in member_events.values()
if ev.content["membership"] == "join"
or ev.content["membership"] == "invite"
if ev.content.get("membership") == Membership.JOIN
or ev.content.get("membership") == Membership.INVITE
]
# Sort the member events oldest-first so the we name people in the
# order the joined (it should at least be deterministic rather than
Expand Down Expand Up @@ -194,11 +194,7 @@ def descriptor_from_member_events(member_events: Iterable[EventBase]) -> str:


def name_from_member_event(member_event: EventBase) -> str:
if (
member_event.content
and "displayname" in member_event.content
and member_event.content["displayname"]
):
if member_event.content and member_event.content.get("displayname"):
return member_event.content["displayname"]
return member_event.state_key

Expand Down