mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 12:41:53 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
b0659a112d
12
CHANGES.md
12
CHANGES.md
@ -1,3 +1,15 @@
|
|||||||
|
Synapse 1.55.2 (2022-03-24)
|
||||||
|
===========================
|
||||||
|
|
||||||
|
This patch version reverts the earlier fixes from Synapse 1.55.1, which could cause problems in certain deployments, and instead adds a cap to the version of Jinja to be installed. Again, this is to fix an incompatibility with version 3.1.0 of the [Jinja](https://pypi.org/project/Jinja2/) library, and again, deployments of Synapse using the `matrixdotorg/synapse` Docker image or Debian packages from packages.matrix.org are not affected.
|
||||||
|
|
||||||
|
Internal Changes
|
||||||
|
----------------
|
||||||
|
|
||||||
|
- Pin Jinja to <3.1.0, as Synapse fails to start with Jinja 3.1.0. ([\#12297](https://github.com/matrix-org/synapse/issues/12297))
|
||||||
|
- Revert changes from 1.55.1 as they caused problems with older versions of Jinja ([\#12296](https://github.com/matrix-org/synapse/issues/12296))
|
||||||
|
|
||||||
|
|
||||||
Synapse 1.55.1 (2022-03-24)
|
Synapse 1.55.1 (2022-03-24)
|
||||||
===========================
|
===========================
|
||||||
|
|
||||||
|
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
|||||||
|
matrix-synapse-py3 (1.55.2) stable; urgency=medium
|
||||||
|
|
||||||
|
* New synapse release 1.55.2.
|
||||||
|
|
||||||
|
-- Synapse Packaging team <packages@matrix.org> Thu, 24 Mar 2022 19:07:11 +0000
|
||||||
|
|
||||||
matrix-synapse-py3 (1.55.1) stable; urgency=medium
|
matrix-synapse-py3 (1.55.1) stable; urgency=medium
|
||||||
|
|
||||||
* New synapse release 1.55.1.
|
* New synapse release 1.55.1.
|
||||||
|
@ -68,7 +68,7 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
__version__ = "1.55.1"
|
__version__ = "1.55.2"
|
||||||
|
|
||||||
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
|
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
|
||||||
# We import here so that we don't have to install a bunch of deps when
|
# We import here so that we don't have to install a bunch of deps when
|
||||||
|
@ -18,7 +18,6 @@ from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, TypeVar
|
|||||||
|
|
||||||
import bleach
|
import bleach
|
||||||
import jinja2
|
import jinja2
|
||||||
from markupsafe import Markup
|
|
||||||
|
|
||||||
from synapse.api.constants import EventTypes, Membership, RoomTypes
|
from synapse.api.constants import EventTypes, Membership, RoomTypes
|
||||||
from synapse.api.errors import StoreError
|
from synapse.api.errors import StoreError
|
||||||
@ -868,7 +867,7 @@ class Mailer:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def safe_markup(raw_html: str) -> Markup:
|
def safe_markup(raw_html: str) -> jinja2.Markup:
|
||||||
"""
|
"""
|
||||||
Sanitise a raw HTML string to a set of allowed tags and attributes, and linkify any bare URLs.
|
Sanitise a raw HTML string to a set of allowed tags and attributes, and linkify any bare URLs.
|
||||||
|
|
||||||
@ -878,7 +877,7 @@ def safe_markup(raw_html: str) -> Markup:
|
|||||||
Returns:
|
Returns:
|
||||||
A Markup object ready to safely use in a Jinja template.
|
A Markup object ready to safely use in a Jinja template.
|
||||||
"""
|
"""
|
||||||
return Markup(
|
return jinja2.Markup(
|
||||||
bleach.linkify(
|
bleach.linkify(
|
||||||
bleach.clean(
|
bleach.clean(
|
||||||
raw_html,
|
raw_html,
|
||||||
@ -892,7 +891,7 @@ def safe_markup(raw_html: str) -> Markup:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def safe_text(raw_text: str) -> Markup:
|
def safe_text(raw_text: str) -> jinja2.Markup:
|
||||||
"""
|
"""
|
||||||
Sanitise text (escape any HTML tags), and then linkify any bare URLs.
|
Sanitise text (escape any HTML tags), and then linkify any bare URLs.
|
||||||
|
|
||||||
@ -902,7 +901,7 @@ def safe_text(raw_text: str) -> Markup:
|
|||||||
Returns:
|
Returns:
|
||||||
A Markup object ready to safely use in a Jinja template.
|
A Markup object ready to safely use in a Jinja template.
|
||||||
"""
|
"""
|
||||||
return Markup(
|
return jinja2.Markup(
|
||||||
bleach.linkify(bleach.clean(raw_text, tags=[], attributes=[], strip=False))
|
bleach.linkify(bleach.clean(raw_text, tags=[], attributes=[], strip=False))
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -74,8 +74,8 @@ REQUIREMENTS = [
|
|||||||
# Note: 21.1.0 broke `/sync`, see #9936
|
# Note: 21.1.0 broke `/sync`, see #9936
|
||||||
"attrs>=19.2.0,!=21.1.0",
|
"attrs>=19.2.0,!=21.1.0",
|
||||||
"netaddr>=0.7.18",
|
"netaddr>=0.7.18",
|
||||||
"Jinja2>=2.9",
|
# Jinja2 3.1.0 removes the deprecated jinja2.Markup class, which we rely on.
|
||||||
"MarkupSafe>=2.0",
|
"Jinja2<3.1.0",
|
||||||
"bleach>=1.4.3",
|
"bleach>=1.4.3",
|
||||||
# We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0.
|
# We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0.
|
||||||
"typing-extensions>=3.10.0",
|
"typing-extensions>=3.10.0",
|
||||||
|
Loading…
Reference in New Issue
Block a user