mirror of
https://github.com/element-hq/synapse.git
synced 2024-11-23 18:15:53 +03:00
9512b84a72
Bumps [mypy](https://github.com/python/mypy) from 1.10.1 to 1.11.2. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/python/mypy/blob/master/CHANGELOG.md">mypy's changelog</a>.</em></p> <blockquote> <h3>Mypy 1.11.2</h3> <ul> <li>Alternative fix for a union-like literal string (Ivan Levkivskyi, PR <a href="https://redirect.github.com/python/mypy/pull/17639">17639</a>)</li> <li>Unwrap <code>TypedDict</code> item types before storing (Ivan Levkivskyi, PR <a href="https://redirect.github.com/python/mypy/pull/17640">17640</a>)</li> </ul> <h3>Acknowledgements</h3> <p>Thanks to all mypy contributors who contributed to this release:</p> <ul> <li>Alex Waygood</li> <li>Alexander Leopold Shon</li> <li>Ali Hamdan</li> <li>Anders Kaseorg</li> <li>Ben Brown</li> <li>Bénédikt Tran</li> <li>bzoracler</li> <li>Christoph Tyralla</li> <li>Christopher Barber</li> <li>dexterkennedy</li> <li>gilesgc</li> <li>GiorgosPapoutsakis</li> <li>Ivan Levkivskyi</li> <li>Jelle Zijlstra</li> <li>Jukka Lehtosalo</li> <li>Marc Mueller</li> <li>Matthieu Devlin</li> <li>Michael R. Crusoe</li> <li>Nikita Sobolev</li> <li>Seo Sanghyeon</li> <li>Shantanu</li> <li>sobolevn</li> <li>Steven Troxler</li> <li>Tadeu Manoel</li> <li>Tamir Duberstein</li> <li>Tushar Sadhwani</li> <li>urnest</li> <li>Valentin Stanciu</li> </ul> <p>I’d also like to thank my employer, Dropbox, for supporting mypy development.</p> <h2>Mypy 1.10</h2> <p>We’ve just uploaded mypy 1.10 to the Python Package Index (<a href="https://pypi.org/project/mypy/">PyPI</a>). Mypy is a static type checker for Python. This release includes new features, performance improvements and bug fixes. You can install it as follows:</p> <pre><code>python3 -m pip install -U mypy </code></pre> <p>You can read the full documentation for this release on <a href="http://mypy.readthedocs.io">Read the Docs</a>.</p> <h3>Support TypeIs (PEP 742)</h3> <p>Mypy now supports <code>TypeIs</code> (<a href="https://peps.python.org/pep-0742/">PEP 742</a>), which allows</p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="789f02c83a
"><code>789f02c</code></a> Bump version to 1.11.2</li> <li><a href="917cc75fd6
"><code>917cc75</code></a> An alternative fix for a union-like literal string (<a href="https://redirect.github.com/python/mypy/issues/17639">#17639</a>)</li> <li><a href="7d805b364e
"><code>7d805b3</code></a> Unwrap TypedDict item types before storing (<a href="https://redirect.github.com/python/mypy/issues/17640">#17640</a>)</li> <li><a href="32675dddfa
"><code>32675dd</code></a> Revert "Fix Literal strings containing pipe characters" (<a href="https://redirect.github.com/python/mypy/issues/17638">#17638</a>)</li> <li><a href="778542b93a
"><code>778542b</code></a> Revert "Fix <code>RawExpressionType.accept</code> crash with <code>--cache-fine-grained</code>" (<a href="https://redirect.github.com/python/mypy/issues/1">#1</a>...</li> <li><a href="14ab742dec
"><code>14ab742</code></a> Bump version to 1.11.2+dev</li> <li><a href="570b90a7a3
"><code>570b90a</code></a> Bump version to 1.11</li> <li><a href="b3a102ef31
"><code>b3a102e</code></a> Fix <code>RawExpressionType.accept</code> crash with <code>--cache-fine-grained</code> (<a href="https://redirect.github.com/python/mypy/issues/17588">#17588</a>)</li> <li><a href="aec04c7448
"><code>aec04c7</code></a> Fix PEP 604 isinstance caching (<a href="https://redirect.github.com/python/mypy/issues/17563">#17563</a>)</li> <li><a href="cb44e4d8f1
"><code>cb44e4d</code></a> Fix <code>typing.TypeAliasType</code> being undefined on python < 3.12 (<a href="https://redirect.github.com/python/mypy/issues/17558">#17558</a>)</li> <li>Additional commits viewable in <a href="https://github.com/python/mypy/compare/v1.10.1...v1.11.2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mypy&package-manager=pip&previous-version=1.10.1&new-version=1.11.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
172 lines
6.8 KiB
Python
172 lines
6.8 KiB
Python
#
|
||
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
||
#
|
||
# Copyright 2021 The Matrix.org Foundation C.I.C.
|
||
# Copyright (C) 2023 New Vector, Ltd
|
||
#
|
||
# This program is free software: you can redistribute it and/or modify
|
||
# it under the terms of the GNU Affero General Public License as
|
||
# published by the Free Software Foundation, either version 3 of the
|
||
# License, or (at your option) any later version.
|
||
#
|
||
# See the GNU Affero General Public License for more details:
|
||
# <https://www.gnu.org/licenses/agpl-3.0.html>.
|
||
#
|
||
# Originally licensed under the Apache License, Version 2.0:
|
||
# <http://www.apache.org/licenses/LICENSE-2.0>.
|
||
#
|
||
# [This file includes modifications made by New Vector Limited]
|
||
#
|
||
#
|
||
|
||
import json
|
||
from typing import Any
|
||
|
||
from parameterized import parameterized
|
||
|
||
from twisted.test.proto_helpers import MemoryReactor
|
||
|
||
from synapse.media.oembed import OEmbedProvider, OEmbedResult
|
||
from synapse.server import HomeServer
|
||
from synapse.types import JsonDict
|
||
from synapse.util import Clock
|
||
|
||
from tests.unittest import HomeserverTestCase
|
||
|
||
try:
|
||
import lxml
|
||
except ImportError:
|
||
lxml = None # type: ignore[assignment]
|
||
|
||
|
||
class OEmbedTests(HomeserverTestCase):
|
||
if not lxml:
|
||
skip = "url preview feature requires lxml"
|
||
|
||
def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
|
||
self.oembed = OEmbedProvider(hs)
|
||
|
||
def parse_response(self, response: JsonDict) -> OEmbedResult:
|
||
return self.oembed.parse_oembed_response(
|
||
"https://test", json.dumps(response).encode("utf-8")
|
||
)
|
||
|
||
def test_version(self) -> None:
|
||
"""Accept versions that are similar to 1.0 as a string or int (or missing)."""
|
||
version: Any
|
||
for version in ("1.0", 1.0, 1):
|
||
result = self.parse_response({"version": version})
|
||
# An empty Open Graph response is an error, ensure the URL is included.
|
||
self.assertIn("og:url", result.open_graph_result)
|
||
|
||
# A missing version should be treated as 1.0.
|
||
result = self.parse_response({"type": "link"})
|
||
self.assertIn("og:url", result.open_graph_result)
|
||
|
||
# Invalid versions should be rejected.
|
||
for version in ("2.0", "1", 1.1, 0, None, {}, []):
|
||
result = self.parse_response({"version": version, "type": "link"})
|
||
# An empty Open Graph response is an error, ensure the URL is included.
|
||
self.assertEqual({}, result.open_graph_result)
|
||
|
||
def test_cache_age(self) -> None:
|
||
"""Ensure a cache-age is parsed properly."""
|
||
cache_age: Any
|
||
# Correct-ish cache ages are allowed.
|
||
for cache_age in ("1", 1.0, 1):
|
||
result = self.parse_response({"cache_age": cache_age})
|
||
self.assertEqual(result.cache_age, 1000)
|
||
|
||
# Invalid cache ages are ignored.
|
||
for cache_age in ("invalid", {}):
|
||
result = self.parse_response({"cache_age": cache_age})
|
||
self.assertIsNone(result.cache_age)
|
||
|
||
# Cache age is optional.
|
||
result = self.parse_response({})
|
||
self.assertIsNone(result.cache_age)
|
||
|
||
@parameterized.expand(
|
||
[
|
||
("title", "title"),
|
||
("provider_name", "site_name"),
|
||
("thumbnail_url", "image"),
|
||
],
|
||
name_func=lambda func, num, p: f"{func.__name__}_{p.args[0]}",
|
||
)
|
||
def test_property(self, oembed_property: str, open_graph_property: str) -> None:
|
||
"""Test properties which must be strings."""
|
||
result = self.parse_response({oembed_property: "test"})
|
||
self.assertIn(f"og:{open_graph_property}", result.open_graph_result)
|
||
self.assertEqual(result.open_graph_result[f"og:{open_graph_property}"], "test")
|
||
|
||
result = self.parse_response({oembed_property: 1})
|
||
self.assertNotIn(f"og:{open_graph_property}", result.open_graph_result)
|
||
|
||
def test_author_name(self) -> None:
|
||
"""Test the author_name property."""
|
||
result = self.parse_response({"author_name": "test"})
|
||
self.assertEqual(result.author_name, "test")
|
||
|
||
result = self.parse_response({"author_name": 1})
|
||
self.assertIsNone(result.author_name)
|
||
|
||
def test_rich(self) -> None:
|
||
"""Test a type of rich."""
|
||
result = self.parse_response({"html": "test<img src='foo'>", "type": "rich"})
|
||
self.assertIn("og:description", result.open_graph_result)
|
||
self.assertIn("og:image", result.open_graph_result)
|
||
self.assertEqual(result.open_graph_result["og:description"], "test")
|
||
self.assertEqual(result.open_graph_result["og:image"], "foo")
|
||
|
||
result = self.parse_response({"type": "rich"})
|
||
self.assertNotIn("og:description", result.open_graph_result)
|
||
|
||
result = self.parse_response({"html": 1, "type": "rich"})
|
||
self.assertNotIn("og:description", result.open_graph_result)
|
||
|
||
def test_photo(self) -> None:
|
||
"""Test a type of photo."""
|
||
result = self.parse_response({"url": "test", "type": "photo"})
|
||
self.assertIn("og:image", result.open_graph_result)
|
||
self.assertEqual(result.open_graph_result["og:image"], "test")
|
||
|
||
result = self.parse_response({"type": "photo"})
|
||
self.assertNotIn("og:image", result.open_graph_result)
|
||
|
||
result = self.parse_response({"url": 1, "type": "photo"})
|
||
self.assertNotIn("og:image", result.open_graph_result)
|
||
|
||
def test_video(self) -> None:
|
||
"""Test a type of video."""
|
||
result = self.parse_response({"html": "test", "type": "video"})
|
||
self.assertIn("og:type", result.open_graph_result)
|
||
self.assertEqual(result.open_graph_result["og:type"], "video.other")
|
||
self.assertIn("og:description", result.open_graph_result)
|
||
self.assertEqual(result.open_graph_result["og:description"], "test")
|
||
|
||
result = self.parse_response({"type": "video"})
|
||
self.assertIn("og:type", result.open_graph_result)
|
||
self.assertEqual(result.open_graph_result["og:type"], "video.other")
|
||
self.assertNotIn("og:description", result.open_graph_result)
|
||
|
||
result = self.parse_response({"url": 1, "type": "video"})
|
||
self.assertIn("og:type", result.open_graph_result)
|
||
self.assertEqual(result.open_graph_result["og:type"], "video.other")
|
||
self.assertNotIn("og:description", result.open_graph_result)
|
||
|
||
def test_link(self) -> None:
|
||
"""Test type of link."""
|
||
result = self.parse_response({"type": "link"})
|
||
self.assertIn("og:type", result.open_graph_result)
|
||
self.assertEqual(result.open_graph_result["og:type"], "website")
|
||
|
||
def test_title_html_entities(self) -> None:
|
||
"""Test HTML entities in title"""
|
||
result = self.parse_response(
|
||
{"title": "Why JSON isn’t a Good Configuration Language"}
|
||
)
|
||
self.assertEqual(
|
||
result.open_graph_result["og:title"],
|
||
"Why JSON isn’t a Good Configuration Language",
|
||
)
|