fix url previewer

element-hq · May 17, 2024 · 31c3615 · 31c3615
1 parent d8a8940
commit 31c3615
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/synapse/rest/client/media.py b/synapse/rest/client/media.py
@@ -195,9 +195,10 @@ async def on_GET(
 def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
     if hs.config.experimental.msc3916_authenticated_media_enabled:
         media_repo = hs.get_media_repository()
-        UnstablePreviewURLServlet(hs, media_repo, media_repo.media_storage).register(
-            http_server
-        )
+        if hs.config.media.url_preview_enabled:
+            UnstablePreviewURLServlet(
+                hs, media_repo, media_repo.media_storage
+            ).register(http_server)
         UnstableMediaConfigResource(hs).register(http_server)
         UnstableThumbnailResource(hs, media_repo, media_repo.media_storage).register(
             http_server

diff --git a/tests/media/test_media_storage.py b/tests/media/test_media_storage.py
@@ -290,14 +290,6 @@ def write_err(f: Failure) -> Failure:
         config = self.default_config()
         config["media_store_path"] = self.media_store_path
         config["max_image_pixels"] = 2000000
-        config["url_preview_enabled"] = True
-        config["max_spider_size"] = 9999999
-        config["url_preview_ip_range_blacklist"] = (
-            "192.168.1.1",
-            "1.0.0.0/8",
-            "3fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
-            "2001:800::/21",
-        )
 
         provider_config = {
             "module": "synapse.media.storage_provider.FileStorageProviderBackend",

diff --git a/tests/rest/client/test_media.py b/tests/rest/client/test_media.py
@@ -66,14 +66,6 @@ def make_homeserver(
         self, reactor: ThreadedMemoryReactorClock, clock: Clock
     ) -> HomeServer:
         config = self.default_config()
-        config["url_preview_enabled"] = True
-        config["max_spider_size"] = 9999999
-        config["url_preview_ip_range_blacklist"] = (
-            "192.168.1.1",
-            "1.0.0.0/8",
-            "3fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
-            "2001:800::/21",
-        )
 
         self.storage_path = self.mktemp()
         self.media_store_path = self.mktemp()
@@ -168,10 +160,10 @@ def test_remote_media_thumbnail_normally_unblocked(self) -> None:
 
 
 class UnstableURLPreviewTests(unittest.HomeserverTestCase):
-    servlets = [media.register_servlets]
     if not lxml:
         skip = "url preview feature requires lxml"
 
+    servlets = [media.register_servlets]
     hijack_auth = True
     user_id = "@test:user"
     end_content = (
@@ -1581,14 +1573,6 @@ def make_homeserver(
     ) -> HomeServer:
         config = self.default_config()
         config["experimental_features"] = {"msc3916_authenticated_media_enabled": True}
-        config["url_preview_enabled"] = True
-        config["max_spider_size"] = 9999999
-        config["url_preview_ip_range_blacklist"] = (
-            "192.168.1.1",
-            "1.0.0.0/8",
-            "3fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
-            "2001:800::/21",
-        )
 
         self.storage_path = self.mktemp()
         self.media_store_path = self.mktemp()