diff --git a/RHEL-22174-kubevirt-fix-bundled-jinja2-CVE-2024-22195.patch b/RHEL-22174-kubevirt-fix-bundled-jinja2-CVE-2024-22195.patch new file mode 100644 index 0000000..cdc3fb8 --- /dev/null +++ b/RHEL-22174-kubevirt-fix-bundled-jinja2-CVE-2024-22195.patch @@ -0,0 +1,63 @@ +From 7dd3680e6eea0d77fde024763657aa4d884ddb23 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 + +--- + CHANGES.rst | 1 + + src/jinja2/filters.py | 28 +++++++++++++++++++++------- + tests/test_filters.py | 6 ++++++ + 3 files changed, 28 insertions(+), 7 deletions(-) + +diff --git a/src/jinja2/filters.py b/src/jinja2/filters.py +index ed07c4c0e..c7ecc9bb6 100644 +--- a/kubevirt/jinja2/filters.py ++++ b/kubevirt/jinja2/filters.py +@@ -248,13 +248,17 @@ def do_items(value: t.Union[t.Mapping[K, V], Undefined]) -> t.Iterator[t.Tuple[K + yield from value.items() + + ++_space_re = re.compile(r"\s", flags=re.ASCII) ++ ++ + @pass_eval_context + def do_xmlattr( + eval_ctx: "EvalContext", d: t.Mapping[str, t.Any], autospace: bool = True + ) -> str: + """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 + +@@ -273,12 +277,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/fence-agents.spec b/fence-agents.spec index c4bd2a3..0d43cb1 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -87,7 +87,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.2.1 -Release: 128%{?alphatag:.%{alphatag}}%{?dist} +Release: 129%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -286,6 +286,7 @@ Patch142: RHEL-14343-fence_zvmip-2-fix-manpage-formatting.patch ### HA support libs/utils ### # all archs Patch1000: bz2218234-1-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch +Patch1001: RHEL-22174-kubevirt-fix-bundled-jinja2-CVE-2024-22195.patch # cloud (x86_64 only) Patch2000: bz2218234-2-aws-fix-bundled-dateutil-CVE-2007-4559.patch @@ -621,6 +622,7 @@ rm -rf %{buildroot}/usr/lib/fence-agents/%{bundled_lib_dir}/kubevirt/rsa* # regular patch doesnt work in build-section pushd %{buildroot}/usr/lib/fence-agents/%{bundled_lib_dir} /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH1000} +/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=1 < %{PATCH1001} %ifarch x86_64 /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH2000} @@ -1514,11 +1516,13 @@ Fence agent for IBM z/VM over IP. %endif %changelog -* Thu Jan 18 2024 Oyvind Albrigtsen - 4.2.1-128 +* Fri Jan 19 2024 Oyvind Albrigtsen - 4.2.1-129 - bundled urllib3: fix CVE-2023-45803 Resolves: RHEL-18132 - bundled pycryptodome: fix CVE-2023-52323 Resolves: RHEL-20915 +- bundled jinja2: fix CVE-2024-22195 + Resolves: RHEL-22174 * Wed Jan 3 2024 Oyvind Albrigtsen - 4.2.1-127 - fence_scsi: fix registration handling if ISID conflicts