Merge pull request #5 from ansible-lockdown/devel

2023 April Updates

Author: frederickw082922

.github/ISSUE_TEMPLATE/bug_report.md

@@ -20,7 +20,7 @@ A clear and concise description of what's happening.
 What controls are being affected by the issue
 
 **Environment (please complete the following information):**
- - Ansible Version: [e.g. 2.10] 
+ - Ansible Version: [e.g. 2.10]
  - Host Python Version: [e.g. Python 3.7.6]
  - Ansible Server Python Version: [e.g. Python 3.7.6]
  - Additional Details:

.github/ISSUE_TEMPLATE/question.md

@@ -8,10 +8,10 @@ assignees: ''
 ---
 
 **Question**
-Pose question here. 
+Pose question here.
 
 **Environment (please complete the following information):**
- - Ansible Version: [e.g. 2.10] 
+ - Ansible Version: [e.g. 2.10]
  - Host Python Version: [e.g. Python 3.7.6]
  - Ansible Server Python Version: [e.g. Python 3.7.6]
  - Additional Details:

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Ansible Lockdown
+Copyright (c) 2023 Ansible Lockdown
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docs/README.md

@@ -14,7 +14,7 @@ This is split across multiple folders and strutures
   - conf.py - this is the build file how things are put together
   - audit.rst - table of contents for the audit section
   - remediate.rst - TOC for the remediate section
-  
+
 - source/audit/      # dir for audit content
 - source/remediate/  # dir for the remediate content
 - source/_static/MPG-logo-mono-blue.svg

docs/source/CIS/CIS_table copy.rst

@@ -45,7 +45,7 @@ Applications
    "Kubernetes1.6.1-CIS_", "True", "True", "False"
 
 
-Archived 
+Archived
 ^^^^^^^^^
 None currently
 

docs/source/CIS/CIS_table.rst

@@ -4,48 +4,51 @@ CIS Benchmarks
 Operating Systems
 ^^^^^^^^^^^^^^^^^
 
-.. csv-table:: CIS Linux Benchmark availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Build State", "Release" 
+.. csv-table:: CIS Linux Benchmark Availability
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Ansible Galaxy", "Release"
    :widths: 25, 15, 15, 15, 25, 25
 
-   "AMAZON2-CIS_", "True", "True", "True",  ".. image:: https://img.shields.io/github/workflow/status/ansible-lockdown/AMAZON2-CIS/DevelToMain?label=Main%20Build%20Status&style=plastic", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/AMAZON2-CIS?style=plastic"
-   "RHEL7-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/workflow/status/ansible-lockdown/RHEL7-CIS/DevelToMain?label=Main%20Build%20Status&style=plastic", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL7-CIS?style=plastic"
-   "RHEL8-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/workflow/status/ansible-lockdown/RHEL8-CIS/DevelToMain?label=Main%20Build%20Status&style=plastic", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL8-CIS?style=plastic"
-   "RHEL9-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/workflow/status/ansible-lockdown/RHEL9-CIS/DevelToMain?label=Main%20Build%20Status&style=plastic", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL9-CIS?style=plastic"
-   "UBUNTU18-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/workflow/status/ansible-lockdown/UBUNTU18-CIS/DevelToMaster?label=Main%20Build%20Status&style=plastic", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU18-CIS?style=plastic"
-   "UBUNTU20-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/workflow/status/ansible-lockdown/UBUNTU20-CIS/DevelToMaster?label=Main%20Build%20Status&style=plastic", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU20-CIS?style=plastic"
+   "AMAZON2-CIS_", "True", "True", "True",  ".. image:: https://img.shields.io/ansible/quality/61757?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/AMAZON2-CIS?style=plastic"
+   "RHEL7-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/56324?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL7-CIS?style=plastic"
+   "RHEL8-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/56380?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL8-CIS?style=plastic"
+   "RHEL9-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/61781?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL9-CIS?style=plastic"
+   "UBUNTU18-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/54776?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU18-CIS?style=plastic"
+   "UBUNTU20-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/54777?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU20-CIS?style=plastic"
+   "UBUNTU22-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/1?label=Quality&&logo=ansible", "N/A"
 
-.. csv-table:: CIS Windows Benchmark availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit"
-   :widths: 35, 15, 15, 15
+.. csv-table:: CIS Windows Benchmark Availability
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Ansible Galaxy",  "Release"
+   :widths: 25, 15, 15, 15, 25, 25
 
-   "Windows-2016-CIS_", "True", "True", "True"
-   "Windows-2019-CIS_", "True", "True", "True"
-   "Windows-2022-CIS_", "True", "True", "True"
+   "Windows-2016-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/55061?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/Windows-2016-CIS?style=plastic"
+   "Windows-2019-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/56324?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/Windows-2019-CIS?style=plastic"
+   "Windows-2022-CIS_", "True", "WIP", "WIP", ".. image:: https://img.shields.io/ansible/quality/1?label=Quality&&logo=ansible", "N/A"
 
 Cloud Platforms
 ^^^^^^^^^^^^^^^^^
 
