diff options
Diffstat (limited to 'meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch')
-rw-r--r-- | meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch new file mode 100644 index 0000000..c0b93e4 --- /dev/null +++ b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 174293162e5840684d967e36840fc1f9f57c90be Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com> | ||
3 | Date: Thu, 5 Dec 2019 15:02:05 +0100 | ||
4 | Subject: [PATCH] Fix XML "parsing" of the remediation functions file. | ||
5 | |||
6 | A proper fix is not worth the effort, as we aim to kill shared Bash remediation | ||
7 | with Jinja2 macros. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | [https://github.com/ComplianceAsCode/content/commit/174293162e5840684d967e36840fc1f9f57c90be] | ||
11 | |||
12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
13 | --- | ||
14 | ssg/build_remediations.py | 8 ++++---- | ||
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py | ||
18 | index 7da807bd6..13e90f732 100644 | ||
19 | --- a/ssg/build_remediations.py | ||
20 | +++ b/ssg/build_remediations.py | ||
21 | @@ -56,11 +56,11 @@ def get_available_functions(build_dir): | ||
22 | remediation_functions = [] | ||
23 | with codecs.open(xmlfilepath, "r", encoding="utf-8") as xmlfile: | ||
24 | filestring = xmlfile.read() | ||
25 | - # This regex looks implementation dependent but we can rely on | ||
26 | - # ElementTree sorting XML attrs alphabetically. Hidden is guaranteed | ||
27 | - # to be the first attr and ID is guaranteed to be second. | ||
28 | + # This regex looks implementation dependent but we can rely on the element attributes | ||
29 | + # being present on one line. | ||
30 | + # We can't rely on ElementTree sorting XML attrs in any way since Python 3.7. | ||
31 | remediation_functions = re.findall( | ||
32 | - r'<Value hidden=\"true\" id=\"function_(\S+)\"', | ||
33 | + r'<Value.*id=\"function_(\S+)\"', | ||
34 | filestring, re.DOTALL | ||
35 | ) | ||
36 | |||
37 | -- | ||
38 | 2.17.1 | ||
39 | |||