Blame SOURCES/scap-security-guide-0.1.54-split-dconf-automount-rule-PR_5961.patch

fe0dde
From bf1b010001f16a428a0e3401347df0a37ce52e90 Mon Sep 17 00:00:00 2001
fe0dde
From: Gabriel Becker <ggasparb@redhat.com>
fe0dde
Date: Thu, 6 Aug 2020 15:43:31 +0200
fe0dde
Subject: [PATCH 1/8] Break dconf_gnome_disable_automount down into three
fe0dde
 separate rules.
fe0dde
fe0dde
---
fe0dde
 .../tests/empty.fail.sh                       |  9 +++
fe0dde
 .../ansible/shared.yml                        | 31 ----------
fe0dde
 .../bash/shared.sh                            |  4 --
fe0dde
 .../oval/shared.xml                           | 60 +------------------
fe0dde
 .../dconf_gnome_disable_automount/rule.yml    | 25 +++-----
fe0dde
 .../tests/correct_value.pass.sh               | 11 ++++
fe0dde
 .../ansible/shared.yml                        | 19 ++++++
fe0dde
 .../bash/shared.sh                            |  5 ++
fe0dde
 .../oval/shared.xml                           | 50 ++++++++++++++++
fe0dde
 .../rule.yml                                  | 57 ++++++++++++++++++
fe0dde
 .../tests/correct_value.pass.sh               | 12 ++++
fe0dde
 .../tests/wrong_value.fail.sh                 |  7 +++
fe0dde
 .../ansible/shared.yml                        | 20 +++++++
fe0dde
 .../bash/shared.sh                            |  5 ++
fe0dde
 .../oval/shared.xml                           | 50 ++++++++++++++++
fe0dde
 .../dconf_gnome_disable_autorun/rule.yml      | 57 ++++++++++++++++++
fe0dde
 .../tests/correct_value.pass.sh               | 10 ++++
fe0dde
 .../tests/wrong_value.fail.sh                 |  7 +++
fe0dde
 shared/references/cce-redhat-avail.txt        |  4 --
fe0dde
 19 files changed, 328 insertions(+), 115 deletions(-)
fe0dde
 create mode 100644 linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/empty.fail.sh
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/correct_value.pass.sh
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/ansible/shared.yml
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/bash/shared.sh
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/rule.yml
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/correct_value.pass.sh
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/wrong_value.fail.sh
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/ansible/shared.yml
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/bash/shared.sh
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/rule.yml
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/correct_value.pass.sh
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/wrong_value.fail.sh
fe0dde
fe0dde
diff --git a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/empty.fail.sh b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/empty.fail.sh
fe0dde
new file mode 100644
fe0dde
index 0000000000..cb84c5262b
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/tests/empty.fail.sh
fe0dde
@@ -0,0 +1,9 @@
fe0dde
+#!/bin/bash
fe0dde
+# profiles = xccdf_org.ssgproject.content_profile_ncp
fe0dde
+
fe0dde
+source $SHARED/dconf_test_functions.sh
fe0dde
+
fe0dde
+install_dconf_and_gdm_if_needed
fe0dde
+
fe0dde
+clean_dconf_settings
fe0dde
+
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/ansible/shared.yml
fe0dde
index c13d706df3..eeb7b8f301 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/ansible/shared.yml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/ansible/shared.yml
fe0dde
@@ -17,34 +17,3 @@
fe0dde
     regexp: '^/org/gnome/desktop/media-handling/automount'
fe0dde
     line: '/org/gnome/desktop/media-handling/automount'
fe0dde
     create: yes
fe0dde
-
fe0dde
-- name: "Disable GNOME3 Automounting - automount-open"
fe0dde
-  ini_file:
fe0dde
-    dest: /etc/dconf/db/local.d/00-security-settings
fe0dde
-    section: org/gnome/desktop/media-handling
fe0dde
-    option: automount-open
fe0dde
-    value: "false"
fe0dde
-    create: yes
fe0dde
-
fe0dde
-- name: "Prevent user modification of GNOME3 Automounting - automount-open"
fe0dde
-  lineinfile:
fe0dde
-    path: /etc/dconf/db/local.d/locks/00-security-settings-lock
fe0dde
-    regexp: '^/org/gnome/desktop/media-handling/automount-open'
fe0dde
-    line: '/org/gnome/desktop/media-handling/automount-open'
fe0dde
-    create: yes
fe0dde
-
fe0dde
-- name: "Disable GNOME3 Automounting - autorun-never"
fe0dde
-  ini_file:
fe0dde
-    dest: /etc/dconf/db/local.d/00-security-settings
fe0dde
-    section: org/gnome/desktop/media-handling
fe0dde
-    option: autorun-never
fe0dde
-    value: "true"
fe0dde
-    create: yes
fe0dde
-
fe0dde
-- name: "Prevent user modification of GNOME3 Automounting - autorun-never"
fe0dde
-  lineinfile:
fe0dde
-    path: /etc/dconf/db/local.d/locks/00-security-settings-lock
fe0dde
-    regexp: '^/org/gnome/desktop/media-handling/autorun-never'
fe0dde
-    line: '/org/gnome/desktop/media-handling/autorun-never'
fe0dde
-    create: yes
fe0dde
-
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/bash/shared.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/bash/shared.sh
fe0dde
index aa7c692c87..5a52153613 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/bash/shared.sh
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/bash/shared.sh
fe0dde
@@ -2,8 +2,4 @@
fe0dde
 
fe0dde
 
fe0dde
 {{{ bash_dconf_settings("org/gnome/desktop/media-handling", "automount", "false", "local.d", "00-security-settings") }}}
fe0dde
-{{{ bash_dconf_settings("org/gnome/desktop/media-handling", "automount-open", "false", "local.d", "00-security-settings") }}}
fe0dde
-{{{ bash_dconf_settings("org/gnome/desktop/media-handling", "autorun-never", "true", "local.d", "00-security-settings") }}}
fe0dde
 {{{ bash_dconf_lock("org/gnome/desktop/media-handling", "automount", "local.d", "00-security-settings-lock") }}}
fe0dde
-{{{ bash_dconf_lock("org/gnome/desktop/media-handling", "automount-open", "local.d", "00-security-settings-lock") }}}
fe0dde
-{{{ bash_dconf_lock("org/gnome/desktop/media-handling", "autorun-never", "local.d", "00-security-settings-lock") }}}
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml
fe0dde
index fb359a2278..c05b1d8e1b 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml
fe0dde
@@ -1,19 +1,15 @@
fe0dde
 <def-group>
