Merge pull request #11832 from mpurg/ubuntu_2204_stig_271010

Fix rule dconf_gnome_banner_enabled on Ubuntu
ComplianceAsCode · May 8, 2024 · f8ae8fc · f8ae8fc
2 parents ee66475 + 50df619
commit f8ae8fc
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/...tem/accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/oval/shared.xml b/...tem/accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/oval/shared.xml
@@ -8,6 +8,9 @@
         <criterion comment="Enable GUI banner" test_ref="test_banner_gui_enabled" />
         <criterion comment="Prevent user from disabling banner" test_ref="test_prevent_user_banner_gui_enabled_change" />
       </criteria>
+      {{%- if 'ubuntu' in product %}}
+      <criterion comment="Enable GUI banner in /etc/gdm3/greeter.dconf-defaults" test_ref="test_banner_gui_enabled_dconf_defaults" />
+      {{%- endif %}}
     </criteria>
   </definition>
 
@@ -36,4 +39,17 @@
     <ind:pattern operation="pattern match">^/org/gnome/login-screen/banner-message-enable$</ind:pattern>
     <ind:instance datatype="int">1</ind:instance>
   </ind:textfilecontent54_object>
+
+  <ind:textfilecontent54_test check="all" check_existence="all_exist"
+      comment="GUI banner is enabled in /etc/gdm3/greeter.dconf-defaults"
+  id="test_banner_gui_enabled_dconf_defaults" version="1">
+    <ind:object object_ref="obj_banner_gui_enabled_dconf_defaults" />
+  </ind:textfilecontent54_test>
+  <ind:textfilecontent54_object id="obj_banner_gui_enabled_dconf_defaults"
+  version="1">
+    <ind:filepath>/etc/gdm3/greeter.dconf-defaults</ind:filepath>
+    <ind:pattern operation="pattern match">^\[org/gnome/login-screen\]([^\n]*\n+)+?banner-message-enable=true$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
 </def-group>
diff --git a/...unts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/commented.fail.sh b/...unts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/commented.fail.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# platform = multi_platform_ubuntu
+# packages = dconf,gdm
+
+cat > /etc/gdm3/greeter.dconf-defaults <<EOF
+[org/gnome/login-screen]
+#banner-message-enable=true
+EOF
diff --git a/.../accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/correct_value.pass.sh b/.../accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/correct_value.pass.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 # packages = dconf,gdm
 
+{{%- if 'ubuntu' in product %}}
+cat > /etc/gdm3/greeter.dconf-defaults <<EOF
+[org/gnome/login-screen]
+banner-message-enable=true
+EOF
+
+{{%- else %}}
 source $SHARED/dconf_test_functions.sh
 
 install_dconf_and_gdm_if_needed
@@ -10,3 +17,4 @@ add_dconf_setting "org/gnome/login-screen" "banner-message-enable" "true" "{{{ d
 add_dconf_lock "org/gnome/login-screen" "banner-message-enable" "{{{ dconf_gdm_dir }}}" "00-security-settings"
 
 dconf update
+{{%- endif %}}
diff --git a/...accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/empty.fail.sh b/...accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/empty.fail.sh
@@ -7,4 +7,3 @@ source $SHARED/dconf_test_functions.sh
 install_dconf_and_gdm_if_needed
 
 clean_dconf_settings
-
diff --git a/...ts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/wrong_value.fail.sh b/...ts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/wrong_value.fail.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 # packages = dconf,gdm
 
+{{%- if 'ubuntu' in product %}}
+cat > /etc/gdm3/greeter.dconf-defaults <<EOF
+[org/gnome/login-screen]
+banner-message-enable=false
+EOF
+
+{{%- else %}}
 source $SHARED/dconf_test_functions.sh
 
 install_dconf_and_gdm_if_needed
@@ -10,3 +17,4 @@ add_dconf_setting "org/gnome/login-screen" "banner-message-enable" "false" "{{{
 add_dconf_lock "org/gnome/login-screen" "banner-message-enable" "{{{ dconf_gdm_dir }}}" "00-security-settings"
 
 dconf update
+{{%- endif %}}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ source $SHARED/dconf_test_functions.sh
		install_dconf_and_gdm_if_needed

		clean_dconf_settings