Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-07-29 11:58:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replace also_allow_user with a global config option

Browse source 
Basically reverts 088977f676.

This way is more suitable for self-hosting where there's no gateway to
manage the query parameter.
This commit is contained in:
Tulir Asokan 2021-10-30 14:06:15 +03:00
parent cf45cfd314
commit dbafb7c906
7 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

26
synapse/handlers/room_batch.py
View file

@ -1,5 +1,5 @@
import logging
from typing import TYPE_CHECKING, List, Tuple, Optional
from typing import TYPE_CHECKING, List, Tuple
from synapse.api.constants import EventContentFields, EventTypes
from synapse.appservice import ApplicationService
@ -25,6 +25,7 @@ class RoomBatchHandler:
self.event_creation_handler = hs.get_event_creation_handler()
self.room_member_handler = hs.get_room_member_handler()
self.auth = hs.get_auth()
self.allow_send_any = self.hs.config.meow.appservice_batch_send_any
async def inherit_depth_from_prev_ids(self, prev_event_ids: List[str]) -> int:
"""Finds the depth which would sort it after the most-recent
@ -107,7 +108,7 @@ class RoomBatchHandler:
return insertion_event
async def create_requester_for_user_id_from_app_service(
self, user_id: str, app_service: ApplicationService, also_allow_user: Optional[str] = None,
self, user_id: str, app_service: ApplicationService
) -> Requester:
"""Creates a new requester for the given user_id
and validates that the app service is allowed to control
@ -116,13 +117,13 @@ class RoomBatchHandler:
Args:
user_id: The author MXID that the app service is controlling
app_service: The app service that controls the user
also_allow_user: An additional user ID that the appservice can temporarily control
Returns:
Requester object
"""
await self.auth.validate_appservice_can_control_user_id(app_service, user_id, also_allow_user)
await self.auth.validate_appservice_can_control_user_id(app_service, user_id,
allow_any=self.allow_send_any)
return create_requester(user_id, app_service=app_service)
@ -160,7 +161,6 @@ class RoomBatchHandler:
room_id: str,
initial_auth_event_ids: List[str],
app_service_requester: Requester,
also_allow_user: Optional[str],
) -> List[str]:
"""Takes all `state_events_at_start` event dictionaries and creates/persists
them as floating state events which don't resolve into the current room state.
@ -175,7 +175,6 @@ class RoomBatchHandler:
added to the list of auth events for the next state event
created.
app_service_requester: The requester of an application service.
also_allow_user: An additional user ID that the appservice can temporarily control
Returns:
List of state event ID's we just persisted
@ -217,8 +216,7 @@ class RoomBatchHandler:
membership = event_dict["content"].get("membership", None)
event_id, _ = await self.room_member_handler.update_membership(
await self.create_requester_for_user_id_from_app_service(
state_event["sender"], app_service_requester.app_service,
also_allow_user,
state_event["sender"], app_service_requester.app_service
),
target=UserID.from_string(event_dict["state_key"]),
room_id=room_id,
@ -240,8 +238,7 @@ class RoomBatchHandler:
_,
) = await self.event_creation_handler.create_and_send_nonmember_event(
await self.create_requester_for_user_id_from_app_service(
state_event["sender"], app_service_requester.app_service,
also_allow_user,
state_event["sender"], app_service_requester.app_service
),
event_dict,
outlier=True,
@ -268,7 +265,6 @@ class RoomBatchHandler:
inherited_depth: int,
auth_event_ids: List[str],
app_service_requester: Requester,
also_allow_user: Optional[str],
) -> List[str]:
"""Create and persists all events provided sequentially. Handles the
complexity of creating events in chronological order so they can
@ -289,7 +285,6 @@ class RoomBatchHandler:
auth_event_ids: Define which events allow you to create the given
event in the room.
app_service_requester: The requester of an application service.
also_allow_user: An additional user ID that the appservice can temporarily control
Returns:
List of persisted event IDs
@ -321,7 +316,7 @@ class RoomBatchHandler:
event, context = await self.event_creation_handler.create_event(
await self.create_requester_for_user_id_from_app_service(
ev["sender"], app_service_requester.app_service, also_allow_user,
ev["sender"], app_service_requester.app_service
),
event_dict,
prev_event_ids=event_dict.get("prev_events"),
@ -362,7 +357,7 @@ class RoomBatchHandler:
for (event, context) in reversed(events_to_persist):
await self.event_creation_handler.handle_new_client_event(
await self.create_requester_for_user_id_from_app_service(
event["sender"], app_service_requester.app_service, also_allow_user,
event["sender"], app_service_requester.app_service
),
event=event,
context=context,
@ -379,7 +374,6 @@ class RoomBatchHandler:
inherited_depth: int,
auth_event_ids: List[str],
app_service_requester: Requester,
also_allow_user: Optional[str],
) -> Tuple[List[str], str]:
"""
Handles creating and persisting all of the historical events as well
@ -399,7 +393,6 @@ class RoomBatchHandler:
auth_event_ids: Define which events allow you to create the given
event in the room.
app_service_requester: The requester of an application service.
also_allow_user: An additional user ID that the appservice can temporarily control
Returns:
Tuple containing a list of created events and the next_batch_id
@ -447,7 +440,6 @@ class RoomBatchHandler:
inherited_depth=inherited_depth,
auth_event_ids=auth_event_ids,
app_service_requester=app_service_requester,
also_allow_user=also_allow_user,
)
return event_ids, next_batch_id