Use motd_banner_contents variable in rule banner_etc_motd

Use motd_banner_contents variable in remediations in rule
banner_etc_motd.

Author: jan-cerny

controls/ccn_ol9.yml

@@ -627,6 +627,7 @@ controls:
           - login_banner_text=cis_default
           - login_banner_contents=cis_default
           - motd_banner_text=cis_default
+          - motd_banner_contents=cis_default
           - remote_login_banner_text=cis_default
 
     - id: A.11.SEC-OL5

controls/cis_al2023.yml

@@ -468,6 +468,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_text=cis_banners
+          - motd_banner_contents=cis_default
 
     - id: 1.7.2
       title: Ensure local login warning banner is configured properly (Automated)

controls/cis_sle12.yml

@@ -457,6 +457,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_text=cis_banners
+          - motd_banner_contents=cis_default
 
     - id: 1.8.1.2
       title: Ensure local login warning banner is configured properly (Automated)

controls/cis_sle15.yml

@@ -455,6 +455,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_text=cis_banners
+          - motd_banner_contents=cis_default
 
     - id: 1.8.1.2
       title: Ensure local login warning banner is configured properly (Automated)

controls/general_sle15.yml

@@ -470,6 +470,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_text=cis_banners
+          - motd_banner_contents=cis_default
 
     - id: SLES-15-151050030
       title: Modify the System Login Banner

controls/general_slmicro5.yml

@@ -269,6 +269,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_text=cis_banners
+          - motd_banner_contents=cis_default
 
     - id: SLEM-5-SET-08010200
       title: Modify the System Login Banner

controls/std_kylinserver10.yml

@@ -128,7 +128,8 @@ controls:
       status: automated
       rules:
           - banner_etc_motd
-          - login_banner_text=cis_banners
+          - motd_banner_text=cis_banners
+          - motd_banner_contents=cis_default
 
     - id: 1.15
       title: Ensure sshd PermitRootLogin is disabled (Automated)

controls/std_tencentos4.yml

@@ -114,6 +114,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_text=cis_banners
+          - motd_banner_contents=cis_default
 
     - id: 1.4.2
       title: Ensure local login warning banner is configured properly

linux_os/guide/system/accounts/accounts-banners/banner_etc_motd/ansible/shared.yml

@@ -3,9 +3,9 @@
 # strategy = unknown
 # complexity = low
 # disruption = medium
-{{{ ansible_instantiate_variables("motd_banner_text") }}}
+{{{ ansible_instantiate_variables("motd_banner_contents") }}}
 
 - name: "{{{ rule_title }}} - ensure correct banner"
   ansible.builtin.copy:
     dest: /etc/motd
-    content: '{{{ ansible_deregexify_banner_etc_issue("motd_banner_text") }}}'
+    content: "{{ motd_banner_contents | replace('\\n', '\n') }}\n"

linux_os/guide/system/accounts/accounts-banners/banner_etc_motd/bash/shared.sh

@@ -1,21 +1,4 @@
-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_rhv,multi_platform_sle,multi_platform_slmicro,multi_platform_ubuntu,multi_platform_almalinux
+# platform = multi_platform_all
 
-{{{ bash_instantiate_variables("motd_banner_text") }}}
-
-# Multiple regexes transform the banner regex into a usable banner
-# 0 - Remove anchors around the banner text
-{{{ bash_deregexify_banner_anchors("motd_banner_text") }}}
-# 1 - Keep only the first banners if there are multiple
-#    (dod_banners contains the long and short banner)
-{{{ bash_deregexify_multiple_banners("motd_banner_text") }}}
-# 2 - Add spaces ' '. (Transforms regex for "space or newline" into a " ")
-{{{ bash_deregexify_banner_space("motd_banner_text") }}}
-# 3 - Adds newlines. (Transforms "(?:\[\\n\]+|(?:\\n)+)" into "\n")
-{{{ bash_deregexify_banner_newline("motd_banner_text", "\\n") }}}
-# 4 - Remove any leftover backslash. (From any parenthesis in the banner, for example).
-{{{ bash_deregexify_banner_backslash("motd_banner_text") }}}
-formatted=$(echo "$motd_banner_text" | fold -sw 80)
-
-cat <<EOF >/etc/motd
-$formatted
-EOF
+motd_banner_contents=$(echo "(bash-populate motd_banner_contents)" | sed 's/\\n/\n/g')
+echo "$motd_banner_contents" > /etc/motd