Skip to content

Commit e40e1bd

Browse files
committed
Allow whitespace in rsyslog configuration files
Some `rsyslog` rules required exactly one space between the configuration option and value. That is too strict, having more spaces is valid and accepted by `rsyslog`. The rules have been fixed so that more spaces are passing the checks. Also, test scenarios that cover the fixed issue have been introduced. These rules have been fixed: - rsyslog_encrypt_offload_actionsendstreamdriverauthmode - rsyslog_encrypt_offload_actionsendstreamdrivermode - rsyslog_encrypt_offload_defaultnetstreamdriver Fixes: #14554
1 parent 07c4c5a commit e40e1bd

15 files changed

Lines changed: 39 additions & 9 deletions

File tree

linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/ansible/shared.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
{{{ ansible_remove_rainerscript_block_entries(rule_title, "action", "StreamDriverAuthMode") }}}
1010

1111
{{{ ansible_set_config_file_dir(msg, "/etc/rsyslog.conf", "/etc/rsyslog.d", "/etc/rsyslog.conf",
12-
"$ActionSendStreamDriverAuthMode", separator=' ', separator_regex='\s',
12+
"$ActionSendStreamDriverAuthMode", separator=' ',
1313
value="x509/name", create='yes', rule_title=rule_title)
1414
}}}

linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/bash/shared.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
{{{ setup_rsyslog_encrypt_offload_actionsendstreamdriverauthmode() }}}
77

88
{{{ set_config_file(path="$RSYSLOG_D_CONF",
9-
parameter="\$ActionSendStreamDriverAuthMode", value="x509/name", create=true, separator=" ", separator_regex=" ", rule_id=rule_id)
9+
parameter="\$ActionSendStreamDriverAuthMode", value="x509/name", create=true, separator=" ", rule_id=rule_id)
1010
}}}

linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/oval/shared.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</criteria>
1616
</definition>
1717

18-
{{% set legacy_regex = "^\\$ActionSendStreamDriverAuthMode x509/name$" %}}
18+
{{% set legacy_regex = "^\\s*\\$ActionSendStreamDriverAuthMode\\s+x509/name\\s*$" %}}
1919
{{% set rainer_script_regex = "(?ms)^\\s*action\\(.*(?i)\\btype\\b(?-i)=\"omfwd\".*(?i)\\bStreamDriverAuthMode\\b(?-i)=\"x509/name\".*\\)\\s*$" %}}
2020

2121
<ind:textfilecontent54_test check="all" check_existence="all_exist"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
# packages = rsyslog
3+
{{{ setup_rsyslog_encrypt_offload_actionsendstreamdriverauthmode() }}}
4+
5+
echo "\$ActionSendStreamDriverAuthMode x509/name" >> $RSYSLOG_CONF
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
# packages = rsyslog
3+
{{{ setup_rsyslog_encrypt_offload_actionsendstreamdriverauthmode() }}}
4+
5+
echo " \$ActionSendStreamDriverAuthMode x509/name" >> $RSYSLOG_CONF

linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdrivermode/ansible/shared.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010

1111
{{{ ansible_set_config_file_dir(msg, "/etc/rsyslog.conf", "/etc/rsyslog.d", "/etc/rsyslog.conf",
1212
parameter="$ActionSendStreamDriverMode", value="1", create=true, separator=" ",
13-
separator_regex=" ", rule_title=rule_title)
13+
rule_title=rule_title)
1414
}}}

linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdrivermode/bash/shared.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
{{{ setup_rsyslog_encrypt_offload_actionsendstreamdrivermode() }}}
33

44
{{{ set_config_file(path="$RSYSLOG_D_CONF",
5-
parameter="\$ActionSendStreamDriverMode", value="1", create=true, separator=" ", separator_regex=" ", rule_id=rule_id)
5+
parameter="\$ActionSendStreamDriverMode", value="1", create=true, separator=" ", rule_id=rule_id)
66
}}}

linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdrivermode/oval/shared.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</criteria>
1717
</definition>
1818

19-
{{% set legacy_regex = "^\\$ActionSendStreamDriverMode 1$" %}}
19+
{{% set legacy_regex = "^\\s*\\$ActionSendStreamDriverMode\\s+1\\s*$" %}}
2020
{{% set rainer_script_regex = "(?ms)^\\s*action\\(.*(?i)\\btype\\b(?-i)=\"omfwd\".*(?i)\\bStreamDriverMode\\b(?-i)=\"1\".*\\)\\s*$" %}}
2121

2222
<ind:textfilecontent54_test check="all" check_existence="all_exist"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
# packages = rsyslog
3+
{{{ setup_rsyslog_encrypt_offload_actionsendstreamdrivermode() }}}
4+
5+
echo "\$ActionSendStreamDriverMode 1" >> $RSYSLOG_CONF
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
# packages = rsyslog
3+
{{{ setup_rsyslog_encrypt_offload_actionsendstreamdrivermode() }}}
4+
5+
echo " \$ActionSendStreamDriverMode 1" >> $RSYSLOG_CONF

0 commit comments

Comments
 (0)