-.. csv-table:: CIS Platform Benchmark availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit"
-   :widths: 35, 15, 15, 15
+.. csv-table:: CIS Platform Benchmark Availability
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Release"
+   :widths: 25, 15, 15, 15, 20
 
-   "AWS-Foundations_", "True", "True", "False"
-   "Azure-CIS_", "True", "True", "False"
+   "AWS-Foundations_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/AWS-FOUNDATIONS-CIS?style=plastic"
+   "Azure-CIS_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/AZURE-CIS?style=plastic"
 
 Applications
 ^^^^^^^^^^^^^^^^^
 
-.. csv-table:: CIS Application Benchmark availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit"
-   :widths: 35, 15, 15, 15
+.. csv-table:: CIS Application Benchmark Availability
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Release"
+   :widths: 25, 15, 15, 15, 20
+
+   "Apache-2.4-CIS_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/APACHE-2.4-CIS?style=plastic"
+   "Postgres-12-CIS_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/POSTGRES-12-CIS?style=plastic"
+   "Kubernetes1.6.1-CIS_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/Kubernetes1.6.1-CIS?style=plastic"
+   "NGINX-CIS_", "True", "WIP", "WIP", "N/A"
 
-   "Apache-2.4-CIS_", "True", "True", "False"
-   "Postgres-12-CIS_", "True", "True", "False"
-   "Kubernetes1.6.1-CIS_", "True", "True", "False"
 
-Archived 
-^^^^^^^^^
+Archived Roles
+^^^^^^^^^^^^^^
 None currently
 
 .. _AMAZON2-CIS: https://github.com/ansible-lockdown/AMAZON2-CIS
@@ -54,6 +57,7 @@ None currently
 .. _RHEL9-CIS: https://github.com/ansible-lockdown/RHEL9-CIS
 .. _UBUNTU18-CIS: https://github.com/ansible-lockdown/UBUNTU18-CIS
 .. _UBUNTU20-CIS: https://github.com/ansible-lockdown/UBUNTU20-CIS
+.. _UBUNTU22-CIS: https://github.com/ansible-lockdown/UBUNTU22-CIS
 
 .. _Windows-2016-CIS: https://github.com/ansible-lockdown/Windows-2016-CIS
 .. _Windows-2019-CIS: https://github.com/ansible-lockdown/Windows-2019-CIS
@@ -66,3 +70,5 @@ None currently
 .. _Apache-2.4-CIS: https://github.com/ansible-lockdown/APACHE-2.4-CIS
 .. _Postgres-12-CIS: https://github.com/ansible-lockdown/POSTGRES-12-CIS
 .. _Kubernetes1.6.1-CIS: https://github.com/ansible-lockdown/Kubernetes1.6.1-CIS
+.. _NGINX-CIS: https://github.com/ansible-lockdown/NGINX-CIS
+

docs/source/CIS/benchmarks_CIS.rst

@@ -13,13 +13,14 @@ RedHat Enterprise Linux
 
   - RHEL7-CIS_
   - RHEL8-CIS_
-  - RHEL9-CIS_ (WIP) OS not yet released
+  - RHEL9-CIS_
 
 Ubuntu
 ~~~~~~
 
   - UBUNTU18-CIS_
   - UBUNTU20-CIS_
+  - UBUNTU22-CIS_
 
 Windows
 ~~~~~~~
@@ -42,7 +43,7 @@ Applications
   - Kubernetes1.6.1-CIS_
 
 
-Archived (No Longer Maintained)
+Archived Roles (No Longer Maintained)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 None currently
 
@@ -52,6 +53,8 @@ None currently
 .. _RHEL9-CIS: https://github.com/ansible-lockdown/RHEL9-CIS
 .. _UBUNTU18-CIS: https://github.com/ansible-lockdown/UBUNTU18-CIS
 .. _UBUNTU20-CIS: https://github.com/ansible-lockdown/UBUNTU20-CIS
+.. _UBUNTU22-CIS: https://github.com/ansible-lockdown/UBUNTU22-CIS
+
 
 .. _Windows-2016-CIS: https://github.com/ansible-lockdown/Windows-2016-CIS
 .. _Windows-2019-CIS: https://github.com/ansible-lockdown/Windows-2019-CIS

docs/source/CIS/cis_overview.rst

@@ -5,11 +5,11 @@ CIS Overview
 What is CIS?
 ~~~~~~~~~~~~
 
-Center for Internet Security
+**Center for Internet Security**
 
