!35 [sync] PR-34: fix CVE-2024-22195

From: @openeuler-sync-bot 
Reviewed-by: @hubin95 
Signed-off-by: @hubin95

backport-CVE-2024-22195.patch

@@ -0,0 +1,82 @@
+From f560975d61cfe4de1111c05cfd6b8c2210845148 Mon Sep 17 00:00:00 2001
+From: Calum Hutton <calum.hutton@snyk.io>
+Date: Thu, 26 Oct 2023 12:08:53 +0100
+Subject: [PATCH] xmlattr filter disallows keys with spaces
+
+Reference:https://github.com/pallets/jinja/commit/7dd3680e6eea0d77fde024763657aa4d884ddb23
+Conflict:remove CHANGES.rst
+---
+ Jinja2-3.0.3/src/jinja2/filters.py | 24 ++++++++++++++++++------
+ Jinja2-3.0.3/tests/test_filters.py |  6 ++++++
+ 2 files changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/Jinja2-3.0.3/src/jinja2/filters.py b/Jinja2-3.0.3/src/jinja2/filters.py
+index ffb98bf..002e129 100644
+--- a/Jinja2-3.0.3/src/jinja2/filters.py
++++ b/Jinja2-3.0.3/src/jinja2/filters.py
+@@ -270,6 +270,7 @@ def do_lower(s: str) -> str:
+     """Convert a value to lowercase."""
+     return soft_str(s).lower()
+ 
++_space_re = re.compile(r"\s", flags=re.ASCII)
+ 
+ @pass_eval_context
+ def do_xmlattr(
+@@ -278,7 +279,8 @@ def do_xmlattr(
+     """Create an SGML/XML attribute string based on the items in a dict.
+     All values that are neither `none` nor `undefined` are automatically
+     escaped:
+-
++    If any key contains a space, this fails with a ``ValueError``. Values that
++    are neither ``none`` nor ``undefined`` are automatically escaped.
+     .. sourcecode:: html+jinja
+ 
+         <ul{{ {'class': 'my_list', 'missing': none,
+@@ -296,12 +298,22 @@ def do_xmlattr(
+ 
+     As you can see it automatically prepends a space in front of the item
+     if the filter returned something unless the second parameter is false.
++
++    .. versionchanged:: 3.1.3
++        Keys with spaces are not allowed.
+     """
+-    rv = " ".join(
+-        f'{escape(key)}="{escape(value)}"'
+-        for key, value in d.items()
+-        if value is not None and not isinstance(value, Undefined)
+-    )
++    items = []
++
++    for key, value in d.items():
++        if value is None or isinstance(value, Undefined):
++            continue
++
++        if _space_re.search(key) is not None:
++            raise ValueError(f"Spaces are not allowed in attributes: '{key}'")
++
++        items.append(f'{escape(key)}="{escape(value)}"')
++
++    rv = " ".join(items)
+ 
+     if autospace and rv:
+         rv = " " + rv
+diff --git a/Jinja2-3.0.3/tests/test_filters.py b/Jinja2-3.0.3/tests/test_filters.py
+index 2195157..45843fd 100644
+--- a/Jinja2-3.0.3/tests/test_filters.py
++++ b/Jinja2-3.0.3/tests/test_filters.py
+@@ -463,6 +463,12 @@ class TestFilter:
+         assert 'bar="23"' in out
+         assert 'blub:blub="&lt;?&gt;"' in out
+ 
++    def test_xmlattr_key_with_spaces(self, env):
++        with pytest.raises(ValueError, match="Spaces are not allowed"):
++            env.from_string(
++                "{{ {'src=1 onerror=alert(1)': 'my_class'}|xmlattr }}"
++            ).render()
++
+     def test_sort1(self, env):
+         tmpl = env.from_string("{{ [2, 3, 1]|sort }}|{{ [2, 3, 1]|sort(true) }}")
+         assert tmpl.render() == "[1, 2, 3]|[3, 2, 1]"
+-- 
+2.33.0
+

python-jinja2.spec

@@ -2,12 +2,14 @@
 
 Name:           python-jinja2
 Version:        3.0.3
-Release:        2
+Release:        3
 Summary:        A full-featured template engine for Python
 License:        BSD
 URL:            http://jinja.pocoo.org/
 Source0:        https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
 
+Patch6000:      backport-CVE-2024-22195.patch
+
 BuildArch:      noarch
 
 %description
@@ -62,6 +64,12 @@ popd
 %doc Jinja2-%{version}/examples
 
 %changelog
+* Mon Jan 22 2024 weihaohao <weihaohao2.huawei.com> - 3.0.3-3
+- Type:CVE
+- CVE:CVE-2024-22195
+- SUG:NA
+- DESC:fix CVE-2024-22195
+
 * Thu Jun 30 2022 wangjiang <wangjiang37@h-partners.com> - 3.0.3-2
 - enable check test suite