mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-08-31 16:51:58 +00:00
Allow redacting events on workers (#8994)
Adds the redacts endpoint to workers that have the client listener.
This commit is contained in:
parent
d0c3c24eb2
commit
68bb26da69
1
changelog.d/8994.feature
Normal file
1
changelog.d/8994.feature
Normal file
@ -0,0 +1 @@
|
|||||||
|
Allow running the redact endpoint on workers.
|
@ -229,6 +229,7 @@ expressions:
|
|||||||
^/_matrix/client/(r0|unstable)/auth/.*/fallback/web$
|
^/_matrix/client/(r0|unstable)/auth/.*/fallback/web$
|
||||||
|
|
||||||
# Event sending requests
|
# Event sending requests
|
||||||
|
^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/redact
|
||||||
^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/send
|
^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/send
|
||||||
^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/state/
|
^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/state/
|
||||||
^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)$
|
^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)$
|
||||||
|
@ -89,7 +89,7 @@ from synapse.replication.tcp.streams import (
|
|||||||
ToDeviceStream,
|
ToDeviceStream,
|
||||||
)
|
)
|
||||||
from synapse.rest.admin import register_servlets_for_media_repo
|
from synapse.rest.admin import register_servlets_for_media_repo
|
||||||
from synapse.rest.client.v1 import events
|
from synapse.rest.client.v1 import events, room
|
||||||
from synapse.rest.client.v1.initial_sync import InitialSyncRestServlet
|
from synapse.rest.client.v1.initial_sync import InitialSyncRestServlet
|
||||||
from synapse.rest.client.v1.login import LoginRestServlet
|
from synapse.rest.client.v1.login import LoginRestServlet
|
||||||
from synapse.rest.client.v1.profile import (
|
from synapse.rest.client.v1.profile import (
|
||||||
@ -98,20 +98,6 @@ from synapse.rest.client.v1.profile import (
|
|||||||
ProfileRestServlet,
|
ProfileRestServlet,
|
||||||
)
|
)
|
||||||
from synapse.rest.client.v1.push_rule import PushRuleRestServlet
|
from synapse.rest.client.v1.push_rule import PushRuleRestServlet
|
||||||
from synapse.rest.client.v1.room import (
|
|
||||||
JoinedRoomMemberListRestServlet,
|
|
||||||
JoinRoomAliasServlet,
|
|
||||||
PublicRoomListRestServlet,
|
|
||||||
RoomEventContextServlet,
|
|
||||||
RoomInitialSyncRestServlet,
|
|
||||||
RoomMemberListRestServlet,
|
|
||||||
RoomMembershipRestServlet,
|
|
||||||
RoomMessageListRestServlet,
|
|
||||||
RoomSendEventRestServlet,
|
|
||||||
RoomStateEventRestServlet,
|
|
||||||
RoomStateRestServlet,
|
|
||||||
RoomTypingRestServlet,
|
|
||||||
)
|
|
||||||
from synapse.rest.client.v1.voip import VoipRestServlet
|
from synapse.rest.client.v1.voip import VoipRestServlet
|
||||||
from synapse.rest.client.v2_alpha import groups, sync, user_directory
|
from synapse.rest.client.v2_alpha import groups, sync, user_directory
|
||||||
from synapse.rest.client.v2_alpha._base import client_patterns
|
from synapse.rest.client.v2_alpha._base import client_patterns
|
||||||
@ -512,12 +498,6 @@ class GenericWorkerServer(HomeServer):
|
|||||||
elif name == "client":
|
elif name == "client":
|
||||||
resource = JsonResource(self, canonical_json=False)
|
resource = JsonResource(self, canonical_json=False)
|
||||||
|
|
||||||
PublicRoomListRestServlet(self).register(resource)
|
|
||||||
RoomMemberListRestServlet(self).register(resource)
|
|
||||||
JoinedRoomMemberListRestServlet(self).register(resource)
|
|
||||||
RoomStateRestServlet(self).register(resource)
|
|
||||||
RoomEventContextServlet(self).register(resource)
|
|
||||||
RoomMessageListRestServlet(self).register(resource)
|
|
||||||
RegisterRestServlet(self).register(resource)
|
RegisterRestServlet(self).register(resource)
|
||||||
LoginRestServlet(self).register(resource)
|
LoginRestServlet(self).register(resource)
|
||||||
ThreepidRestServlet(self).register(resource)
|
ThreepidRestServlet(self).register(resource)
|
||||||
@ -526,22 +506,19 @@ class GenericWorkerServer(HomeServer):
|
|||||||
VoipRestServlet(self).register(resource)
|
VoipRestServlet(self).register(resource)
|
||||||
PushRuleRestServlet(self).register(resource)
|
PushRuleRestServlet(self).register(resource)
|
||||||
VersionsRestServlet(self).register(resource)
|
VersionsRestServlet(self).register(resource)
|
||||||
RoomSendEventRestServlet(self).register(resource)
|
|
||||||
RoomMembershipRestServlet(self).register(resource)
|
|
||||||
RoomStateEventRestServlet(self).register(resource)
|
|
||||||
JoinRoomAliasServlet(self).register(resource)
|
|
||||||
ProfileAvatarURLRestServlet(self).register(resource)
|
ProfileAvatarURLRestServlet(self).register(resource)
|
||||||
ProfileDisplaynameRestServlet(self).register(resource)
|
ProfileDisplaynameRestServlet(self).register(resource)
|
||||||
ProfileRestServlet(self).register(resource)
|
ProfileRestServlet(self).register(resource)
|
||||||
KeyUploadServlet(self).register(resource)
|
KeyUploadServlet(self).register(resource)
|
||||||
AccountDataServlet(self).register(resource)
|
AccountDataServlet(self).register(resource)
|
||||||
RoomAccountDataServlet(self).register(resource)
|
RoomAccountDataServlet(self).register(resource)
|
||||||
RoomTypingRestServlet(self).register(resource)
|
|
||||||
|
|
||||||
sync.register_servlets(self, resource)
|
sync.register_servlets(self, resource)
|
||||||
events.register_servlets(self, resource)
|
events.register_servlets(self, resource)
|
||||||
|
room.register_servlets(self, resource, True)
|
||||||
|
room.register_deprecated_servlets(self, resource)
|
||||||
InitialSyncRestServlet(self).register(resource)
|
InitialSyncRestServlet(self).register(resource)
|
||||||
RoomInitialSyncRestServlet(self).register(resource)
|
|
||||||
|
|
||||||
user_directory.register_servlets(self, resource)
|
user_directory.register_servlets(self, resource)
|
||||||
|
|
||||||
|
@ -963,25 +963,28 @@ def register_txn_path(servlet, regex_string, http_server, with_get=False):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def register_servlets(hs, http_server):
|
def register_servlets(hs, http_server, is_worker=False):
|
||||||
RoomStateEventRestServlet(hs).register(http_server)
|
RoomStateEventRestServlet(hs).register(http_server)
|
||||||
RoomCreateRestServlet(hs).register(http_server)
|
|
||||||
RoomMemberListRestServlet(hs).register(http_server)
|
RoomMemberListRestServlet(hs).register(http_server)
|
||||||
JoinedRoomMemberListRestServlet(hs).register(http_server)
|
JoinedRoomMemberListRestServlet(hs).register(http_server)
|
||||||
RoomMessageListRestServlet(hs).register(http_server)
|
RoomMessageListRestServlet(hs).register(http_server)
|
||||||
JoinRoomAliasServlet(hs).register(http_server)
|
JoinRoomAliasServlet(hs).register(http_server)
|
||||||
RoomForgetRestServlet(hs).register(http_server)
|
|
||||||
RoomMembershipRestServlet(hs).register(http_server)
|
RoomMembershipRestServlet(hs).register(http_server)
|
||||||
RoomSendEventRestServlet(hs).register(http_server)
|
RoomSendEventRestServlet(hs).register(http_server)
|
||||||
PublicRoomListRestServlet(hs).register(http_server)
|
PublicRoomListRestServlet(hs).register(http_server)
|
||||||
RoomStateRestServlet(hs).register(http_server)
|
RoomStateRestServlet(hs).register(http_server)
|
||||||
RoomRedactEventRestServlet(hs).register(http_server)
|
RoomRedactEventRestServlet(hs).register(http_server)
|
||||||
RoomTypingRestServlet(hs).register(http_server)
|
RoomTypingRestServlet(hs).register(http_server)
|
||||||
SearchRestServlet(hs).register(http_server)
|
|
||||||
JoinedRoomsRestServlet(hs).register(http_server)
|
|
||||||
RoomEventServlet(hs).register(http_server)
|
|
||||||
RoomEventContextServlet(hs).register(http_server)
|
RoomEventContextServlet(hs).register(http_server)
|
||||||
RoomAliasListServlet(hs).register(http_server)
|
|
||||||
|
# Some servlets only get registered for the main process.
|
||||||
|
if not is_worker:
|
||||||
|
RoomCreateRestServlet(hs).register(http_server)
|
||||||
|
RoomForgetRestServlet(hs).register(http_server)
|
||||||
|
SearchRestServlet(hs).register(http_server)
|
||||||
|
JoinedRoomsRestServlet(hs).register(http_server)
|
||||||
|
RoomEventServlet(hs).register(http_server)
|
||||||
|
RoomAliasListServlet(hs).register(http_server)
|
||||||
|
|
||||||
|
|
||||||
def register_deprecated_servlets(hs, http_server):
|
def register_deprecated_servlets(hs, http_server):
|
||||||
|
Loading…
Reference in New Issue
Block a user