78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
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="<?>"' 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
|
|
|