-CIS is home to the Multi-State Information Sharing and Analysis Center® (MS-ISAC®), 
-the trusted resource for cyber threat prevention, protection, response, and recovery 
-for U.S. State, Local, Tribal, and Territorial government entities, 
+**CIS** is home to the Multi-State Information Sharing and Analysis Center® (MS-ISAC®),
+the trusted resource for cyber threat prevention, protection, response, and recovery
+for U.S. State, Local, Tribal, and Territorial government entities,
 and the Elections Infrastructure Information Sharing and Analysis Center® (EI-ISAC®), which supports the rapidly changing cybersecurity needs of U.S. elections offices.
 
 
@@ -29,12 +29,12 @@ Control Severities
 
 Controls are divided into groups based on the following properties:
 
-- Level 1
+- **Level 1**
   The majority of control are based at this level.
   These controls have are considered to have a low impact to a system.
   By implementing these controls is considered low to medium risk of disruption.
 
-- Level 2
+- **Level 2**
   These controls are considered high risk with a chance of system disruption if implemented.
 
 .. note::
@@ -45,6 +45,6 @@ Controls are divided into groups based on the following properties:
 
    All of the default configurations are found within is_container.yml and this is where they should be adjusted. Do not adjust within the tasks themselves
    - remediation - ``defaults/main.yml``
-   - audit 
+   - audit
      - standalone ``vars/CIS.yml``
      - combined ``vars/[system_hostname].yml``

docs/source/STIG/STIG_table.rst

@@ -4,71 +4,81 @@ STIG Benchmarks
 Operating Systems
 ^^^^^^^^^^^^^^^^^
 
-.. csv-table:: STIG Linux Benchmark availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit"
-   :widths: 40, 20, 20, 20
-  
-   "RHEL7-STIG_", "True", "True", "True"
-   "RHEL8-STIG_", "True", "True", "True"
-   "UBUNTU18-STIG_", "True", "True", "False"
-
-.. csv-table:: STIG Windows Benchmark availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit"
-   :widths: 40, 20, 20, 20
-
-   "Windows-10-STIG_", "True", "True", "False"
-   "Windows-2012-Member-Server-STIG_", "False", "True", "False"
-   "Windows-2012-Domain-Controller-STIG_", "False", "True", "False"
-   "Windows-2016-STIG_", "True", "True", "False"
-   "Windows-2019-STIG_", "True", "True", "False"
+.. csv-table:: STIG Linux Benchmark Availability
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Ansible Galaxy", "Release"
+   :widths: 25, 15, 15, 15, 25, 25
+
+   "RHEL7-STIG_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/61792?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL7-STIG?style=plastic"
+   "RHEL8-STIG_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/56380?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL8-STIG?style=plastic"
+   "UBUNTU18-STIG_", "True", "True", "WIP", ".. image:: https://img.shields.io/ansible/quality/61237?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU18-STIG?style=plastic"
+   "UBUNTU20-STIG_", "True", "True", "WIP", "N/A", "N/A"
+
+.. csv-table:: STIG Windows Benchmark Availability
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Release"
+   :widths: 25, 15, 15, 15, 20
+
+   "Windows-10-STIG_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/Windows-10-STIG?style=plastic"
+   "Windows-2016-STIG_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/Windows-2016-STIG?style=plastic"
+   "Windows-2019-STIG_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/Windows-2019-STIG?style=plastic"
+   "Windows-2022-STIG_", "True", "WIP", "WIP", "N/A"
 
 Networking
 ^^^^^^^^^^
 
-.. csv-table:: STIG Hardware Benchmark availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit"
-   :widths: 40, 20, 20, 20
+.. csv-table:: STIG Hardware Benchmark Availability
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Release"
+   :widths: 25, 15, 15, 15, 20
 
-   "Cisco-IOS-L2S_", "True", "True", "False"
+   "Cisco-IOS-L2S_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/CISCO-IOS-L2S-STIG?style=plastic"
 
 Applications
 ^^^^^^^^^^^^
 
-.. csv-table:: STIG Application Benchmark availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit"
-   :widths: 40, 20, 20, 20
+.. csv-table:: STIG Application Benchmark Availability
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Release"
+   :widths: 25, 15, 15, 15, 20
 
-   "Apache-2.4-STIG_", "True", "True", "False"
-   "Postgres-9-STIG_", "True", "True", "False"
-   "Windows_Advance_Firewall-STIG_", "True", "True", "False"
+   "Apache-2.4-STIG_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/APACHE-2.4-STIG?style=plastic"
+   "TOMCAT-9-STIG_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/TOMCAT-9-STIG?style=plastic"
+   "Windows_Advance_Firewall-STIG_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/WinFWADV-STIG?style=plastic"
+   "KUBERNETES-STIG_", "True", "True", "False", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/KUBERNETES-STIG?style=plastic"
 
 Archived Roles
-^^^^^^^^^
+^^^^^^^^^^^^^^
 
 .. csv-table:: STIG Retired Benchmark
