|
 |
5b3ad7 |
From b0eb3b7f7baa1a57dac3e373209d20bd55b3f215 Mon Sep 17 00:00:00 2001
|
|
|
5b3ad7 |
From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
|
|
|
5b3ad7 |
Date: Tue, 26 Jun 2018 11:42:49 +0200
|
|
|
5b3ad7 |
Subject: [PATCH 1/2] Added implicit double quoting of substituted vars.
|
|
|
5b3ad7 |
|
|
|
5b3ad7 |
Variables in Ansible may be wrongly interpreted if they are not quoted
|
|
|
5b3ad7 |
(i.e. yes, 077 will be converted to bool and octal respectively).
|
|
|
5b3ad7 |
Unlike single quotes, double quotes may be escaped.
|
|
|
5b3ad7 |
|
|
|
5b3ad7 |
Fixes: #2989
|
|
|
5b3ad7 |
---
|
|
|
5b3ad7 |
ssg/build_remediations.py | 2 +-
|
|
|
5b3ad7 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
5b3ad7 |
|
|
|
5b3ad7 |
diff --git a/shared/utils/combine-remediations.py b/shared/utils/combine-remediations.py
|
|
|
5b3ad7 |
index ca6ce96b79..ece3765d56 100644
|
|
|
5b3ad7 |
--- a/shared/utils/combine-remediations.py
|
|
|
5b3ad7 |
+++ b/shared/utils/combine-remediations.py
|
|
|
5b3ad7 |
@@ -194,7 +194,7 @@ def expand_xccdf_subs(fix, remediation_type, remediation_functions):
|
|
|
5b3ad7 |
r"- \(xccdf-var\s+(\S+)\)",
|
|
|
5b3ad7 |
r"- name: XCCDF Value \1 # promote to variable\n"
|
|
|
5b3ad7 |
r" set_fact:\n"
|
|
|
5b3ad7 |
- r" \1: (ansible-populate \1)\n"
|
|
|
5b3ad7 |
+ r' \1: "(ansible-populate \1)"\n'
|
|
|
5b3ad7 |
r" tags:\n"
|
|
|
5b3ad7 |
r" - always",
|
|
|
5b3ad7 |
fix_text
|
|
|
5b3ad7 |
|
|
|
5b3ad7 |
From a1693c2015a5513a871366f48ce1c3d83ecd9bde Mon Sep 17 00:00:00 2001
|
|
|
5b3ad7 |
From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
|
|
|
5b3ad7 |
Date: Tue, 26 Jun 2018 14:04:55 +0200
|
|
|
5b3ad7 |
Subject: [PATCH 2/2] Made the UMASK check in login.defs case-insensitive.
|
|
|
5b3ad7 |
|
|
|
5b3ad7 |
The guide says it should be UMASK, not umask, and man login.defs says the same.
|
|
|
5b3ad7 |
---
|
|
|
5b3ad7 |
shared/checks/oval/accounts_umask_etc_login_defs.xml | 2 +-
|
|
|
5b3ad7 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
5b3ad7 |
|
|
|
5b3ad7 |
diff --git a/shared/checks/oval/accounts_umask_etc_login_defs.xml b/shared/checks/oval/accounts_umask_etc_login_defs.xml
|
|
|
5b3ad7 |
index 22b67cf0dd..513632b56a 100644
|
|
|
5b3ad7 |
--- a/shared/checks/oval/accounts_umask_etc_login_defs.xml
|
|
|
5b3ad7 |
+++ b/shared/checks/oval/accounts_umask_etc_login_defs.xml
|
|
|
5b3ad7 |
@@ -18,7 +18,7 @@
|
|
|
5b3ad7 |
|
|
|
5b3ad7 |
comment="Umask value from /etc/login.defs" version="1">
|
|
|
5b3ad7 |
<ind:filepath>/etc/login.defs</ind:filepath>
|
|
|
5b3ad7 |
- <ind:pattern operation="pattern match">^[\s]*(?i)UMASK(?-i)[\s]+([^#\s]*)</ind:pattern>
|
|
|
5b3ad7 |
+ <ind:pattern operation="pattern match">^[\s]*UMASK[\s]+([^#\s]*)</ind:pattern>
|
|
|
5b3ad7 |
<ind:instance datatype="int" operation="greater than or equal">1</ind:instance>
|
|
|
5b3ad7 |
</ind:textfilecontent54_object>
|
|
|
5b3ad7 |
|