Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix gui banner path for UBTU-20-010002 and simplify #11089

Closed

Conversation

dexterle
Copy link
Contributor

@dexterle dexterle commented Sep 8, 2023

Description:

  • Fix UBTU-20-010002
  • Simplify OVAL path for OS and add Ubuntu specific path
  • Add ubuntu specific ansible remediation
  • Fix rule descriptions

Rationale:

Review Hints:

Build the product:

./build_product ubuntu2004

To test these changes with Ansible:

ansible-playbook build/ansible/ubuntu2004-playbook-stig.yml --tags "DISA-STIG-UBTU-20-010002"

To test changes with bash, run the remediation sections: xccdf_org.ssgproject.content_rule_dconf_gnome_banner_enabled

Checkout Manual STIG OVAL definitions, and use software like DISA STIG Viewer to view definitions.

git checkout dexterle:add-manual-stig-ubtu-20-v1r9

This STIG can be tested with the latest Ubuntu 2004 Benchmark SCAP. For reference, please review the latest artifacts: https://public.cyber.mil/stigs/downloads/

This commit will simplify the path for testing GUI Banner by using gui_banner_path. Additionally, this commit will modify the description for Ubuntu 2004, and add in new ansible remediation
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 8, 2023
@dexterle
Copy link
Contributor Author

dexterle commented Sep 8, 2023

feedback: 2060bc6#r1318941116

@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Sep 8, 2023
@openshift-ci
Copy link

openshift-ci bot commented Sep 8, 2023

Hi @dexterle. Thanks for your PR.

I'm waiting for a ComplianceAsCode member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Mab879 Mab879 added Ubuntu Ubuntu product related. STIG STIG Benchmark related. labels Sep 8, 2023
@github-actions
Copy link

github-actions bot commented Sep 8, 2023

Start a new ephemeral environment with changes proposed in this pull request:

rhel8 (from CTF) Environment (using Fedora as testing environment)
Open in Gitpod

Fedora Testing Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@github-actions
Copy link

github-actions bot commented Sep 8, 2023

This datastream diff is auto generated by the check Compare DS/Generate Diff

Click here to see the full diff
New content has different text for rule 'xccdf_org.ssgproject.content_rule_dconf_gnome_banner_enabled'.
--- xccdf_org.ssgproject.content_rule_dconf_gnome_banner_enabled
+++ xccdf_org.ssgproject.content_rule_dconf_gnome_banner_enabled
@@ -8,6 +8,7 @@
 screen by setting banner-message-enable to true.
 
 To enable, add or edit banner-message-enable to
+
 /etc/dconf/db/gdm.d/00-security-settings. For example:
 [org/gnome/login-screen]
 banner-message-enable=true
@@ -15,6 +16,7 @@
 /etc/dconf/db/gdm.d/locks/00-security-settings-lock to prevent user modification.
 For example:
 /org/gnome/login-screen/banner-message-enable
+
 After the settings have been set, run dconf update.
 The banner text must also be set.
 

OCIL for rule 'xccdf_org.ssgproject.content_rule_dconf_gnome_banner_enabled' differs.
--- ocil:ssg-dconf_gnome_banner_enabled_ocil:questionnaire:1
+++ ocil:ssg-dconf_gnome_banner_enabled_ocil:questionnaire:1
@@ -1,4 +1,5 @@
 To ensure a login warning banner is enabled, run the following:
+
 $ grep banner-message-enable /etc/dconf/db/gdm.d/*
 If properly configured, the output should be true.
 To ensure a login warning banner is locked and cannot be changed by a user, run the following:

@codeclimate
Copy link

codeclimate bot commented Sep 8, 2023

Code Climate has analyzed commit 7c7be08 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 53.8% (0.0% change).

View more on Code Climate.

@dexterle dexterle marked this pull request as ready for review September 11, 2023 16:37
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 11, 2023
@dodys dodys requested a review from a team September 12, 2023 10:26
@dodys dodys self-assigned this Sep 12, 2023
@dodys dodys added ok-to-test Used by openshift-ci bot. do-not-merge/hold Used by openshift-ci-robot bot. and removed needs-ok-to-test Used by openshift-ci bot. labels Sep 12, 2023
@dodys
Copy link
Contributor

dodys commented Sep 13, 2023

I added a tag to not merge this PR, I need to do some more testing on it, as I think the DISA STIG way of setting banner is just one of the different ways to do it

@vojtapolasek vojtapolasek added this to the 0.1.72 milestone Nov 29, 2023
@mpurg
Copy link
Contributor

mpurg commented Dec 7, 2023

I did some testing on this.

While both implementations give the correct result, I feel that the original implementation (setting the banner in /etc/dconf/...) is superior as it:

  • takes precedence over the proposed implementation (configuration defined in /etc/gdm3/...)
  • allows locking the configuration from user modification
  • is transferable across other benchmarks (e.g. Ubuntu CIS 20.04/22.04, RHEL 8 STIG)

I suggest we keep the original implementation, introducing a slight deviation from instructions in the STIG manual. I will propose to DISA to modify the rule accordingly.

@marcusburghardt marcusburghardt modified the milestones: 0.1.72, 0.1.73 Jan 29, 2024
@vojtapolasek vojtapolasek modified the milestones: 0.1.73, 0.1.74 Apr 30, 2024
@Mab879 Mab879 modified the milestones: 0.1.74, 0.1.75 Jul 29, 2024
@jan-cerny
Copy link
Collaborator

ping

@dodys
Copy link
Contributor

dodys commented Aug 2, 2024

dexterle reached out last week about continuing work on this PRs, and I've asked to open new ones for a clean state. Therefore closing this one.

@Mab879 Mab879 removed this from the 0.1.75 milestone Nov 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge/hold Used by openshift-ci-robot bot. ok-to-test Used by openshift-ci bot. STIG STIG Benchmark related. Ubuntu Ubuntu product related.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants