Merge pull request #9711 from Mab879/fix_rsyslog_tls

Fix rsyslog_remote_tls Remediations
ComplianceAsCode · Oct 20, 2022 · 22ce78e · 22ce78e
2 parents 0816c7f + 85659bd
commit 22ce78e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/ansible/shared.yml b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/ansible/shared.yml
@@ -6,7 +6,7 @@
 {{{ ansible_instantiate_variables("rsyslog_remote_loghost_address") }}}
 
 - name: "Get omfwd configuration directive"
-  shell: sed -e '/action\s*(\s*type\s*=\s*"omfwd"/,/)/!d' /etc/rsyslog.conf /etc/rsyslog.d/*.conf
+  shell: sed -e '/^action\s*(\s*type\s*=\s*"omfwd"/,/)/!d' /etc/rsyslog.conf /etc/rsyslog.d/*.conf || true
   register: include_omfwd_config_output
 
 - name: "Get include files directives"

diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/bash/shared.sh b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/bash/shared.sh
@@ -7,7 +7,7 @@
 {{{ bash_instantiate_variables("rsyslog_remote_loghost_address") }}}
 
 # Get omfwd configuration directive
-OMFWD_CONFIG_OUTPUT=`grep -Pzo '(?s)action\s*\(\s*type\s*=\s*"omfwd".*\)' /etc/rsyslog.conf /etc/rsyslog.d/*.conf`
+OMFWD_CONFIG_OUTPUT=`grep -Pzo '^(?s)action\s*\(\s*type\s*=\s*"omfwd".*\)' /etc/rsyslog.conf /etc/rsyslog.d/*.conf`
 OMFWD_CONFIG=`echo "$OMFWD_CONFIG_OUTPUT"| awk 'BEGIN {FS=":"; RS=")\n"}; {print $2}'`
 OMFWD_CONFIG_FILE=`echo "$OMFWD_CONFIG_OUTPUT"| awk 'BEGIN {FS=":"; RS=")\n"}; {print $1}'`
 if ! [ -z "$OMFWD_CONFIG" ]; then

diff --git a/.../guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/no_server.fail.sh b/.../guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/tests/no_server.fail.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+touch /etc/rsyslog.conf