WIP

ComplianceAsCode · Feb 6, 2024 · d189a41 · d189a41
1 parent 6e972b4
commit d189a41
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 29 deletions.
diff --git a/tests/ssg_test_suite/common.py b/tests/ssg_test_suite/common.py
@@ -309,19 +309,13 @@ def load_rule_and_env(rule_dir_path, env_yaml, product=None):
     rule = RuleYAML.from_yaml(rule_path, env_yaml)
     rule.normalize(product)
 
-    # Note that most places would check prodtype, but we don't care
-    # about that here: if the rule is available to the product, we
-    # load and parse it anyways as we have no knowledge of the
-    # top-level profile or rule passed into the test suite.
-    prodtypes = parse_prodtype(rule.prodtype)
-
     # Our local copy of env_yaml needs some properties from rule.yml
     # for completeness.
     local_env_yaml = dict()
     local_env_yaml.update(env_yaml)
     local_env_yaml['rule_id'] = rule.id_
     local_env_yaml['rule_title'] = rule.title
-    local_env_yaml['products'] = prodtypes
+    local_env_yaml['products'] = {'all'} # TODO: prodtype
 
     return rule, local_env_yaml
 

diff --git a/tests/unit/ssg-module/data/accounts_tmout.yml b/tests/unit/ssg-module/data/accounts_tmout.yml
@@ -1,4 +1,3 @@
-prodtype: alinux2,alinux3,fedora,ol7,ol8,ol9,rhcos4,rhel7,rhel8,rhel9,rhv4,sle12,sle15,ubuntu2004,ubuntu2204
 title: Set Interactive Session Timeout
 description: 'Setting the <tt>TMOUT</tt> option in <tt>/etc/profile</tt> ensures that
 

diff --git a/tests/unit/ssg-module/data/accounts_tmout_without_ocil.yml b/tests/unit/ssg-module/data/accounts_tmout_without_ocil.yml
@@ -1,4 +1,3 @@
-prodtype: alinux2,alinux3,fedora,ol7,ol8,ol9,rhcos4,rhel7,rhel8,rhel9,rhv4,sle12,sle15,ubuntu2004,ubuntu2204
 title: Set Interactive Session Timeout
 description: 'Setting the <tt>TMOUT</tt> option in <tt>/etc/profile</tt> ensures that
 

diff --git a/tests/unit/ssg-module/data/file_owner_grub2_cfg.yml b/tests/unit/ssg-module/data/file_owner_grub2_cfg.yml
@@ -22,7 +22,6 @@ platforms: !!set
 cpe_platform_names: !!set
     machine: null
 inherited_platforms: []
-prodtype: rhel7,rhel8,fedora,ol7,ol8
 rationale: Only root should be able to modify important boot parameters.
 references: {cis: 1.4.1, cis-csc: '12,13,14,15,16,18,3,5', cjis: 5.5.2.2, cobit5: 'APO01.06,DSS05.04,DSS05.07,DSS06.02',
   cui: 3.4.5, disa: 'CCI-000225', hipaa: '164.308(a)(1)(ii)(B),164.308(a)(7)(i),164.308(a)(7)(ii)(A),164.310(a)(1),164.310(a)(2)(i),164.310(a)(2)(ii),164.310(a)(2)(iii),164.310(b),164.310(c),164.310(d)(1),164.310(d)(2)(iii)',

diff --git a/tests/unit/ssg-module/data/selinux.yml b/tests/unit/ssg-module/data/selinux.yml
@@ -1,4 +1,3 @@
-prodtype: all
 title: SELinux
 description: 'SELinux is a feature of the Linux kernel which can be
 

diff --git a/tests/unit/ssg-module/data/sshd_disable_root_login.yml b/tests/unit/ssg-module/data/sshd_disable_root_login.yml
@@ -21,7 +21,6 @@ ocil: 'To determine how the SSH daemon''s <tt>PermitRootLogin</tt> option is set
 ocil_clause: the required value is not set
 oval_external_content: null
 platforms: null
-prodtype: all
 rationale: 'Even though the communications channel may be encrypted, an additional
   layer of
 

diff --git a/tests/unit/ssg-module/test_playbook_builder_data/guide/configure_crypto_policy/rule.yml b/tests/unit/ssg-module/test_playbook_builder_data/guide/configure_crypto_policy/rule.yml
@@ -1,7 +1,5 @@
 documentation_complete: true
 
-prodtype: fedora,ol8,rhcos4,rhel8,rhel9,rhv4
-
 title: 'Configure System Cryptography Policy'
 
 description: |-

diff --git a/tests/unit/ssg-module/test_playbook_builder_data/guide/package_abrt_removed/rule.yml b/tests/unit/ssg-module/test_playbook_builder_data/guide/package_abrt_removed/rule.yml
@@ -1,7 +1,5 @@
 documentation_complete: true
 
-prodtype: fedora,ol7,ol8,rhel7,rhel8,rhel9
-
 title: 'Uninstall Automatic Bug Reporting Tool (abrt)'
 
 description: |-

diff --git a/tests/unit/ssg-module/test_playbook_builder_data/rules/selinux_state.yml b/tests/unit/ssg-module/test_playbook_builder_data/rules/selinux_state.yml
@@ -14,7 +14,6 @@ ocil_clause: SELINUX is not set to enforcing
 oval_external_content: null
 platforms:
   - machine
-prodtype: rhel7,rhel8,fedora,ol7,ol8,rhv4
 rationale: 'Setting the SELinux state to enforcing ensures SELinux is able to confine
 
   potentially compromised processes to the security policy, which is designed to

diff --git a/tests/unit/ssg_test_suite/data/rule_reference_fail/rule_1/rule.yml b/tests/unit/ssg_test_suite/data/rule_reference_fail/rule_1/rule.yml
@@ -1,7 +1,5 @@
 documentation_complete: true
 
-prodtype: fedora
-
 title: Rule 1
 
 identifiers:

diff --git a/tests/unit/ssg_test_suite/data/rule_reference_fail/rule_2/rule.yml b/tests/unit/ssg_test_suite/data/rule_reference_fail/rule_2/rule.yml
@@ -1,7 +1,5 @@
 documentation_complete: true
 
-prodtype: fedora
-
 title: Rule 2
 
 identifiers:

diff --git a/tests/unit/ssg_test_suite/data/rule_reference_pass/rule_1/rule.yml b/tests/unit/ssg_test_suite/data/rule_reference_pass/rule_1/rule.yml
@@ -1,7 +1,5 @@
 documentation_complete: true
 
-prodtype: fedora
-
 title: Rule 2
 
 identifiers:

diff --git a/tests/unit/ssg_test_suite/data/rule_reference_pass/rule_2/rule.yml b/tests/unit/ssg_test_suite/data/rule_reference_pass/rule_2/rule.yml
@@ -1,7 +1,5 @@
 documentation_complete: true
 
-prodtype: fedora
-
 title: Rule 1
 
 identifiers:

diff --git a/tests/unit/utils/oscal/data/test_root/applications/test_application/rule_1/rule.yml b/tests/unit/utils/oscal/data/test_root/applications/test_application/rule_1/rule.yml
@@ -1,5 +1,3 @@
-prodtype: ocp4
-
 title: 'rule_1'
 
 description: |-

diff --git a/tests/unit/utils/oscal/data/test_root/applications/test_application/rule_2/rule.yml b/tests/unit/utils/oscal/data/test_root/applications/test_application/rule_2/rule.yml
@@ -1,5 +1,3 @@
-prodtype: ocp4
-
 title: 'rule_2'
 
 description: |-