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

Commit c3eb1e3

Browse files
author
Sean Quah
committed
Complain if a federation endpoint has the @cancellable flag
`BaseFederationServlet` wraps its endpoints in a bunch of async code that has not been vetted for compatibility with cancellation. Fail CI if a `@cancellable` flag is applied to a federation endpoint. Signed-off-by: Sean Quah <seanq@element.io>
1 parent 2326bbf commit c3eb1e3

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

  • synapse/federation/transport/server

synapse/federation/transport/server/_base.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
from synapse.api.errors import Codes, FederationDeniedError, SynapseError
2323
from synapse.api.urls import FEDERATION_V1_PREFIX
24-
from synapse.http.server import HttpServer, ServletCallback
24+
from synapse.http.server import HttpServer, ServletCallback, is_method_cancellable
2525
from synapse.http.servlet import parse_json_object_from_request
2626
from synapse.http.site import SynapseRequest
2727
from synapse.logging.context import run_in_background
@@ -373,6 +373,15 @@ def register(self, server: HttpServer) -> None:
373373
if code is None:
374374
continue
375375

376+
if is_method_cancellable(code):
377+
# The wrapper added by `self._wrap` will inherit the cancellable flag,
378+
# but the wrapper itself does not support cancellation yet.
379+
raise Exception(
380+
f"{self.__class__.__name__}.on_{method} has been marked as "
381+
"cancellable, but federation servlets do not support cancellation "
382+
"yet."
383+
)
384+
376385
server.register_paths(
377386
method,
378387
(pattern,),

0 commit comments

Comments
 (0)