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

Ubuntu 24.04: Implement 2.3.1.1 Ensure a single time synchronization daemon is in use #12823

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

alanmcanonical
Copy link
Contributor

Description:

  • Implement 2.3.1.1 Ensure a single time synchronization daemon is in use

Rationale:

  • Satisfies Ubuntu 24.04 CIS control 2.3.1.1

@alanmcanonical alanmcanonical requested a review from a team as a code owner January 14, 2025 10:39
@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Jan 14, 2025
Copy link

openshift-ci bot commented Jan 14, 2025

Hi @alanmcanonical. 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-sigs/prow repository.

Copy link

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

@dodys dodys self-assigned this Jan 16, 2025
@dodys dodys added Ubuntu Ubuntu product related. New Rule Issues or pull requests related to new Rules. Update Profile Issues or pull requests related to Profiles updates. CIS CIS Benchmark related. labels Jan 16, 2025
@dodys dodys added this to the 0.1.76 milestone Jan 16, 2025
Copy link
Contributor

@mpurg mpurg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes needed

@@ -939,12 +939,11 @@ controls:
levels:
- l1_server
- l1_workstation
related_rules:
rules:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This rule should not enforce any specific service.
It should only check whether the system has a single timesync service that is active,
analogous to https://github.com/ComplianceAsCode/content/pull/12822/files

In the profile we should enable only one service and disable the other
so this rule passes by default as you did here, but I think we should:

  • enable timesyncd by default since it's installed by default
  • move service_chrony_enabled/service_timesyncd_disabled to 2.3.3.3
  • move service_timesyncd_enabled/service_chronyd_disabled to 2.3.2.2 and disable them

@dodys
Copy link
Contributor

dodys commented Jan 17, 2025

/packit build

@alanmcanonical alanmcanonical force-pushed the ubt24_2311 branch 2 times, most recently from 53ebf52 to d19481d Compare January 17, 2025 14:14
Copy link
Contributor

@mpurg mpurg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm thanks!

Copy link
Contributor

@mpurg mpurg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix these issues with ctests:

Rule 'service_chronyd_disabled' must be assigned to component 'chrony', because rule uses template 'service_disabled' checking service 'chronyd' provided by package 'chrony' which is a package that already belongs to component 'chrony'.
Rule 'service_chronyd_disabled' must be assigned to component 'chrony', because it uses the package['chrony'] platform.
Rule 'service_timesyncd_disabled' must be assigned to component 'systemd', because rule uses template 'service_disabled' checking service 'systemd-timesyncd' provided by package 'systemd-timesyncd' which is a package that already belongs to component 'systemd'.
Rule 'service_timesyncd_disabled' must be assigned to component 'systemd', because it uses the package['systemd-timesyncd'] platform.

@alanmcanonical
Copy link
Contributor Author

service_timesyncd_disabled

Added, thanks

Copy link

codeclimate bot commented Jan 21, 2025

Code Climate has analyzed commit 563a18f 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 61.9% (0.0% change).

View more on Code Climate.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CIS CIS Benchmark related. needs-ok-to-test Used by openshift-ci bot. New Rule Issues or pull requests related to new Rules. Ubuntu Ubuntu product related. Update Profile Issues or pull requests related to Profiles updates.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants