From 796cf3278aad1ee46a36c0a19fe361c87540dde4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Thu, 18 Jul 2024 16:01:00 +0200
Subject: [PATCH] Extend test test_remediation_kickstart.sh

---
 .../XCCDF/unittests/test_remediation_kickstart.ds.xml | 11 +++++++++--
 .../API/XCCDF/unittests/test_remediation_kickstart.sh |  7 ++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/tests/API/XCCDF/unittests/test_remediation_kickstart.ds.xml b/tests/API/XCCDF/unittests/test_remediation_kickstart.ds.xml
index 96f9f812ef..c5ec071617 100644
--- a/tests/API/XCCDF/unittests/test_remediation_kickstart.ds.xml
+++ b/tests/API/XCCDF/unittests/test_remediation_kickstart.ds.xml
@@ -58,6 +58,7 @@
         <select idref="xccdf_org.openscap.www_rule_3" selected="true"/>
         <select idref="xccdf_org.openscap.www_rule_4" selected="true"/>
         <select idref="xccdf_org.openscap.www_rule_5" selected="true"/>
+        <select idref="xccdf_org.openscap.www_rule_6" selected="true"/>
       </Profile>
       <Rule selected="true" id="xccdf_org.openscap.www_rule_1">
         <title>Rule 1: Enable Audit Service</title>
@@ -85,7 +86,7 @@
         </fix>
       </Rule>
       <Rule selected="true" id="xccdf_org.openscap.www_rule_5">
-        <title>Rule 4: Install and enable SSHD</title>
+        <title>Rule 5: Install and enable SSHD</title>
         <fix system="urn:xccdf:fix:script:kickstart">
           # openssh-server will go to %packages section
           package install openssh-server
@@ -97,6 +98,12 @@
           post mkdir /etc/scap
         </fix>
       </Rule>
+      <Rule selected="true" id="xccdf_org.openscap.www_rule_6">
+        <title>Rule 6: Configure all partitions</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+          logvol /var/tmp 1024
+        </fix>
+      </Rule>
     </Benchmark>
   </ds:component>
-</ds:data-stream-collection>
\ No newline at end of file
+</ds:data-stream-collection>
diff --git a/tests/API/XCCDF/unittests/test_remediation_kickstart.sh b/tests/API/XCCDF/unittests/test_remediation_kickstart.sh
index 65b2b5aebd..a08dd874e5 100755
--- a/tests/API/XCCDF/unittests/test_remediation_kickstart.sh
+++ b/tests/API/XCCDF/unittests/test_remediation_kickstart.sh
@@ -3,6 +3,7 @@
 
 set -e -o pipefail
 
+
 kickstart=$(mktemp)
 stderr=$(mktemp)
 
@@ -20,7 +21,11 @@ stderr=$(mktemp)
 
 $OSCAP xccdf generate fix --fix-type kickstart --output "$kickstart" --profile common "$srcdir/test_remediation_kickstart.ds.xml"
 
-grep -q "# Kickstart for Common hardening profile" "$kickstart"
+grep -q '# Kickstart for Common hardening profile' "$kickstart"
+grep -q 'services --disabled=telnet --enabled=auditd,rsyslog,sshd' "$kickstart"
+grep -q 'logvol /var/tmp --fstype=xfs --name=vartmp --vgname=VolGroup --size=1024' "$kickstart"
+grep -q 'mkdir /etc/scap' "$kickstart"
+grep -q '\-usbguard' "$kickstart"
 
 rm -rf "$kickstart"
 rm -rf "$stderr"