Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-01-05 13:50:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

pull up event.sender assertion

Browse Source
This commit is contained in:
Richard van der Hoff 2020-10-05 19:00:50 +01:00
parent 2ee302d016
commit fd0282201e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/handlers/message.py
View File

@ -664,10 +664,6 @@ class EventCreationHandler:
500, "Tried to send member event through non-member codepath" 500, "Tried to send member event through non-member codepath"
) )
user = UserID.from_string(event.sender)
assert self.hs.is_mine(user), "User must be our own: %s" % (user,)
ev = await self.handle_new_client_event( ev = await self.handle_new_client_event(
requester=requester, requester=requester,
event=event, event=event,
@ -748,6 +744,10 @@ class EventCreationHandler:
requester, event_dict, token_id=requester.access_token_id, txn_id=txn_id requester, event_dict, token_id=requester.access_token_id, txn_id=txn_id
) )
assert self.hs.is_mine_id(event.sender), "User must be our own: %s" % (
event.sender,
)
spam_error = self.spam_checker.check_event_for_spam(event) spam_error = self.spam_checker.check_event_for_spam(event)
if spam_error: if spam_error:
if not isinstance(spam_error, str): if not isinstance(spam_error, str):

1
synapse/handlers/room.py
View File

@ -185,6 +185,7 @@ class RoomCreationHandler(BaseHandler):
ShadowBanError if the requester is shadow-banned. ShadowBanError if the requester is shadow-banned.
""" """
user_id = requester.user.to_string() user_id = requester.user.to_string()
assert self.hs.is_mine_id(user_id), "User must be our own: %s" % (user_id,)
# start by allocating a new room id # start by allocating a new room id
r = await self.store.get_room(old_room_id) r = await self.store.get_room(old_room_id)