diff --git a/CVE-2024-22195.patch b/CVE-2024-22195.patch new file mode 100644 index 0000000000000000000000000000000000000000..e99a1c9a5c2aa04e37adbf2774488bcede01d4ee --- /dev/null +++ b/CVE-2024-22195.patch @@ -0,0 +1,77 @@ +From c4695c78dc41d206a6c79878dea177d6188896b4 Mon Sep 17 00:00:00 2001 +From: Calum Hutton +Date: Thu, 26 Oct 2023 12:08:53 +0100 +Subject: [PATCH] xmlattr filter disallows keys with spaces + +--- + Jinja2-2.10.1/jinja2/filters.py | 26 +++++++++++++++++++------- + Jinja2-2.10.1/tests/test_filters.py | 6 ++++++ + 2 files changed, 25 insertions(+), 7 deletions(-) + +diff --git a/Jinja2-2.10.1/jinja2/filters.py b/Jinja2-2.10.1/jinja2/filters.py +index 267dddd..d473058 100644 +--- a/Jinja2-2.10.1/jinja2/filters.py ++++ b/Jinja2-2.10.1/jinja2/filters.py +@@ -150,11 +150,15 @@ def do_lower(s): + return soft_unicode(s).lower() + + ++_space_re = re.compile(r"\s", flags=re.ASCII) ++ ++ + @evalcontextfilter + def do_xmlattr(_eval_ctx, d, autospace=True): + """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 + +@@ -174,11 +178,19 @@ def do_xmlattr(_eval_ctx, d, autospace=True): + 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. + """ +- rv = u' '.join( +- u'%s="%s"' % (escape(key), escape(value)) +- for key, value in iteritems(d) +- 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 = u' ' + rv + if _eval_ctx.autoescape: +diff --git a/Jinja2-2.10.1/tests/test_filters.py b/Jinja2-2.10.1/tests/test_filters.py +index 8962ced..911d10a 100644 +--- a/Jinja2-2.10.1/tests/test_filters.py ++++ b/Jinja2-2.10.1/tests/test_filters.py +@@ -389,6 +389,12 @@ class TestFilter(object): + assert 'bar="23"' in out + assert 'blub:blub="<?>"' 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) }}') +-- +2.43.0 + diff --git a/python-jinja2.spec b/python-jinja2.spec index 2c783c7b6a7ea24f8a3b9afd59ffbe8815aa4efe..3d5eb81b211ffcacb04261bff72a9f4ef942046f 100755 --- a/python-jinja2.spec +++ b/python-jinja2.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %if 0%{?rhel} > 7 # Disable python2 build by default %bcond_with python2 @@ -40,6 +40,7 @@ Source0: https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-% # Upstream commit: https://github.com/pallets/jinja/pull/1343/commits/ef658dc3b6389b091d608e710a810ce8b87995b3 # Tracking bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1928707 Patch0: CVE-2020-28493.patch +Patch1: CVE-2024-22195.patch BuildArch: noarch @@ -135,6 +136,7 @@ environments. %setup -qc -n Jinja2-%{version} %patch0 -p1 +%patch1 -p1 # cleanup find Jinja2-%{version} -name '*.pyo' -o -name '*.pyc' -delete @@ -242,6 +244,9 @@ popd %changelog +* Fri Jun 07 2024 Kai Song - 2.10.1-3.0.2 +- Fix CVE-2024-22195 + * Wed Jul 20 2022 mgb01105731 - 2.10.1-3.0.1 - Add doc sub package