-   :header: "Benchmark", "Maintained", "Remediate", "Audit"
-   :widths: 40, 20, 20, 20
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Release"
+   :widths: 25, 15, 15, 15, 20
 
-   "RHEL5-STIG_", "False", "True", "False"
-   "RHEL6-STIG_", "False", "True", "False"
-   "Windows-2008R2-Member-Server-STIG_", "False", "True", "False"
+   "RHEL5-STIG_", "False", "False", "False", "N/A"
+   "RHEL6-STIG_", "False", "False", "False", "N/A"
+   "Windows-2008R2-Member-Server-STIG_", "False", "False", "False", "N/A"
+   "Windows-2012-Member-Server-STIG_", "False", "False", "False", "N/A"
+   "Windows-2012-Domain-Controller-STIG_", "False", "False", "False", "N/A"
+   "Postgres-9-STIG_", "True", "True", "False", "N/A"
 
 .. _RHEL7-STIG: https://github.com/ansible-lockdown/RHEL7-STIG
 .. _RHEL8-STIG: https://github.com/ansible-lockdown/RHEL8-STIG
 .. _UBUNTU18-STIG: https://github.com/ansible-lockdown/UBUNTU18-STIG
+.. _UBUNTU20-STIG: https://github.com/ansible-lockdown/UBUNTU20-STIG
+
 
 .. _Windows-10-STIG: https://github.com/ansible-lockdown/Windows-10-STIG
-.. _Windows-2012-Member-Server-STIG: https://github.com/ansible-lockdown/Windows-2012-Member-Server-STIG
-.. _Windows-2012-Domain-Controller-STIG: https://github.com/ansible-lockdown/Windows-2012-Domain-Controller-STIG
 .. _Windows-2016-STIG: https://github.com/ansible-lockdown/Windows-2016-STIG
 .. _Windows-2019-STIG: https://github.com/ansible-lockdown/Windows-2019-STIG
+.. _Windows-2022-STIG: https://github.com/ansible-lockdown/Windows-2022-STIG
 
 .. _Cisco-IOS-L2S: https://github.com/ansible-lockdown/CISCO-IOS-L2S-STIG
 
 .. _Apache-2.4-STIG: https://github.com/ansible-lockdown/APACHE-2.4-STIG
 .. _Postgres-9-STIG: https://github.com/ansible-lockdown/POSTGRES-9-STIG
+.. _TOMCAT-9-STIG: https://github.com/ansible-lockdown/TOMCAT-9-STIG
 .. _Windows_Advance_Firewall-STIG: https://github.com/ansible-lockdown/WinFWADV-STIG
+.. _KUBERNETES-STIG: https://github.com/ansible-lockdown/KUBERNETES-STIG
+
 
 .. _RHEL5-STIG: https://github.com/ansible-lockdown/RHEL5-STIG
 .. _RHEL6-STIG: https://github.com/ansible-lockdown/RHEL6-STIG
 .. _Windows-2008R2-Member-Server-STIG: https://github.com/ansible-lockdown/Windows-2008R2-Member-Server-STIG
+.. _Windows-2012-Member-Server-STIG: https://github.com/ansible-lockdown/Windows-2012-Member-Server-STIG
+.. _Windows-2012-Domain-Controller-STIG: https://github.com/ansible-lockdown/Windows-2012-Domain-Controller-STIG

docs/source/STIG/benchmarks_STIG.rst

@@ -14,10 +14,9 @@ Windows
 ~~~~~~~
 
   - Windows-10-STIG_
-  - Windows-2012-Member-Server-STIG_
-  - Windows-2012-Domain-Controller-STIG_
   - Windows-2016-STIG_
   - Windows-2019-STIG_
+  - Windows-2022-STIG_
 
 Hardware
 ^^^^^^^^
@@ -31,12 +30,14 @@ Applications
 - Postgres-9-STIG_
 - Windows_Advance_Firewall-STIG_
 
-Archived(No Longer Maintained)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Archived Roles (No Longer Maintained)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - RHEL5
 - RHEL6
 - 2008R2-Member
+- Windows-2012-Member-Server-STIG_
+- Windows-2012-Domain-Controller-STIG_
 
 
 
@@ -47,6 +48,7 @@ Archived(No Longer Maintained)
 .. _Windows-2012-Domain-Controller-STIG: https://github.com/ansible-lockdown/Windows-2012-Domain-Controller-STIG
 .. _Windows-2016-STIG: https://github.com/ansible-lockdown/Windows-2016-STIG
 .. _Windows-2019-STIG: https://github.com/ansible-lockdown/Windows-2019-STIG
+.. _Windows-2022-STIG: https://github.com/ansible-lockdown/Windows-2022-STIG
 
 
 .. _Apache-2.4-STIG: https://github.com/ansible-lockdown/APACHE-2.4-STIG