From 8300f11edd0d25fb5fbdb90dae57352de9d86943 Mon Sep 17 00:00:00 2001 From: William Panlener Date: Thu, 15 Aug 2024 23:35:24 -0500 Subject: [PATCH] Remove remnants of removed openscap scanning feature Signed-off-by: William Panlener --- README.md | 7 +++---- filter_plugins/xml2json.py | 10 ---------- handlers/main.yml | 10 ---------- requirements.txt | 1 - 4 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 filter_plugins/xml2json.py diff --git a/README.md b/README.md index 68ea0150..07f0f5fa 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,9 @@ This contains rewrites and ID reference changes as per STIG documentation. This can be turned on or off within the defaults/main.yml file with the variable rhel7cis_run_audit. The value is false by default, please refer to the wiki for more details. The defaults file also populates the goss checks to check only the controls that have been enabled in the ansible role. -This is a much quicker, very lightweight, checking (where possible) config compliance and live/running settings. +This is a quick, very lightweight, check (where possible) of config compliance and live/running settings. -A new form of auditing has been developed, by using a small (12MB) go binary called [goss](https://github.com/goss-org/goss) along with the relevant configurations to check. Without the need for infrastructure or other tooling. +A form of auditing has been developed, by using a small (12MB) go binary called [goss](https://github.com/goss-org/goss) along with the relevant configurations to check. Without the need for infrastructure or other tooling. This audit will not only check the config has the correct setting but aims to capture if it is running with that configuration also trying to remove [false positives](https://www.mindpointgroup.com/blog/is-compliance-scanning-still-relevant/) in the process. ## Documentation @@ -83,9 +83,8 @@ The following packages must be installed on the controlling host/host where ansi - python2-passlib (or just passlib, if using python3) - python-lxml -- python-xmltodict -Package 'python-xmltodict' is required if you enable the OpenSCAP tool installation and run a report. Packages python(2)-passlib are required for tasks with custom filters or modules. These are all required on the controller host that executes Ansible. +Packages python(2)-passlib are required for tasks with custom filters or modules. These are all required on the controller host that executes Ansible. ## Role Variables diff --git a/filter_plugins/xml2json.py b/filter_plugins/xml2json.py deleted file mode 100644 index a0738ee7..00000000 --- a/filter_plugins/xml2json.py +++ /dev/null @@ -1,10 +0,0 @@ -class FilterModule(object): - - def filters(self): - return { - 'xml2json': self.xml2json, - } - - def xml2json(self, value): - import xmltodict, json - return json.dumps(xmltodict.parse(value)) diff --git a/handlers/main.yml b/handlers/main.yml index 9b8b7db1..d958d250 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -174,13 +174,3 @@ when: - "'dconf' in ansible_facts.packages" - rhel8stig_always_configure_dconf - -- name: prereport score - ansible.builtin.debug: - msg: "Pre-run OpenSCAP score is {{ rhel8stig_prescanresults.Benchmark.TestResult.score['#text'] }}" - when: rhel8stig_oscap_scan - -- name: postreport score - ansible.builtin.debug: - msg: "Post-run OpenSCAP score is {{ rhel8stig_postscanresults.Benchmark.TestResult.score['#text'] }}" - when: rhel8stig_oscap_scan diff --git a/requirements.txt b/requirements.txt index 52cb84d2..f313617a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ passlib lxml -xmltodict jmespath yamllint