Merge pull request #11913 from mpurg/fix_dconf_ctrlaltdel

Fix value syntax for rule dconf_gnome_disable_ctrlaltdel_reboot
ComplianceAsCode · Apr 30, 2024 · 0c4bba8 · 0c4bba8
2 parents 0b096bc + ec6fd39
commit 0c4bba8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/...ware/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/ansible/shared.yml b/...ware/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/ansible/shared.yml
@@ -8,7 +8,7 @@
  dest: /etc/dconf/db/local.d/00-security-settings
  section: org/gnome/settings-daemon/plugins/media-keys
  option: logout
- value: "''"
+ value: "['']"
  create: yes
  no_extra_spaces: yes
 

diff --git a/...software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/bash/shared.sh b/...software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/bash/shared.sh
@@ -1,5 +1,5 @@
 # platform = multi_platform_all
 
 
-{{{ bash_dconf_settings("org/gnome/settings-daemon/plugins/media-keys", "logout", "''", "local.d", "00-security-settings") }}}
+{{{ bash_dconf_settings("org/gnome/settings-daemon/plugins/media-keys", "logout", "['']", "local.d", "00-security-settings") }}}
 {{{ bash_dconf_lock("org/gnome/settings-daemon/plugins/media-keys", "logout", "local.d", "00-security-settings-lock") }}}
diff --git a/...oftware/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/oval/shared.xml b/...oftware/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/oval/shared.xml
@@ -20,7 +20,7 @@
  version="1">
  <ind:path>/etc/dconf/db/local.d/</ind:path>
  <ind:filename operation="pattern match">^.*$</ind:filename>
- <ind:pattern operation="pattern match">^\[org/gnome/settings-daemon/plugins/media-keys\]([^\n]*\n+)+?logout[\s]*=[\s]*''$</ind:pattern>
+ <ind:pattern operation="pattern match">^\[org/gnome/settings-daemon/plugins/media-keys\]([^\n]*\n+)+?logout[\s]*=[\s]*\[''\]$</ind:pattern>
  <ind:instance datatype="int">1</ind:instance>
  </ind:textfilecontent54_object>
 

diff --git a/...ystem/software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/rule.yml b/...ystem/software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/rule.yml
@@ -9,10 +9,10 @@ description: |-
  <br /><br />
  To configure the system to ignore the <tt>Ctrl-Alt-Del</tt> key sequence
  from the Graphical User Interface (GUI) instead of rebooting the system,
- add or set <tt>logout</tt> to <tt>''</tt> in
+ add or set <tt>logout</tt> to <tt>['']</tt> in
  <tt>/etc/dconf/db/local.d/00-security-settings</tt>. For example:
  <pre>[org/gnome/settings-daemon/plugins/media-keys]
- logout=''</pre>
+ logout=['']</pre>
  Once the settings have been added, add a lock to
  <tt>/etc/dconf/db/local.d/locks/00-security-settings-lock</tt> to prevent
  user modification. For example:
@@ -60,7 +60,7 @@ ocil: |-
  If properly configured, the output should be
  <tt>/org/gnome/settings-daemon/plugins/media-keys/logout</tt>
 
-fixtext: '{{{ fixtext_dconf_ini_file("/org/gnome/settings-daemon/plugins/media-keys", "logout", "") }}}'
+fixtext: '{{{ fixtext_dconf_ini_file("/org/gnome/settings-daemon/plugins/media-keys", "logout", "[\'\']") }}}'
 
 srg_requirement: 'The x86 Ctrl-Alt-Delete key sequence in {{{ full_name }}} must be disabled if a graphical user interface is installed.'
 

diff --git a/...e/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/tests/comment.fail.sh b/...e/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/tests/comment.fail.sh
@@ -4,5 +4,5 @@
 
 install_dconf_and_gdm_if_needed
 clean_dconf_settings
-add_dconf_setting "org/gnome/settings-daemon/plugins/media-keys" "#logout" "''" "local.d" "00-security-settings"
+add_dconf_setting "org/gnome/settings-daemon/plugins/media-keys" "#logout" "['']" "local.d" "00-security-settings"
 add_dconf_lock "org/gnome/settings-daemon/plugins/media-keys" "logout" "local.d" "00-security-settings"
diff --git a/...e/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/tests/correct_value.pass.sh b/...e/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/tests/correct_value.pass.sh
@@ -4,5 +4,5 @@
 
 install_dconf_and_gdm_if_needed
 clean_dconf_settings
-add_dconf_setting "org/gnome/settings-daemon/plugins/media-keys" "logout" "''" "local.d" "00-security-settings"
+add_dconf_setting "org/gnome/settings-daemon/plugins/media-keys" "logout" "['']" "local.d" "00-security-settings"
 add_dconf_lock "org/gnome/settings-daemon/plugins/media-keys" "logout" "local.d" "00-security-settings"
diff --git a/...ystem_settings/dconf_gnome_disable_ctrlaltdel_reboot/tests/correct_value_unlocked.fail.sh b/...ystem_settings/dconf_gnome_disable_ctrlaltdel_reboot/tests/correct_value_unlocked.fail.sh
@@ -4,4 +4,4 @@
 
 install_dconf_and_gdm_if_needed
 clean_dconf_settings
-add_dconf_setting "org/gnome/settings-daemon/plugins/media-keys" "logout" "''" "local.d" "00-security-settings"
+add_dconf_setting "org/gnome/settings-daemon/plugins/media-keys" "logout" "['']" "local.d" "00-security-settings"
diff --git a/...ystem_settings/dconf_gnome_disable_ctrlaltdel_reboot/tests/correct_value_wrong_db.fail.sh b/...ystem_settings/dconf_gnome_disable_ctrlaltdel_reboot/tests/correct_value_wrong_db.fail.sh
@@ -4,5 +4,5 @@
 
 install_dconf_and_gdm_if_needed
 clean_dconf_settings
-add_dconf_setting "org/gnome/settings-daemon/plugins/media-keys" "logout" "''" "dummy.d" "00-security-settings"
+add_dconf_setting "org/gnome/settings-daemon/plugins/media-keys" "logout" "['']" "dummy.d" "00-security-settings"
 add_dconf_lock "org/gnome/settings-daemon/plugins/media-keys" "logout" "dummy.d" "00-security-settings"