Skip to content

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

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.

Sign up for GitHub

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

Jump to bottom
Merged
dodys merged 2 commits into from
Jan 23, 2025
Merged

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

dodys merged 2 commits into from
Jan 23, 2025

Conversation

@alanmcanonical
Copy link
Contributor

@alanmcanonical alanmcanonical commented Jan 14, 2025

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
@openshift-ci
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.

Details

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.

@github-actions
Copy link

github-actions bot commented Jan 14, 2025

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
mpurg
mpurg requested changes Jan 17, 2025
View reviewed changes
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

controls/cis_ubuntu2404.yml
- l1_server
- l1_workstation
related_rules:
rules:
Copy link
Contributor

@mpurg mpurg Jan 17, 2025

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
mpurg
mpurg approved these changes Jan 21, 2025
View reviewed changes
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!

mpurg
mpurg requested changes Jan 21, 2025
View reviewed changes
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

alanmcanonical commented Jan 21, 2025

service_timesyncd_disabled

Added, thanks

@qlty-cloud-legacy
Copy link

qlty-cloud-legacy 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.

mpurg
mpurg approved these changes Jan 22, 2025
View reviewed changes
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

dodys
dodys approved these changes Jan 22, 2025
View reviewed changes
Copy link
Contributor

@dodys dodys 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!

@dodys dodys merged commit 2d9b922 into ComplianceAsCode:master Jan 23, 2025
93 of 100 checks passed
@alanmcanonical alanmcanonical deleted the ubt24_2311 branch April 24, 2025 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dodys dodys dodys approved these changes

@mpurg mpurg mpurg approved these changes

Assignees

@dodys dodys

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

Milestone

0.1.76

Development

Successfully merging this pull request may close these issues.

3 participants

@alanmcanonical @dodys @mpurg