Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support MSC3916 by adding unstable media endpoints to _matrix/client #17213

Merged
merged 8 commits into from
May 24, 2024
Merged

Support MSC3916 by adding unstable media endpoints to _matrix/client #17213

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9579192
add unstable media endpoints to /_matrix/client
H-Shay May 17, 2024
304c716
move code specific to thumbnailing to thumbnailer
H-Shay May 17, 2024
27cd76d
add experimental config option
H-Shay May 17, 2024
35d21c2
tests
H-Shay May 17, 2024
d8a8940
newsfragment
H-Shay May 17, 2024
31c3615
fix url previewer
H-Shay May 17, 2024
814c191
fix import error
H-Shay May 17, 2024
36bad96
add unstable/stable url to class parameterization
H-Shay May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix url previewer
  • Loading branch information
@H-Shay
H-Shay committed May 17, 2024
commit 31c3615c74468c385be448d871a75ad6a4828786
7 changes: 4 additions & 3 deletions synapse/rest/client/media.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions tests/media/test_media_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 1 addition & 17 deletions tests/rest/client/test_media.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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 = (
Expand Down Expand Up @@ -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()
Expand Down
Loading