Prevent quoting issues in rule firewalld-backend #10820
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Start a new ephemeral environment with changes proposed in this pull request: rhel8 (from CTF) Environment (using Fedora as testing environment) Fedora Testing Environment Oracle Linux 8 Environment |
|
This datastream diff is auto generated by the check Click here to see the full diffbash remediation for rule 'xccdf_org.ssgproject.content_rule_firewalld-backend' differs.
--- xccdf_org.ssgproject.content_rule_firewalld-backend
+++ xccdf_org.ssgproject.content_rule_firewalld-backend
@@ -16,10 +16,10 @@
if [ -z "$line_number" ]; then
# There was no match of '^#\s*FirewallBackend', insert at
# the end of the file.
- printf '%s\n' "FirewallBackend='nftables'" >> "/etc/firewalld/firewalld.conf"
+ printf '%s\n' "FirewallBackend=nftables" >> "/etc/firewalld/firewalld.conf"
else
head -n "$(( line_number - 1 ))" "/etc/firewalld/firewalld.conf.bak" > "/etc/firewalld/firewalld.conf"
- printf '%s\n' "FirewallBackend='nftables'" >> "/etc/firewalld/firewalld.conf"
+ printf '%s\n' "FirewallBackend=nftables" >> "/etc/firewalld/firewalld.conf"
tail -n "+$(( line_number ))" "/etc/firewalld/firewalld.conf.bak" >> "/etc/firewalld/firewalld.conf"
fi
# Clean up after ourselves.
ansible remediation for rule 'xccdf_org.ssgproject.content_rule_firewalld-backend' differs.
--- xccdf_org.ssgproject.content_rule_firewalld-backend
+++ xccdf_org.ssgproject.content_rule_firewalld-backend
@@ -12,7 +12,7 @@
- no_reboot_needed
- restrict_strategy
-- name: Setting shell-quoted shell-style assignment of 'FirewallBackend' to 'nftables'
+- name: Setting unquoted shell-style assignment of 'FirewallBackend' to 'nftables'
in '/etc/firewalld/firewalld.conf'
block:
@@ -39,7 +39,7 @@
path: /etc/firewalld/firewalld.conf
create: true
regexp: ^\s*FirewallBackend=
- line: FirewallBackend="nftables"
+ line: FirewallBackend=nftables
state: present
insertbefore: ^# FirewallBackend
validate: /usr/bin/bash -n %s |
|
@Mab879 I have add a small test scenario. |
|
Can you please rebase this PR? That should fix the CI. |
We will set the no_quotes parameter of the template to avoid issues that can be caused by extra quotes in the configuration file. For example, setting `CleanupOnExit='no'` causes this problem: ``` Jul 11 10:22:20 fedora firewalld[117694]: WARNING: CleanupOnExit ''no'' is not valid, using default value True ``` The default for the `FirewallBackend` option is `nftables`, adding quotes will not cause a problem, until firewalld decides in future to change the defaults. ``` Jul 11 10:25:18 fedora firewalld[118127]: WARNING: FirewallBackend ''nftables'' is not valid, using default value nftables ``` We have seen similar things with journald rules, where it actually caused troubles, check: https://bugzilla.redhat.com/show_bug.cgi?id=2193169
jan-cerny
force-pushed
the
firewalld_backend
branch
from
ae6d8e5
to
3e51b8e
Compare
|
I have rebased this PR on the top of the latest upstream master branch. |
|
Code Climate has analyzed commit 3e51b8e and detected 0 issues on this pull request. The test coverage on the diff in this pull request is 100.0% (50% is the threshold). This pull request will bring the total coverage in the repository to 53.4% (0.0% change). View more on Code Climate. |
Mab879
approved these changes
Jul 14, 2023
There was a problem hiding this comment.
Waving Automatus tests as they pass locally.
$ ./automatus.py rule --libvirt qemu:///system automatus_rhel_9_latest_2 --remediate-using ansible --datastream ../build/ssg-rhel9-ds.xml firewalld-backend
Setting console output to log level INFO
INFO - The base image option has not been specified, choosing libvirt-based test environment.
INFO - Logging into /home/mburket/review/ComplianceAsCode/content/tests/logs/rule-custom-2023-07-14-1515/test_suite.log
INFO - xccdf_org.ssgproject.content_rule_firewalld-backend
INFO - Script quoted.fail.sh using profile (all) OK
INFO - Script missing.fail.sh using profile (all) OK
INFO - Script correct_value.pass.sh using profile (all) OK
INFO - Script wrong_value.fail.sh using profile (all) OK
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We will set the no_quotes parameter of the template to avoid issues that can be caused by extra quotes in the configuration file.
For example, setting
CleanupOnExit='no'causes this problem:The default for the
FirewallBackendoption isnftables, adding quotes will not cause a problem, until firewalld decides in future to change the defaults.We have seen similar things with journald rules, where it actually caused troubles, check:
https://bugzilla.redhat.com/show_bug.cgi?id=2193169