Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-04 09:53:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

move federation /download endpoint to stable

Browse source
This commit is contained in:
H. Shay 2024-06-26 20:41:06 -07:00
parent f6db4490e3
commit c3b25c056d
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
synapse/federation/transport/server/__init__.py
View file

@ -32,8 +32,8 @@ from synapse.federation.transport.server._base import (
from synapse.federation.transport.server.federation import ( from synapse.federation.transport.server.federation import (
FEDERATION_SERVLET_CLASSES, FEDERATION_SERVLET_CLASSES,
FederationAccountStatusServlet, FederationAccountStatusServlet,
FederationMediaDownloadServlet,
FederationUnstableClientKeysClaimServlet, FederationUnstableClientKeysClaimServlet,
FederationUnstableMediaDownloadServlet,
) )
from synapse.http.server import HttpServer, JsonResource from synapse.http.server import HttpServer, JsonResource
from synapse.http.servlet import ( from synapse.http.servlet import (
@ -316,11 +316,8 @@ def register_servlets(
): ):
continue continue
if servletclass == FederationUnstableMediaDownloadServlet: if servletclass == FederationMediaDownloadServlet:
if ( if not hs.config.server.enable_media_repo:
not hs.config.server.enable_media_repo
or not hs.config.experimental.msc3916_authenticated_media_enabled
):
continue continue
servletclass( servletclass(

4
synapse/federation/transport/server/_base.py
View file

@ -362,7 +362,7 @@ class BaseFederationServlet:
return None return None
if ( if (
func.__self__.__class__.__name__ # type: ignore func.__self__.__class__.__name__ # type: ignore
== "FederationUnstableMediaDownloadServlet" == "FederationMediaDownloadServlet"
): ):
response = await func( response = await func(
origin, content, request, *args, **kwargs origin, content, request, *args, **kwargs
@ -374,7 +374,7 @@ class BaseFederationServlet:
else: else:
if ( if (
func.__self__.__class__.__name__ # type: ignore func.__self__.__class__.__name__ # type: ignore
== "FederationUnstableMediaDownloadServlet" == "FederationMediaDownloadServlet"
): ):
response = await func( response = await func(
origin, content, request, *args, **kwargs origin, content, request, *args, **kwargs

5
synapse/federation/transport/server/federation.py
View file

@ -790,7 +790,7 @@ class FederationAccountStatusServlet(BaseFederationServerServlet):
return 200, {"account_statuses": statuses, "failures": failures} return 200, {"account_statuses": statuses, "failures": failures}
class FederationUnstableMediaDownloadServlet(BaseFederationServerServlet): class FederationMediaDownloadServlet(BaseFederationServerServlet):
""" """
Implementation of new federation media `/download` endpoint outlined in MSC3916. Returns Implementation of new federation media `/download` endpoint outlined in MSC3916. Returns
a multipart/mixed response consisting of a JSON object and the requested media a multipart/mixed response consisting of a JSON object and the requested media
@ -798,7 +798,6 @@ class FederationUnstableMediaDownloadServlet(BaseFederationServerServlet):
""" """
PATH = "/media/download/(?P<media_id>[^/]*)" PATH = "/media/download/(?P<media_id>[^/]*)"
PREFIX = FEDERATION_UNSTABLE_PREFIX + "/org.matrix.msc3916"
RATELIMIT = True RATELIMIT = True
def __init__( def __init__(
@ -858,5 +857,5 @@ FEDERATION_SERVLET_CLASSES: Tuple[Type[BaseFederationServlet], ...] = (
FederationV1SendKnockServlet, FederationV1SendKnockServlet,
FederationMakeKnockServlet, FederationMakeKnockServlet,
FederationAccountStatusServlet, FederationAccountStatusServlet,
FederationUnstableMediaDownloadServlet, FederationMediaDownloadServlet,
) )