Merge pull request #9879 from marcusburghardt/issue_9872_quotas_master

Include warning regarding quota options in XFS
ComplianceAsCode · Nov 25, 2022 · 40acec7 · 40acec7
2 parents c1eb2b9 + 39817e1
commit 40acec7
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/linux_os/guide/system/permissions/partitions/mount_option_home_grpquota/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_home_grpquota/rule.yml
@@ -33,15 +33,13 @@ fixtext: '{{{ fixtext_mount_option("/home", "grpquota") }}}'
 
 srg_requirement: '{{{ srg_requirement_mount_option("/home", "grpquota") }}}'
 
-{{% if "ol" not in product %}}
-template:
-    name: mount_option
-    vars:
-        mountpoint: /home
-        mountoption: grpquota
-        mount_has_to_exist: 'yes'
-{{% else %}}
 warnings:
+    - general: |-
+        The quota options for XFS file systems can only be activated when mounting the partition.
+        It is not possible to enable them by remounting an already mounted partition. Therefore,
+        if the desired options were not defined before mounting the partition, dismount and mount
+        it again to apply the quota options.
+{{% if "ol" in product %}}
     - functionality: |-
         OVAL looks for partitions whose mount point is a substring of any interactive user's home
         directory and validates that grpquota option is there. Because of this, there could be
@@ -52,8 +50,18 @@ warnings:
         Bash remediation uses the <tt>df</tt> command to find out the partition where the home
         directory is mounted. However, if the directory doesn't exist the remediation won't be
         applied.
+{{% endif %}}
+
+{{% if "ol" in product %}}
 template:
     name: mount_option_home
     vars:
         mountoption: grpquota
+{{% else %}}
+template:
+    name: mount_option
+    vars:
+        mountpoint: /home
+        mountoption: grpquota
+        mount_has_to_exist: 'yes'
 {{% endif %}}
diff --git a/linux_os/guide/system/permissions/partitions/mount_option_home_usrquota/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_home_usrquota/rule.yml
@@ -33,15 +33,13 @@ fixtext: '{{{ fixtext_mount_option("/home", "usrquota") }}}'
 
 srg_requirement: '{{{ srg_requirement_mount_option("/home", "usrquota") }}}'
 
-{{% if "ol" not in product %}}
-template:
-    name: mount_option
-    vars:
-        mountpoint: /home
-        mountoption: usrquota
-        mount_has_to_exist: 'yes'
-{{% else %}}
 warnings:
+    - general: |-
+        The quota options for XFS file systems can only be activated when mounting the partition.
+        It is not possible to enable them by remounting an already mounted partition. Therefore,
+        if the desired options were not defined before mounting the partition, dismount and mount
+        it again to apply the quota options.
+{{% if "ol" in product %}}
     - functionality: |-
         OVAL looks for partitions whose mount point is a substring of any interactive user's home
         directory and validates that usrquota option is there. Because of this, there could be
@@ -52,8 +50,18 @@ warnings:
         Bash remediation uses the <tt>df</tt> command to find out the partition where the home
         directory is mounted. However, if the directory doesn't exist the remediation won't be
         applied.
+{{% endif %}}
+
+{{% if "ol" in product %}}
 template:
     name: mount_option_home
     vars:
         mountoption: usrquota
+{{% else %}}
+template:
+    name: mount_option
+    vars:
+        mountpoint: /home
+        mountoption: usrquota
+        mount_has_to_exist: 'yes'
 {{% endif %}}