From 24d7a46b16cde8cf0b36daf350c2d459b72d5b14 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 28 Mar 2024 14:02:41 +0000
Subject: [PATCH] import CS python-jinja2-2.10-10.module_el8+910+2209fed2

---
 SOURCES/CVE-2024-22195.patch | 77 ++++++++++++++++++++++++++++++++++++
 SPECS/python-jinja2.spec     | 11 +++++-
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/CVE-2024-22195.patch

diff --git a/SOURCES/CVE-2024-22195.patch b/SOURCES/CVE-2024-22195.patch
new file mode 100644
index 0000000..ce8aa9f
--- /dev/null
+++ b/SOURCES/CVE-2024-22195.patch
@@ -0,0 +1,77 @@
+From 96ac0c552fb0a782a1361dfc65f63c3a134ced03 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
+
+---
+ Jinja2-2.10/jinja2/filters.py     | 26 +++++++++++++++++++-------
+ Jinja2-2.10/tests/test_filters.py |  6 ++++++
+ 2 files changed, 25 insertions(+), 7 deletions(-)
+
+diff --git a/Jinja2-2.10/jinja2/filters.py b/Jinja2-2.10/jinja2/filters.py
+index 267dddd..b73c3ad 100644
+--- a/Jinja2-2.10/jinja2/filters.py
++++ b/Jinja2-2.10/jinja2/filters.py
+@@ -150,11 +150,15 @@ def do_lower(s):
+     return soft_unicode(s).lower()
+ 
+ 
++_space_re = re.compile(r"\s")
++
++
+ @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("Spaces are not allowed in attributes: '{}'".format(key))
++
++        items.append('{}="{}"'.format(escape(key), escape(value)))
++
++    rv = " ".join(items)
++
+     if autospace and rv:
+         rv = u' ' + rv
+     if _eval_ctx.autoescape:
+diff --git a/tests/test_filters.py b/tests/test_filters.py
+index 8962ced..911d10a 100644
+--- a/Jinja2-2.10/tests/test_filters.py
++++ b/Jinja2-2.10/tests/test_filters.py
+@@ -389,6 +389,12 @@ class TestFilter(object):
+         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) }}')
+-- 
+2.43.0
+
diff --git a/SPECS/python-jinja2.spec b/SPECS/python-jinja2.spec
index 278a7ff..bea577b 100644
--- a/SPECS/python-jinja2.spec
+++ b/SPECS/python-jinja2.spec
@@ -21,7 +21,7 @@
 
 Name:           python-jinja2
 Version:        2.10
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        General purpose template engine
 Group:          Development/Languages
 License:        BSD
@@ -34,6 +34,10 @@ Source0:        https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%
 # Tracking bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1928707
 Patch0:         CVE-2020-28493.patch
 
+# Security fix for CVE-2024-22195
+# Resolved upstream: https://github.com/pallets/jinja/commit/7dd3680e6eea0d77fde024763657aa4d884ddb23
+Patch1:         CVE-2024-22195.patch
+
 BuildArch:      noarch
 
 %description
@@ -110,6 +114,7 @@ environments.
 %setup -qc -n Jinja2-%{version}
 
 %patch0 -p1
+%patch1 -p1
 
 # cleanup
 find Jinja2-%{version} -name '*.pyo' -o -name '*.pyc' -delete
@@ -210,6 +215,10 @@ popd
 
 
 %changelog
+* Tue Jan 30 2024 Charalampos Stratakis <cstratak@redhat.com> - 2.10-10
+- Security fix for CVE-2024-22195
+Resolves: RHEL-21348
+
 * Fri Mar 12 2021 Lumír Balhar <lbalhar@redhat.com> - 2.10-9
 - Fix CVE-2020-28493: ReDOS vulnerability due to the sub-pattern
 Resolves: rhbz#1928707