fe0dde
-  <definition class="compliance" id="dconf_gnome_disable_automount" version="1">
fe0dde
+  <definition class="compliance" id="dconf_gnome_disable_automount" version="2">
fe0dde
     {{{ oval_metadata("The system's default desktop environment, GNOME3, will mount
fe0dde
       devices and removable media (such as DVDs, CDs and USB flash drives)
fe0dde
       whenever they are inserted into the system. Disable automount and autorun
fe0dde
       within GNOME3.") }}}
fe0dde
     <criteria operator="OR">
fe0dde
       <extend_definition comment="dconf installed" definition_ref="package_dconf_installed" negate="true" />
fe0dde
-      <criteria comment="Disable GNOME3 automount/autorun and prevent user from changing it" operator="AND">
fe0dde
+      <criteria comment="Disable GNOME3 automount and prevent user from changing it" operator="AND">
fe0dde
         <extend_definition comment="dconf user profile exists" definition_ref="enable_dconf_user_profile" />
fe0dde
         <criterion comment="Disable automount in GNOME3" test_ref="test_dconf_gnome_disable_automount" />
fe0dde
-        <criterion comment="Disable automount-open in GNOME3" test_ref="test_dconf_gnome_disable_automount_open" />
fe0dde
-        <criterion comment="Disable autorun in GNOME3" test_ref="test_dconf_gnome_disable_autorun" />
fe0dde
         <criterion comment="Prevent user from changing automount setting" test_ref="test_prevent_user_gnome_automount" />
fe0dde
-        <criterion comment="Prevent user from changing automount-open setting" test_ref="test_prevent_user_gnome_automount_open" />
fe0dde
-        <criterion comment="Prevent user from changing autorun setting" test_ref="test_prevent_user_gnome_autorun" />
fe0dde
       </criteria>
fe0dde
     </criteria>
fe0dde
   </definition>
fe0dde
@@ -43,56 +39,4 @@
fe0dde
     <ind:pattern operation="pattern match">^/org/gnome/desktop/media-handling/automount$</ind:pattern>
fe0dde
     <ind:instance datatype="int">1</ind:instance>
fe0dde
   </ind:textfilecontent54_object>
fe0dde
-
fe0dde
-  
fe0dde
-  comment="Disable automount-open in GNOME"
fe0dde
-  id="test_dconf_gnome_disable_automount_open" version="1">
fe0dde
-    <ind:object object_ref="obj_dconf_gnome_disable_automount_open" />
fe0dde
-  </ind:textfilecontent54_test>
fe0dde
-  
fe0dde
-  version="1">
fe0dde
-    <ind:path>/etc/dconf/db/local.d/</ind:path>
fe0dde
-    <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
-    <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling]([^\n]*\n+)+?automount-open=false$</ind:pattern>
fe0dde
-    <ind:instance datatype="int">1</ind:instance>
fe0dde
-  </ind:textfilecontent54_object>
fe0dde
-
fe0dde
-  
fe0dde
-  comment="Prevent user from changing automount-open setting"
fe0dde
-  id="test_prevent_user_gnome_automount_open" version="1">
fe0dde
-    <ind:object object_ref="obj_prevent_user_gnome_automount_open" />
fe0dde
-  </ind:textfilecontent54_test>
fe0dde
-  
fe0dde
-  version="1">
fe0dde
-    <ind:path>/etc/dconf/db/local.d/locks/</ind:path>
fe0dde
-    <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
-    <ind:pattern operation="pattern match">^/org/gnome/desktop/media-handling/automount-open$</ind:pattern>
fe0dde
-    <ind:instance datatype="int">1</ind:instance>
fe0dde
-  </ind:textfilecontent54_object>
fe0dde
-
fe0dde
-  
fe0dde
-  comment="Disable autorun in GNOME"
fe0dde
-  id="test_dconf_gnome_disable_autorun" version="1">
fe0dde
-    <ind:object object_ref="obj_dconf_gnome_disable_autorun" />
fe0dde
-  </ind:textfilecontent54_test>
fe0dde
-  
fe0dde
-  version="1">
fe0dde
-    <ind:path>/etc/dconf/db/local.d/</ind:path>
fe0dde
-    <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
-    <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling]([^\n]*\n+)+?autorun-never=true$</ind:pattern>
fe0dde
-    <ind:instance datatype="int">1</ind:instance>
fe0dde
-  </ind:textfilecontent54_object>
fe0dde
-
fe0dde
-  
fe0dde
-  comment="Prevent user from changing autorun setting"
fe0dde
-  id="test_prevent_user_gnome_autorun" version="1">
fe0dde
-    <ind:object object_ref="obj_prevent_user_gnome_autorun" />
fe0dde
-  </ind:textfilecontent54_test>
fe0dde
-  
fe0dde
-  version="1">
fe0dde
-    <ind:path>/etc/dconf/db/local.d/locks/</ind:path>
fe0dde
-    <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
-    <ind:pattern operation="pattern match">^/org/gnome/desktop/media-handling/autorun-never$</ind:pattern>
fe0dde
-    <ind:instance datatype="int">1</ind:instance>
fe0dde
-  </ind:textfilecontent54_object>
fe0dde
 </def-group>
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/rule.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/rule.yml
fe0dde
index 551f6cacdf..b7e7192bc0 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/rule.yml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/rule.yml
fe0dde
@@ -7,20 +7,15 @@ title: 'Disable GNOME3 Automounting'
fe0dde
 description: |-
fe0dde
     The system's default desktop environment, GNOME3, will mount
fe0dde
     devices and removable media (such as DVDs, CDs and USB flash drives) whenever
fe0dde
-    they are inserted into the system. To disable automount and autorun within GNOME3, add or set
fe0dde
-    <tt>automount</tt> to <tt>false</tt>, <tt>automount-open</tt> to <tt>false</tt>, and
fe0dde
-    <tt>autorun-never</tt> to <tt>true</tt> in <tt>/etc/dconf/db/local.d/00-security-settings</tt>.
fe0dde
+    they are inserted into the system. To disable automount within GNOME3, add or set
fe0dde
+    <tt>automount</tt> to <tt>false</tt> in <tt>/etc/dconf/db/local.d/00-security-settings</tt>.
fe0dde
     For example:
fe0dde
     
[org/gnome/desktop/media-handling]
fe0dde
-    automount=false
fe0dde
-    automount-open=false
fe0dde
-    autorun-never=true
fe0dde
+    automount=false
fe0dde
     Once the settings have been added, add a lock to
fe0dde
     <tt>/etc/dconf/db/local.d/locks/00-security-settings-lock</tt> to prevent user modification.
fe0dde
     For example:
fe0dde
-    
/org/gnome/desktop/media-handling/automount
fe0dde
-    /org/gnome/desktop/media-handling/automount-open
fe0dde
-    /org/gnome/desktop/media-handling/autorun-never
fe0dde
+    
/org/gnome/desktop/media-handling/automount
fe0dde
     After the settings have been set, run <tt>dconf update</tt>.
fe0dde
 
fe0dde
 rationale: |-
fe0dde
@@ -48,16 +43,10 @@ ocil_clause: 'GNOME automounting is not disabled'
fe0dde
 
fe0dde
 ocil: |-
fe0dde
     These settings can be verified by running the following:
fe0dde
-    
$ gsettings get org.gnome.desktop.media-handling automount
fe0dde
-    $ gsettings get org.gnome.desktop.media-handling automount-open
fe0dde
-    $ gsettings get org.gnome.desktop.media-handling autorun-never
fe0dde
+    
$ gsettings get org.gnome.desktop.media-handling automount
fe0dde
     If properly configured, the output for <tt>automount</tt> should be <tt>false</tt>.
fe0dde
-    If properly configured, the output for <tt>automount-open</tt>should be <tt>false</tt>.
fe0dde
-    If properly configured, the output for <tt>autorun-never</tt> should be <tt>true</tt>.
fe0dde
-    To ensure that users cannot enable automount and autorun in GNOME3, run the following:
fe0dde
-    
$ grep 'automount\|autorun' /etc/dconf/db/local.d/locks/*
fe0dde
+    To ensure that users cannot enable automount in GNOME3, run the following:
fe0dde
+    
$ grep 'automount' /etc/dconf/db/local.d/locks/*
fe0dde
     If properly configured, the output for <tt>automount</tt> should be <tt>/org/gnome/desktop/media-handling/automount</tt>
fe0dde
-    If properly configured, the output for <tt>automount-open</tt> should be <tt>/org/gnome/desktop/media-handling/auto-open</tt>
fe0dde
-    If properly configured, the output for <tt>autorun-never</tt> should be <tt>/org/gnome/desktop/media-handling/autorun-never</tt>
fe0dde
 
fe0dde
 platform: machine
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/correct_value.pass.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/correct_value.pass.sh
fe0dde
new file mode 100644
fe0dde
index 0000000000..685f5925c5
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/correct_value.pass.sh
fe0dde
@@ -0,0 +1,11 @@
fe0dde
+#!/bin/bash
fe0dde
+# profiles = xccdf_org.ssgproject.content_profile_stig
fe0dde
+
fe0dde
+. $SHARED/dconf_test_functions.sh
fe0dde
+
fe0dde
+yum -y install dconf
fe0dde
+clean_dconf_settings
fe0dde
+
fe0dde
+add_dconf_setting "org/gnome/desktop/media-handling" "automount" "false" "local.d" "00-security-settings"
fe0dde
+add_dconf_lock "org/gnome/desktop/media-handling" "automount" "local.d" "00-security-settings"
fe0dde
+
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/ansible/shared.yml
fe0dde
new file mode 100644
fe0dde
index 0000000000..680d148347
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/ansible/shared.yml
fe0dde
@@ -0,0 +1,19 @@
fe0dde
+# platform = multi_platform_rhel,multi_platform_fedora
fe0dde
+# reboot = false
fe0dde
+# strategy = unknown
fe0dde
+# complexity = low
fe0dde
+# disruption = medium
fe0dde
+- name: "Disable GNOME3 Automounting - automount-open"
fe0dde
+  ini_file:
fe0dde
+    dest: /etc/dconf/db/local.d/00-security-settings
fe0dde
+    section: org/gnome/desktop/media-handling
fe0dde
+    option: automount-open
fe0dde
+    value: "false"
fe0dde
+    create: yes
fe0dde
+
fe0dde
+- name: "Prevent user modification of GNOME3 Automounting - automount-open"
fe0dde
+  lineinfile:
fe0dde
+    path: /etc/dconf/db/local.d/locks/00-security-settings-lock
fe0dde
+    regexp: '^/org/gnome/desktop/media-handling/automount-open'
fe0dde
+    line: '/org/gnome/desktop/media-handling/automount-open'
fe0dde
+    create: yes
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/bash/shared.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/bash/shared.sh
fe0dde
new file mode 100644
fe0dde
index 0000000000..7a1497507b
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/bash/shared.sh
fe0dde
@@ -0,0 +1,5 @@
fe0dde
+# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,multi_platform_fedora
fe0dde
+
fe0dde
+
fe0dde
+{{{ bash_dconf_settings("org/gnome/desktop/media-handling", "automount-open", "false", "local.d", "00-security-settings") }}}
fe0dde
+{{{ bash_dconf_lock("org/gnome/desktop/media-handling", "automount-open", "local.d", "00-security-settings-lock") }}}
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml
fe0dde
new file mode 100644
fe0dde
index 0000000000..84264fa8f4
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml
fe0dde
@@ -0,0 +1,50 @@
fe0dde
+<def-group>
fe0dde
+  <definition class="compliance" id="dconf_gnome_disable_automount_open" version="1">
fe0dde
+    <metadata>
fe0dde
+      <title>Disable GNOME3 automount-open</title>
fe0dde
+      <affected family="unix">
fe0dde
+        <platform>Red Hat Enterprise Linux 7</platform>
fe0dde
+        <platform>Red Hat Enterprise Linux 8</platform>
fe0dde
+        <platform>multi_platform_fedora</platform>
fe0dde
+      </affected>
fe0dde
+      <description>The system's default desktop environment, GNOME3, will mount
fe0dde
+      devices and removable media (such as DVDs, CDs and USB flash drives)
fe0dde
+      whenever they are inserted into the system. Disable automount-open
fe0dde
+      within GNOME3.</description>
fe0dde
+    </metadata>
fe0dde
+    <criteria operator="OR">
fe0dde
+      <extend_definition comment="dconf installed" definition_ref="package_dconf_installed" negate="true" />
fe0dde
+      <criteria comment="Disable GNOME3 automount/autorun and prevent user from changing it" operator="AND">
fe0dde
+        <extend_definition comment="dconf user profile exists" definition_ref="enable_dconf_user_profile" />
fe0dde
+        <criterion comment="Disable automount-open in GNOME3" test_ref="test_dconf_gnome_disable_automount_open" />
fe0dde
+        <criterion comment="Prevent user from changing automount-open setting" test_ref="test_prevent_user_gnome_automount_open" />
fe0dde
+      </criteria>
fe0dde
+    </criteria>
fe0dde
+  </definition>
fe0dde
+
fe0dde
+  
fe0dde
+  comment="Disable automount-open in GNOME"
fe0dde
+  id="test_dconf_gnome_disable_automount_open" version="1">
fe0dde
+    <ind:object object_ref="obj_dconf_gnome_disable_automount_open" />
fe0dde
+  </ind:textfilecontent54_test>
fe0dde
+  
fe0dde
+  version="1">
fe0dde
+    <ind:path>/etc/dconf/db/local.d/</ind:path>
fe0dde
+    <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
+    <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling]([^\n]*\n+)+?automount-open=false$</ind:pattern>
fe0dde
+    <ind:instance datatype="int">1</ind:instance>
fe0dde
+  </ind:textfilecontent54_object>
fe0dde
+
fe0dde
+  
fe0dde
+  comment="Prevent user from changing automount-open setting"
fe0dde
+  id="test_prevent_user_gnome_automount_open" version="1">
fe0dde
+    <ind:object object_ref="obj_prevent_user_gnome_automount_open" />
fe0dde
+  </ind:textfilecontent54_test>
fe0dde
+  
fe0dde
+  version="1">
fe0dde
+    <ind:path>/etc/dconf/db/local.d/locks/</ind:path>
fe0dde
+    <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
+    <ind:pattern operation="pattern match">^/org/gnome/desktop/media-handling/automount-open$</ind:pattern>
fe0dde
+    <ind:instance datatype="int">1</ind:instance>
fe0dde
+  </ind:textfilecontent54_object>
fe0dde
+</def-group>
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/rule.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/rule.yml
fe0dde
new file mode 100644
fe0dde
index 0000000000..07ce263102
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/rule.yml
fe0dde
@@ -0,0 +1,57 @@
fe0dde
+documentation_complete: true
fe0dde
+
fe0dde
+prodtype: fedora,rhel7,rhel8
fe0dde
+
fe0dde
+title: 'Disable GNOME3 Automount Opening'
fe0dde
+
fe0dde
+description: |-
fe0dde
+    The system's default desktop environment, GNOME3, will mount
fe0dde
+    devices and removable media (such as DVDs, CDs and USB flash drives) whenever
fe0dde
+    they are inserted into the system. To disable automount-open within GNOME3, add or set
fe0dde
+    <tt>automount-open</tt> to <tt>false</tt> in <tt>/etc/dconf/db/local.d/00-security-settings</tt>.
fe0dde
+    For example:
fe0dde
+    
[org/gnome/desktop/media-handling]
fe0dde
+    automount-open=false
fe0dde
+    Once the settings have been added, add a lock to
fe0dde
+    <tt>/etc/dconf/db/local.d/locks/00-security-settings-lock</tt> to prevent user modification.
fe0dde
+    For example:
fe0dde
+    
/org/gnome/desktop/media-handling/automount-open
fe0dde
+    After the settings have been set, run <tt>dconf update</tt>.
fe0dde
+
fe0dde
+rationale: |-
fe0dde
+    Disabling automatic mounting in GNOME3 can prevent
fe0dde
+    the introduction of malware via removable media.
fe0dde
+    It will, however, also prevent desktop users from legitimate use
fe0dde
+    of removable media.
fe0dde
+
fe0dde
+severity: medium
fe0dde
+
fe0dde
+identifiers:
fe0dde
+    cce@rhel7: CCE-83692-4
fe0dde
+    cce@rhel8: CCE-83693-2
fe0dde
+
fe0dde
+references:
fe0dde
+    cui: 3.1.7
fe0dde
+    nist: CM-7(a),CM-7(b),CM-6(a)
fe0dde
+    nist-csf: PR.AC-3,PR.AC-6
fe0dde
+    isa-62443-2013: 'SR 1.1,SR 1.13,SR 1.2,SR 1.4,SR 1.5,SR 1.9,SR 2.1,SR 2.6'
fe0dde
+    isa-62443-2009: 4.3.3.2.2,4.3.3.5.2,4.3.3.6.6,4.3.3.7.2,4.3.3.7.4
fe0dde
+    cobit5: APO13.01,DSS01.04,DSS05.03,DSS05.04,DSS05.05,DSS05.07,DSS06.03
fe0dde
+    iso27001-2013: A.11.2.6,A.13.1.1,A.13.2.1,A.6.2.1,A.6.2.2,A.7.1.1,A.9.2.1
fe0dde
+    cis-csc: 12,16
fe0dde
+    stig@rhel7: RHEL-07-020111
fe0dde
+    disa: CCI-001958
fe0dde
+    srg: SRG-OS-000114-GPOS-00059,SRG-OS-000378-GPOS-00163,SRG-OS-000480-GPOS-00227
fe0dde
+
fe0dde
+
fe0dde
+ocil_clause: 'GNOME automounting is not disabled'
fe0dde
+
fe0dde
+ocil: |-
fe0dde
+    These settings can be verified by running the following:
fe0dde
+    
$ gsettings get org.gnome.desktop.media-handling automount-open
fe0dde
+    If properly configured, the output for <tt>automount-open</tt>should be <tt>false</tt>.
fe0dde
+    To ensure that users cannot enable automount opening in GNOME3, run the following:
fe0dde
+    
$ grep 'automount-open' /etc/dconf/db/local.d/locks/*
fe0dde
+    If properly configured, the output for <tt>automount-open</tt> should be <tt>/org/gnome/desktop/media-handling/automount-open</tt>
fe0dde
+
fe0dde
+platform: machine
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/correct_value.pass.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/correct_value.pass.sh
fe0dde
new file mode 100644
fe0dde
index 0000000000..b9995bf679
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/correct_value.pass.sh
fe0dde
@@ -0,0 +1,12 @@
fe0dde
+#!/bin/bash
fe0dde
+# profiles = xccdf_org.ssgproject.content_profile_stig
fe0dde
+
fe0dde
+. $SHARED/dconf_test_functions.sh
fe0dde
+
fe0dde
+yum -y install dconf
fe0dde
+clean_dconf_settings
fe0dde
+
fe0dde
+add_dconf_setting "org/gnome/desktop/media-handling" "automount-open" "false" "local.d" "00-security-settings"
fe0dde
+add_dconf_lock "org/gnome/desktop/media-handling" "automount-open" "local.d" "00-security-settings"
fe0dde
+
fe0dde
+
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/wrong_value.fail.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/wrong_value.fail.sh
fe0dde
new file mode 100644
fe0dde
index 0000000000..33a439cbb6
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/wrong_value.fail.sh
fe0dde
@@ -0,0 +1,7 @@
fe0dde
+#!/bin/bash
fe0dde
+# profiles = xccdf_org.ssgproject.content_profile_stig
fe0dde
+
fe0dde
+. $SHARED/dconf_test_functions.sh
fe0dde
+
fe0dde
+yum -y install dconf
fe0dde
+clean_dconf_settings
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/ansible/shared.yml
fe0dde
new file mode 100644
fe0dde
index 0000000000..036246e3be
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/ansible/shared.yml
fe0dde
@@ -0,0 +1,20 @@
fe0dde
+# platform = multi_platform_rhel,multi_platform_fedora
fe0dde
+# reboot = false
fe0dde
+# strategy = unknown
fe0dde
+# complexity = low
fe0dde
+# disruption = medium
fe0dde
+- name: "Disable GNOME3 Automounting - autorun-never"
fe0dde
+  ini_file:
fe0dde
+    dest: /etc/dconf/db/local.d/00-security-settings
fe0dde
+    section: org/gnome/desktop/media-handling
fe0dde
+    option: autorun-never
fe0dde
+    value: "true"
fe0dde
+    create: yes
fe0dde
+
fe0dde
+- name: "Prevent user modification of GNOME3 Automounting - autorun-never"
fe0dde
+  lineinfile:
fe0dde
+    path: /etc/dconf/db/local.d/locks/00-security-settings-lock
fe0dde
+    regexp: '^/org/gnome/desktop/media-handling/autorun-never'
fe0dde
+    line: '/org/gnome/desktop/media-handling/autorun-never'
fe0dde
+    create: yes
fe0dde
+
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/bash/shared.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/bash/shared.sh
fe0dde
new file mode 100644
fe0dde
index 0000000000..4c3bcb9547
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/bash/shared.sh
fe0dde
@@ -0,0 +1,5 @@
fe0dde
+# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,multi_platform_fedora
fe0dde
+
fe0dde
+
fe0dde
+{{{ bash_dconf_settings("org/gnome/desktop/media-handling", "autorun-never", "true", "local.d", "00-security-settings") }}}
fe0dde
+{{{ bash_dconf_lock("org/gnome/desktop/media-handling", "autorun-never", "local.d", "00-security-settings-lock") }}}
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml
fe0dde
new file mode 100644
fe0dde
index 0000000000..4c9840c644
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml
fe0dde
@@ -0,0 +1,50 @@
fe0dde
+<def-group>
fe0dde
+  <definition class="compliance" id="dconf_gnome_disable_autorun" version="1">
fe0dde
+    <metadata>
fe0dde
+      <title>Disable GNOME3 Automounting</title>
fe0dde
+      <affected family="unix">
fe0dde
+        <platform>Red Hat Enterprise Linux 7</platform>
fe0dde
+        <platform>Red Hat Enterprise Linux 8</platform>
fe0dde
+        <platform>multi_platform_fedora</platform>
fe0dde
+      </affected>
fe0dde
+      <description>The system's default desktop environment, GNOME3, will mount
fe0dde
+      devices and removable media (such as DVDs, CDs and USB flash drives)
fe0dde
+      whenever they are inserted into the system. Disable automount and autorun
fe0dde
+      within GNOME3.</description>
fe0dde
+    </metadata>
fe0dde
+    <criteria operator="OR">
fe0dde
+      <extend_definition comment="dconf installed" definition_ref="package_dconf_installed" negate="true" />
fe0dde
+      <criteria comment="Disable GNOME3 automount/autorun and prevent user from changing it" operator="AND">
fe0dde
+        <extend_definition comment="dconf user profile exists" definition_ref="enable_dconf_user_profile" />
fe0dde
+        <criterion comment="Disable autorun in GNOME3" test_ref="test_dconf_gnome_disable_autorun" />
fe0dde
+        <criterion comment="Prevent user from changing autorun setting" test_ref="test_prevent_user_gnome_autorun" />
fe0dde
+      </criteria>
fe0dde
+    </criteria>
fe0dde
+  </definition>
fe0dde
+
fe0dde
+  
fe0dde
+  comment="Disable autorun in GNOME"
fe0dde
+  id="test_dconf_gnome_disable_autorun" version="1">
fe0dde
+    <ind:object object_ref="obj_dconf_gnome_disable_autorun" />
fe0dde
+  </ind:textfilecontent54_test>
fe0dde
+  
fe0dde
+  version="1">
fe0dde
+    <ind:path>/etc/dconf/db/local.d/</ind:path>
fe0dde
+    <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
+    <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling]([^\n]*\n+)+?autorun-never=true$</ind:pattern>
fe0dde
+    <ind:instance datatype="int">1</ind:instance>
fe0dde
+  </ind:textfilecontent54_object>
fe0dde
+
fe0dde
+  
fe0dde
+  comment="Prevent user from changing autorun setting"
fe0dde
+  id="test_prevent_user_gnome_autorun" version="1">
fe0dde
+    <ind:object object_ref="obj_prevent_user_gnome_autorun" />
fe0dde
+  </ind:textfilecontent54_test>
fe0dde
+  
fe0dde
+  version="1">
fe0dde
+    <ind:path>/etc/dconf/db/local.d/locks/</ind:path>
fe0dde
+    <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
+    <ind:pattern operation="pattern match">^/org/gnome/desktop/media-handling/autorun-never$</ind:pattern>
fe0dde
+    <ind:instance datatype="int">1</ind:instance>
fe0dde
+  </ind:textfilecontent54_object>
fe0dde
+</def-group>
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/rule.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/rule.yml
fe0dde
new file mode 100644
fe0dde
index 0000000000..92fa209fb5
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/rule.yml
fe0dde
@@ -0,0 +1,57 @@
fe0dde
+documentation_complete: true
fe0dde
+
fe0dde
+prodtype: fedora,rhel7,rhel8
fe0dde
+
fe0dde
+title: 'Disable GNOME3 Automount running'
fe0dde
+
fe0dde
+description: |-
fe0dde
+    The system's default desktop environment, GNOME3, will mount
fe0dde
+    devices and removable media (such as DVDs, CDs and USB flash drives) whenever
fe0dde
+    they are inserted into the system. To disable autorun-never within GNOME3, add or set
fe0dde
+    <tt>autorun-never</tt> to <tt>true</tt> in <tt>/etc/dconf/db/local.d/00-security-settings</tt>.
fe0dde
+    For example:
fe0dde
+    
[org/gnome/desktop/media-handling]
fe0dde
+    autorun-never=true
fe0dde
+    Once the settings have been added, add a lock to
fe0dde
+    <tt>/etc/dconf/db/local.d/locks/00-security-settings-lock</tt> to prevent user modification.
fe0dde
+    For example:
fe0dde
+    
/org/gnome/desktop/media-handling/autorun-never
fe0dde
+    After the settings have been set, run <tt>dconf update</tt>.
fe0dde
+
fe0dde
+rationale: |-
fe0dde
+    Disabling automatic mount running in GNOME3 can prevent
fe0dde
+    the introduction of malware via removable media.
fe0dde
+    It will, however, also prevent desktop users from legitimate use
fe0dde
+    of removable media.
fe0dde
+
fe0dde
+severity: medium
fe0dde
+
fe0dde
+identifiers:
fe0dde
+    cce@rhel7: CCE-83741-9
fe0dde
+    cce@rhel8: CCE-83742-7
fe0dde
+
fe0dde
+references:
fe0dde
+    cui: 3.1.7
fe0dde
+    nist: CM-7(a),CM-7(b),CM-6(a)
fe0dde
+    nist-csf: PR.AC-3,PR.AC-6
fe0dde
+    isa-62443-2013: 'SR 1.1,SR 1.13,SR 1.2,SR 1.4,SR 1.5,SR 1.9,SR 2.1,SR 2.6'
fe0dde
+    isa-62443-2009: 4.3.3.2.2,4.3.3.5.2,4.3.3.6.6,4.3.3.7.2,4.3.3.7.4
fe0dde
+    cobit5: APO13.01,DSS01.04,DSS05.03,DSS05.04,DSS05.05,DSS05.07,DSS06.03
fe0dde
+    iso27001-2013: A.11.2.6,A.13.1.1,A.13.2.1,A.6.2.1,A.6.2.2,A.7.1.1,A.9.2.1
fe0dde
+    cis-csc: 12,16
fe0dde
+    stig@rhel7: RHEL-07-020111
fe0dde
+    disa: CCI-001958
fe0dde
+    srg: SRG-OS-000114-GPOS-00059,SRG-OS-000378-GPOS-00163,SRG-OS-000480-GPOS-00227
fe0dde
+
fe0dde
+
fe0dde
+ocil_clause: 'GNOME autorun is not disabled'
fe0dde
+
fe0dde
+ocil: |-
fe0dde
+    These settings can be verified by running the following:
fe0dde
+    
$ gsettings get org.gnome.desktop.media-handling autorun-never
fe0dde
+    If properly configured, the output for <tt>autorun-never</tt>should be <tt>true</tt>.
fe0dde
+    To ensure that users cannot enable autorun in GNOME3, run the following:
fe0dde
+    
$ grep 'autorun-never' /etc/dconf/db/local.d/locks/*
fe0dde
+    If properly configured, the output for <tt>autorun-never</tt> should be <tt>/org/gnome/desktop/media-handling/autorun-never</tt>
fe0dde
+
fe0dde
+platform: machine
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/correct_value.pass.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/correct_value.pass.sh
fe0dde
new file mode 100644
fe0dde
index 0000000000..8688fc864a
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/correct_value.pass.sh
fe0dde
@@ -0,0 +1,10 @@
fe0dde
+#!/bin/bash
fe0dde
+# profiles = xccdf_org.ssgproject.content_profile_stig
fe0dde
+
fe0dde
+. $SHARED/dconf_test_functions.sh
fe0dde
+
fe0dde
+yum -y install dconf
fe0dde
+clean_dconf_settings
fe0dde
+
fe0dde
+add_dconf_setting "org/gnome/desktop/media-handling" "autorun-never" "true" "local.d" "00-security-settings"
fe0dde
+add_dconf_lock "org/gnome/desktop/media-handling" "autorun-never" "local.d" "00-security-settings"
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/wrong_value.fail.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/wrong_value.fail.sh
fe0dde
new file mode 100644
fe0dde
index 0000000000..33a439cbb6
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/wrong_value.fail.sh
fe0dde
@@ -0,0 +1,7 @@
fe0dde
+#!/bin/bash
fe0dde
+# profiles = xccdf_org.ssgproject.content_profile_stig
fe0dde
+
fe0dde
+. $SHARED/dconf_test_functions.sh
fe0dde
+
fe0dde
+yum -y install dconf
fe0dde
+clean_dconf_settings
fe0dde
diff --git a/shared/references/cce-redhat-avail.txt b/shared/references/cce-redhat-avail.txt
fe0dde
index c012e605a9..6c0ea9893b 100644
fe0dde
--- a/shared/references/cce-redhat-avail.txt
fe0dde
+++ b/shared/references/cce-redhat-avail.txt
fe0dde
@@ -293,8 +293,6 @@ CCE-83688-2
fe0dde
 CCE-83689-0
fe0dde
 CCE-83690-8
fe0dde
 CCE-83691-6
fe0dde
-CCE-83692-4
fe0dde
-CCE-83693-2
fe0dde
 CCE-83694-0
fe0dde
 CCE-83695-7
fe0dde
 CCE-83696-5
fe0dde
@@ -333,8 +331,6 @@ CCE-83735-1
fe0dde
 CCE-83736-9
fe0dde
 CCE-83739-3
fe0dde
 CCE-83740-1
fe0dde
-CCE-83741-9
fe0dde
-CCE-83742-7
fe0dde
 CCE-83743-5
fe0dde
 CCE-83744-3
fe0dde
 CCE-83745-0
fe0dde
fe0dde
From cfdaf607bcc61551032a9b2a48d4ea68c15775a9 Mon Sep 17 00:00:00 2001
fe0dde
From: Gabriel Becker <ggasparb@redhat.com>
fe0dde
Date: Thu, 6 Aug 2020 15:54:22 +0200
fe0dde
Subject: [PATCH 2/8] Update RHEL7 STIG profile with new rules.
fe0dde
fe0dde
- dconf_gnome_disable_automount_open
fe0dde
- dconf_gnome_disable_autorun
fe0dde
---
fe0dde
 rhel7/profiles/stig.profile | 3 +++
fe0dde
 1 file changed, 3 insertions(+)
fe0dde
fe0dde
diff --git a/rhel7/profiles/stig.profile b/rhel7/profiles/stig.profile
fe0dde
index f9f3e94e2a..0d723117a5 100644
fe0dde
--- a/rhel7/profiles/stig.profile
fe0dde
+++ b/rhel7/profiles/stig.profile
fe0dde
@@ -77,6 +77,9 @@ selections:
fe0dde
     - dconf_gnome_screensaver_idle_activation_locked
fe0dde
     - dconf_gnome_screensaver_lock_delay
fe0dde
     - dconf_gnome_disable_ctrlaltdel_reboot
fe0dde
+    - dconf_gnome_disable_automount
fe0dde
+    - dconf_gnome_disable_automount_open
fe0dde
+    - dconf_gnome_disable_autorun
fe0dde
     - accounts_password_pam_ucredit
fe0dde
     - accounts_password_pam_lcredit
fe0dde
     - accounts_password_pam_dcredit
fe0dde
fe0dde
From 52d1ac84f72e071a1de46a940d3a4e4cf52d807d Mon Sep 17 00:00:00 2001
fe0dde
From: Gabriel Becker <ggasparb@redhat.com>
fe0dde
Date: Thu, 6 Aug 2020 15:55:25 +0200
fe0dde
Subject: [PATCH 3/8] Update RHEL7 NCP profile with new rules.
fe0dde
fe0dde
- dconf_gnome_disable_automount_open
fe0dde
- dconf_gnome_disable_autorun
fe0dde
---
fe0dde
 rhel7/profiles/ncp.profile | 2 ++
fe0dde
 1 file changed, 2 insertions(+)
fe0dde
fe0dde
diff --git a/rhel7/profiles/ncp.profile b/rhel7/profiles/ncp.profile
fe0dde
index 7de1c7bb42..cf1ccc4612 100644
fe0dde
--- a/rhel7/profiles/ncp.profile
fe0dde
+++ b/rhel7/profiles/ncp.profile
fe0dde
@@ -317,6 +317,8 @@ selections:
fe0dde
     - dconf_db_up_to_date
fe0dde
     - dconf_gnome_banner_enabled
fe0dde
     - dconf_gnome_disable_automount
fe0dde
+    - dconf_gnome_disable_automount_open
fe0dde
+    - dconf_gnome_disable_autorun
fe0dde
     - dconf_gnome_disable_ctrlaltdel_reboot
fe0dde
     - dconf_gnome_disable_geolocation
fe0dde
     - dconf_gnome_disable_restart_shutdown
fe0dde
fe0dde
From 929054cec387203c53c3e3df166b09e6aa02023b Mon Sep 17 00:00:00 2001
fe0dde
From: Gabriel Becker <ggasparb@redhat.com>
fe0dde
Date: Tue, 18 Aug 2020 16:44:29 +0200
fe0dde
Subject: [PATCH 4/8] Use bash function to install required testing packages.
fe0dde
fe0dde
dconf and gdm packages are required make checks applicable.
fe0dde
---
fe0dde
 .../tests/correct_value.pass.sh                            | 2 +-
fe0dde
 .../tests/wrong_value.fail.sh                              | 7 +++++++
fe0dde
 .../tests/correct_value.pass.sh                            | 2 +-
fe0dde
 .../tests/wrong_value.fail.sh                              | 2 +-
fe0dde
 .../tests/correct_value.pass.sh                            | 2 +-
fe0dde
 .../dconf_gnome_disable_autorun/tests/wrong_value.fail.sh  | 2 +-
fe0dde
 6 files changed, 12 insertions(+), 5 deletions(-)
fe0dde
 create mode 100644 linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/wrong_value.fail.sh
fe0dde
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/correct_value.pass.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/correct_value.pass.sh
fe0dde
index 685f5925c5..6aeeeee8ee 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/correct_value.pass.sh
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/correct_value.pass.sh
fe0dde
@@ -3,7 +3,7 @@
fe0dde
 
fe0dde
 . $SHARED/dconf_test_functions.sh
fe0dde
 
fe0dde
-yum -y install dconf
fe0dde
+install_dconf_and_gdm_if_needed
fe0dde
 clean_dconf_settings
fe0dde
 
fe0dde
 add_dconf_setting "org/gnome/desktop/media-handling" "automount" "false" "local.d" "00-security-settings"
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/wrong_value.fail.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/wrong_value.fail.sh
fe0dde
new file mode 100644
fe0dde
index 0000000000..35c6e417ad
fe0dde
--- /dev/null
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/wrong_value.fail.sh
fe0dde
@@ -0,0 +1,7 @@
fe0dde
+#!/bin/bash
fe0dde
+# profiles = xccdf_org.ssgproject.content_profile_stig
fe0dde
+
fe0dde
+. $SHARED/dconf_test_functions.sh
fe0dde
+
fe0dde
+install_dconf_and_gdm_if_needed
fe0dde
+clean_dconf_settings
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/correct_value.pass.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/correct_value.pass.sh
fe0dde
index b9995bf679..77c49a861b 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/correct_value.pass.sh
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/correct_value.pass.sh
fe0dde
@@ -3,7 +3,7 @@
fe0dde
 
fe0dde
 . $SHARED/dconf_test_functions.sh
fe0dde
 
fe0dde
-yum -y install dconf
fe0dde
+install_dconf_and_gdm_if_needed
fe0dde
 clean_dconf_settings
fe0dde
 
fe0dde
 add_dconf_setting "org/gnome/desktop/media-handling" "automount-open" "false" "local.d" "00-security-settings"
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/wrong_value.fail.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/wrong_value.fail.sh
fe0dde
index 33a439cbb6..35c6e417ad 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/wrong_value.fail.sh
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/wrong_value.fail.sh
fe0dde
@@ -3,5 +3,5 @@
fe0dde
 
fe0dde
 . $SHARED/dconf_test_functions.sh
fe0dde
 
fe0dde
-yum -y install dconf
fe0dde
+install_dconf_and_gdm_if_needed
fe0dde
 clean_dconf_settings
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/correct_value.pass.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/correct_value.pass.sh
fe0dde
index 8688fc864a..0c30c00a3d 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/correct_value.pass.sh
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/correct_value.pass.sh
fe0dde
@@ -3,7 +3,7 @@
fe0dde
 
fe0dde
 . $SHARED/dconf_test_functions.sh
fe0dde
 
fe0dde
-yum -y install dconf
fe0dde
+install_dconf_and_gdm_if_needed
fe0dde
 clean_dconf_settings
fe0dde
 
fe0dde
 add_dconf_setting "org/gnome/desktop/media-handling" "autorun-never" "true" "local.d" "00-security-settings"
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/wrong_value.fail.sh b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/wrong_value.fail.sh
fe0dde
index 33a439cbb6..35c6e417ad 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/wrong_value.fail.sh
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/tests/wrong_value.fail.sh
fe0dde
@@ -3,5 +3,5 @@
fe0dde
 
fe0dde
 . $SHARED/dconf_test_functions.sh
fe0dde
 
fe0dde
-yum -y install dconf
fe0dde
+install_dconf_and_gdm_if_needed
fe0dde
 clean_dconf_settings
fe0dde
fe0dde
From 8eccb4a33a38043224e3ef7d6b591fcaa7c0a8c5 Mon Sep 17 00:00:00 2001
fe0dde
From: Gabriel Becker <ggasparb@redhat.com>
fe0dde
Date: Mon, 21 Sep 2020 16:25:41 +0200
fe0dde
Subject: [PATCH 5/8] Escape bracket character in dconf automount rules
fe0dde
 regexes.
fe0dde
fe0dde
---
fe0dde
 .../dconf_gnome_disable_automount/oval/shared.xml               | 2 +-
fe0dde
 .../dconf_gnome_disable_automount_open/oval/shared.xml          | 2 +-
fe0dde
 .../dconf_gnome_disable_autorun/oval/shared.xml                 | 2 +-
fe0dde
 3 files changed, 3 insertions(+), 3 deletions(-)
fe0dde
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml
fe0dde
index c05b1d8e1b..8024311b23 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml
fe0dde
@@ -23,7 +23,7 @@
fe0dde
   version="1">
fe0dde
     <ind:path>/etc/dconf/db/local.d/</ind:path>
fe0dde
     <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
-    <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling]([^\n]*\n+)+?automount=false$</ind:pattern>
fe0dde
+    <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling\]([^\n]*\n+)+?automount=false$</ind:pattern>
fe0dde
     <ind:instance datatype="int">1</ind:instance>
fe0dde
   </ind:textfilecontent54_object>
fe0dde
 
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml
fe0dde
index 84264fa8f4..3230efca62 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml
fe0dde
@@ -31,7 +31,7 @@
fe0dde
   version="1">
fe0dde
     <ind:path>/etc/dconf/db/local.d/</ind:path>
fe0dde
     <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
-    <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling]([^\n]*\n+)+?automount-open=false$</ind:pattern>
fe0dde
+    <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling\]([^\n]*\n+)+?automount-open=false$</ind:pattern>
fe0dde
     <ind:instance datatype="int">1</ind:instance>
fe0dde
   </ind:textfilecontent54_object>
fe0dde
 
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml
fe0dde
index 4c9840c644..a7f54a7f19 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml
fe0dde
@@ -31,7 +31,7 @@
fe0dde
   version="1">
fe0dde
     <ind:path>/etc/dconf/db/local.d/</ind:path>
fe0dde
     <ind:filename operation="pattern match">^.*$</ind:filename>
fe0dde
-    <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling]([^\n]*\n+)+?autorun-never=true$</ind:pattern>
fe0dde
+    <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling\]([^\n]*\n+)+?autorun-never=true$</ind:pattern>
fe0dde
     <ind:instance datatype="int">1</ind:instance>
fe0dde
   </ind:textfilecontent54_object>
fe0dde
 
fe0dde
fe0dde
From ff380dc7ccab82d40b0c94a782901f439c76b89a Mon Sep 17 00:00:00 2001
fe0dde
From: Gabriel Becker <ggasparb@redhat.com>
fe0dde
Date: Mon, 21 Sep 2020 16:49:23 +0200
fe0dde
Subject: [PATCH 6/8] Use oval_metadata macro in some dconf gnome rules.
fe0dde
fe0dde
Reduce boilerplate code by using jinja macro.
fe0dde
---
fe0dde
 .../oval/shared.xml                             |  3 +--
fe0dde
 .../oval/shared.xml                             | 15 +++------------
fe0dde
 .../dconf_gnome_disable_autorun/oval/shared.xml | 17 ++++-------------
fe0dde
 3 files changed, 8 insertions(+), 27 deletions(-)
fe0dde
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml
fe0dde
index 8024311b23..7cc031206c 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml
fe0dde
@@ -2,8 +2,7 @@
fe0dde
   <definition class="compliance" id="dconf_gnome_disable_automount" version="2">
fe0dde
     {{{ oval_metadata("The system's default desktop environment, GNOME3, will mount
fe0dde
       devices and removable media (such as DVDs, CDs and USB flash drives)
fe0dde
-      whenever they are inserted into the system. Disable automount and autorun
fe0dde
-      within GNOME3.") }}}
fe0dde
+      whenever they are inserted into the system. Disable automount within GNOME3.", title="Disable GNOME3 automount") }}}
fe0dde
     <criteria operator="OR">
fe0dde
       <extend_definition comment="dconf installed" definition_ref="package_dconf_installed" negate="true" />
fe0dde
       <criteria comment="Disable GNOME3 automount and prevent user from changing it" operator="AND">
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml
fe0dde
index 3230efca62..1d2cda88ba 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml
fe0dde
@@ -1,17 +1,8 @@
fe0dde
 <def-group>
fe0dde
   <definition class="compliance" id="dconf_gnome_disable_automount_open" version="1">
fe0dde
-    <metadata>
fe0dde
-      <title>Disable GNOME3 automount-open</title>
fe0dde
-      <affected family="unix">
fe0dde
-        <platform>Red Hat Enterprise Linux 7</platform>
fe0dde
-        <platform>Red Hat Enterprise Linux 8</platform>
fe0dde
-        <platform>multi_platform_fedora</platform>
fe0dde
-      </affected>
fe0dde
-      <description>The system's default desktop environment, GNOME3, will mount
fe0dde
-      devices and removable media (such as DVDs, CDs and USB flash drives)
fe0dde
-      whenever they are inserted into the system. Disable automount-open
fe0dde
-      within GNOME3.</description>
fe0dde
-    </metadata>
fe0dde
+    {{{ oval_metadata("The system's default desktop environment, GNOME3, will mount
fe0dde
+    devices and removable media (such as DVDs, CDs and USB flash drives)
fe0dde
+    whenever they are inserted into the system. Disable automount-open within GNOME3.", title="Disable GNOME3 automount-open") }}}
fe0dde
     <criteria operator="OR">
fe0dde
       <extend_definition comment="dconf installed" definition_ref="package_dconf_installed" negate="true" />
fe0dde
       <criteria comment="Disable GNOME3 automount/autorun and prevent user from changing it" operator="AND">
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml
fe0dde
index a7f54a7f19..6299881f45 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/oval/shared.xml
fe0dde
@@ -1,20 +1,11 @@
fe0dde
 <def-group>
fe0dde
   <definition class="compliance" id="dconf_gnome_disable_autorun" version="1">
fe0dde
-    <metadata>
fe0dde
-      <title>Disable GNOME3 Automounting</title>
fe0dde
-      <affected family="unix">
fe0dde
-        <platform>Red Hat Enterprise Linux 7</platform>
fe0dde
-        <platform>Red Hat Enterprise Linux 8</platform>
fe0dde
-        <platform>multi_platform_fedora</platform>
fe0dde
-      </affected>
fe0dde
-      <description>The system's default desktop environment, GNOME3, will mount
fe0dde
-      devices and removable media (such as DVDs, CDs and USB flash drives)
fe0dde
-      whenever they are inserted into the system. Disable automount and autorun
fe0dde
-      within GNOME3.</description>
fe0dde
-    </metadata>
fe0dde
+    {{{ oval_metadata("The system's default desktop environment, GNOME3, will mount
fe0dde
+    devices and removable media (such as DVDs, CDs and USB flash drives)
fe0dde
+    whenever they are inserted into the system. Disable autorun within GNOME3.", title="Disable GNOME3 autorun") }}}
fe0dde
     <criteria operator="OR">
fe0dde
       <extend_definition comment="dconf installed" definition_ref="package_dconf_installed" negate="true" />
fe0dde
-      <criteria comment="Disable GNOME3 automount/autorun and prevent user from changing it" operator="AND">
fe0dde
+      <criteria comment="Disable GNOME3 autorun and prevent user from changing it" operator="AND">
fe0dde
         <extend_definition comment="dconf user profile exists" definition_ref="enable_dconf_user_profile" />
fe0dde
         <criterion comment="Disable autorun in GNOME3" test_ref="test_dconf_gnome_disable_autorun" />
fe0dde
         <criterion comment="Prevent user from changing autorun setting" test_ref="test_prevent_user_gnome_autorun" />
fe0dde
fe0dde
From 90c9b3d5e6796ec5c309af2a8b9e1d6fca1be263 Mon Sep 17 00:00:00 2001
fe0dde
From: Gabriel Becker <ggasparb@redhat.com>
fe0dde
Date: Mon, 21 Sep 2020 16:57:24 +0200
fe0dde
Subject: [PATCH 7/8] Fix ansible remediation for dconf gnome disable mount
fe0dde
 rules.
fe0dde
fe0dde
---
fe0dde
 .../dconf_gnome_disable_automount/ansible/shared.yml             | 1 +
fe0dde
 .../dconf_gnome_disable_automount_open/ansible/shared.yml        | 1 +
fe0dde
 .../dconf_gnome_disable_autorun/ansible/shared.yml               | 1 +
fe0dde
 3 files changed, 3 insertions(+)
fe0dde
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/ansible/shared.yml
fe0dde
index eeb7b8f301..964ba02a4f 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/ansible/shared.yml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/ansible/shared.yml
fe0dde
@@ -10,6 +10,7 @@
fe0dde
     option: automount
fe0dde
     value: "false"
fe0dde
     create: yes
fe0dde
+    no_extra_spaces: yes
fe0dde
 
fe0dde
 - name: "Prevent user modification of GNOME3 Automounting - automount"
fe0dde
   lineinfile:
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/ansible/shared.yml
fe0dde
index 680d148347..65a6a0784b 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/ansible/shared.yml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/ansible/shared.yml
fe0dde
@@ -10,6 +10,7 @@
fe0dde
     option: automount-open
fe0dde
     value: "false"
fe0dde
     create: yes
fe0dde
+    no_extra_spaces: yes
fe0dde
 
fe0dde
 - name: "Prevent user modification of GNOME3 Automounting - automount-open"
fe0dde
   lineinfile:
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/ansible/shared.yml
fe0dde
index 036246e3be..7f5394f13a 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/ansible/shared.yml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/ansible/shared.yml
fe0dde
@@ -10,6 +10,7 @@
fe0dde
     option: autorun-never
fe0dde
     value: "true"
fe0dde
     create: yes
fe0dde
+    no_extra_spaces: yes
fe0dde
 
fe0dde
 - name: "Prevent user modification of GNOME3 Automounting - autorun-never"
fe0dde
   lineinfile:
fe0dde
fe0dde
From ea3110c04b78c2d7bc3bae9977b4d4a19386e259 Mon Sep 17 00:00:00 2001
fe0dde
From: Gabriel Becker <ggasparb@redhat.com>
fe0dde
Date: Wed, 4 Nov 2020 09:52:08 +0100
fe0dde
Subject: [PATCH 8/8] Deduplicate STIG ID in gnome automount rules.
fe0dde
fe0dde
---
fe0dde
 .../dconf_gnome_disable_automount_open/rule.yml                  | 1 -
fe0dde
 .../gnome_media_settings/dconf_gnome_disable_autorun/rule.yml    | 1 -
fe0dde
 2 files changed, 2 deletions(-)
fe0dde
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/rule.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/rule.yml
fe0dde
index 07ce263102..f76241a48d 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/rule.yml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/rule.yml
fe0dde
@@ -39,7 +39,6 @@ references:
fe0dde
     cobit5: APO13.01,DSS01.04,DSS05.03,DSS05.04,DSS05.05,DSS05.07,DSS06.03
fe0dde
     iso27001-2013: A.11.2.6,A.13.1.1,A.13.2.1,A.6.2.1,A.6.2.2,A.7.1.1,A.9.2.1
fe0dde
     cis-csc: 12,16
fe0dde
-    stig@rhel7: RHEL-07-020111
fe0dde
     disa: CCI-001958
fe0dde
     srg: SRG-OS-000114-GPOS-00059,SRG-OS-000378-GPOS-00163,SRG-OS-000480-GPOS-00227
fe0dde
 
fe0dde
diff --git a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/rule.yml b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/rule.yml
fe0dde
index 92fa209fb5..943b444ceb 100644
fe0dde
--- a/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/rule.yml
fe0dde
+++ b/linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_autorun/rule.yml
fe0dde
@@ -39,7 +39,6 @@ references:
fe0dde
     cobit5: APO13.01,DSS01.04,DSS05.03,DSS05.04,DSS05.05,DSS05.07,DSS06.03
fe0dde
     iso27001-2013: A.11.2.6,A.13.1.1,A.13.2.1,A.6.2.1,A.6.2.2,A.7.1.1,A.9.2.1
fe0dde
     cis-csc: 12,16
fe0dde
-    stig@rhel7: RHEL-07-020111
fe0dde
     disa: CCI-001958
fe0dde
     srg: SRG-OS-000114-GPOS-00059,SRG-OS-000378-GPOS-00163,SRG-OS-000480-GPOS-00227
fe0dde