From 8bb6ba37f691137655a44c2f5fa4096bcc7e81b0 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 adpat _space_re
---
 Jinja2-2.11.2/src/jinja2/filters.py | 24 ++++++++++++++++++------
 Jinja2-2.11.2/tests/test_filters.py |  6 ++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Jinja2-2.11.2/src/jinja2/filters.py b/Jinja2-2.11.2/src/jinja2/filters.py
index 9741567..3230539 100644
--- a/Jinja2-2.11.2/src/jinja2/filters.py
+++ b/Jinja2-2.11.2/src/jinja2/filters.py
@@ -204,13 +204,15 @@ def do_lower(s):
     """Convert a value to lowercase."""
     return soft_unicode(s).lower()
 
+_space_re = re.compile(r"\s", re.U)
 
 @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
 
         <ul{{ {'class': 'my_list', 'missing': none,
@@ -228,12 +230,22 @@ 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.
+
+    .. versionchanged:: 3.1.3
+        Keys with spaces are not allowed.
     """
-    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/Jinja2-2.11.2/tests/test_filters.py b/Jinja2-2.11.2/tests/test_filters.py
index 388c346..6e697f3 100644
--- a/Jinja2-2.11.2/tests/test_filters.py
+++ b/Jinja2-2.11.2/tests/test_filters.py
@@ -440,6 +440,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) }}")
         assert tmpl.render() == "[1, 2, 3]|[3, 2, 1]"
-- 
2.33.0