diff options
Diffstat (limited to 'meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch')
-rw-r--r-- | meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch new file mode 100644 index 0000000..f0c9909 --- /dev/null +++ b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 28a35d63a0cc6b7beb51c77d93bb30778e6960cd 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: Mon, 9 Dec 2019 13:41:47 +0100 | ||
4 | Subject: [PATCH] Fixed the broken fix, when greedy regex ate the whole file. | ||
5 | |||
6 | We want to match attributes in an XML element, not in the whole file. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | [https://github.com/ComplianceAsCode/content/commit/28a35d63a0cc6b7beb51c77d93bb30778e6960cd] | ||
10 | |||
11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
12 | --- | ||
13 | ssg/build_remediations.py | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py | ||
17 | index 13e90f732..edf31c0cf 100644 | ||
18 | --- a/ssg/build_remediations.py | ||
19 | +++ b/ssg/build_remediations.py | ||
20 | @@ -57,10 +57,10 @@ def get_available_functions(build_dir): | ||
21 | with codecs.open(xmlfilepath, "r", encoding="utf-8") as xmlfile: | ||
22 | filestring = xmlfile.read() | ||
23 | # This regex looks implementation dependent but we can rely on the element attributes | ||
24 | - # being present on one line. | ||
25 | + # being present. Beware, DOTALL means we go through the whole file at once. | ||
26 | # We can't rely on ElementTree sorting XML attrs in any way since Python 3.7. | ||
27 | remediation_functions = re.findall( | ||
28 | - r'<Value.*id=\"function_(\S+)\"', | ||
29 | + r'<Value[^>]+id=\"function_(\S+)\"', | ||
30 | filestring, re.DOTALL | ||
31 | ) | ||
32 | |||
33 | -- | ||
34 | 2.17.1 | ||
35 | |||