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

Added two rules related to package avahi #9927

Closed

Conversation

rumch-se
Copy link
Contributor

@rumch-se rumch-se commented Dec 5, 2022

Description:

  • _Added two additional rules package_avahi_removed and package_avahi-autoipd_removed _

Rationale:

  • These rules are missing, at the moment we only disable the service

Review Hints:

  • Review hints here. Replace this text. Don't use the italics format!

  • Use this optional section to give any relevant information which could help the reviewer to more quickly and assertively understand and test the changes.

  • Good examples are useful commands, if it is better to review all commits together or in a suggested sequence, any relevant discussion in other PRs or issues, etc.

@rumch-se rumch-se requested a review from a team as a code owner December 5, 2022 15:04
@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Dec 5, 2022
@openshift-ci
Copy link

openshift-ci bot commented Dec 5, 2022

Hi @rumch-se. 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.

@github-actions
Copy link

github-actions bot commented Dec 5, 2022

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

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

Fedora Testing Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@anivan-suse anivan-suse added the needs-rebase Used by openshift-ci bot. label Dec 6, 2022
@anivan-suse
Copy link
Contributor

You have a conflict with CCE-IDs. They are used in this PR from yesterday: #9912

severity: medium

identifiers:
cce@sle12: CCE-92309-4
Copy link
Contributor

Choose a reason for hiding this comment

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

Change cce-id

Copy link
Contributor

Choose a reason for hiding this comment

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

Change this, then re-base and you should be good to go :)

@Mab879 Mab879 added this to the 0.1.66 milestone Dec 6, 2022
@Mab879 Mab879 added SLES SUSE Linux Enterprise Server product related. New Rule Issues or pull requests related to new Rules. CIS CIS Benchmark related. labels Dec 6, 2022
@rumch-se rumch-se force-pushed the remove_avahi_package branch from 960051f to 498fbb3 Compare December 7, 2022 07:54
@openshift-merge-robot openshift-merge-robot added needs-rebase Used by openshift-ci bot. and removed needs-rebase Used by openshift-ci bot. labels Dec 7, 2022
@rumch-se rumch-se force-pushed the remove_avahi_package branch from 2d0c4f7 to bdac565 Compare December 13, 2022 10:12
@openshift-merge-robot openshift-merge-robot added needs-rebase Used by openshift-ci bot. and removed needs-rebase Used by openshift-ci bot. labels Dec 13, 2022
@rumch-se rumch-se force-pushed the remove_avahi_package branch from bdac565 to ed984b6 Compare December 20, 2022 07:41
@openshift-merge-robot openshift-merge-robot added needs-rebase Used by openshift-ci bot. and removed needs-rebase Used by openshift-ci bot. labels Dec 20, 2022
@rumch-se rumch-se force-pushed the remove_avahi_package branch from 206ca55 to 55cb8b7 Compare December 22, 2022 09:12
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Used by openshift-ci bot. label Dec 22, 2022
@marcusburghardt marcusburghardt self-assigned this Jan 2, 2023
cce@sle12: CCE-92310-2
cce@sle15: CCE-92465-4

references:
Copy link
Member

Choose a reason for hiding this comment

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

Are you sure that all these references are valid for these new rules? Have you confirmed them? If not, I would suggest to keep only the confirmed references.

cce@sle12: CCE-92314-4
cce@sle15: CCE-92464-7

references:
Copy link
Member

Choose a reason for hiding this comment

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

Are you sure that all these references are valid for these new rules? Have you confirmed them? If not, I would suggest to keep only the confirmed references.

Copy link
Member

Choose a reason for hiding this comment

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

Regarding the references for these new rules, are you sure that all these references are related to these new rules? It seems these references were copied from similar rules. I just would like to know if you confirmed all of them. Otherwise, I recommend to keep only the references you are sure about.

Copy link
Member

@marcusburghardt marcusburghardt left a comment

Choose a reason for hiding this comment

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

Please, take a look in the review comments. There is also an extra CCE being removed from the sle12 list.

@rumch-se
Copy link
Contributor Author

rumch-se commented Jan 9, 2023

Good morning @marcusburghardt
I have done the proposed corrections. I can confirm that the CCE numbers used are correct ones.
Have a nice day
Rumen

@marcusburghardt
Copy link
Member

Good morning @marcusburghardt I have done the proposed corrections. I can confirm that the CCE numbers used are correct ones. Have a nice day Rumen

@rumch-se , I saw this PR is still removing 3 CCEs from cce-sle12-avail.txt list but is using only 2 CCEs in the new rules.
Please, don't remove more CCEs than necessary in the same PR.

I also noticed that many PRs where SLE CCEs are changed are conflicting since last weeks.
If there is any issue with SLE CCEs lists, I recommend to send a separate PR just for fixing the CCEs list.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Used by openshift-ci bot. label Jan 9, 2023
@rumch-se rumch-se force-pushed the remove_avahi_package branch from 7743f2c to bb9f8b3 Compare January 9, 2023 11:29
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Used by openshift-ci bot. label Jan 9, 2023
@rumch-se
Copy link
Contributor Author

rumch-se commented Jan 9, 2023

Hello @marcusburghardt

I hope that now everything will be OK.
I made a double check of CCE codes used for these 2 rules.
Have a nice day
Rumen

@marcusburghardt
Copy link
Member

Hello @marcusburghardt

I hope that now everything will be OK. I made a double check of CCE codes used for these 2 rules. Have a nice day Rumen

@rumch-se , unfortunately the SLE CCEs lists are still confusing in this PR. Now, I can see that some new CCEs were included in the list. I don't know where they came from and why, but I recommend to change the CCEs list only in the scope of the two new rules in this PR.

Feel free to approach me on Gitter if you need any help to review these SLE CCEs lists and respective open PRs.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Used by openshift-ci bot. label Jan 11, 2023
@rumch-se rumch-se force-pushed the remove_avahi_package branch from bb9f8b3 to e7242f8 Compare January 11, 2023 09:27
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Used by openshift-ci bot. label Jan 11, 2023
@marcusburghardt
Copy link
Member

@rumch-se , this PR needs rebase and I is because the CCEs lists.
Could you rebase and ensure only the CCEs necessary for the rules included in this PR are removed from the lists, please?
And no CCEs are "included" in the list by this PR.

Also take a look in my comments regarding the references, please.

Once this is resolved, I believe this PR is ready to be merged.

@rumch-se rumch-se force-pushed the remove_avahi_package branch from e7242f8 to 66634ab Compare January 12, 2023 09:54
@codeclimate
Copy link

codeclimate bot commented Jan 12, 2023

Code Climate has analyzed commit 66634ab 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 49.9% (0.0% change).

View more on Code Climate.

@marcusburghardt marcusburghardt removed this from the 0.1.66 milestone Jan 13, 2023
@marcusburghardt marcusburghardt added the do-not-merge/work-in-progress Used by openshift-ci bot. label Jan 13, 2023
@marcusburghardt
Copy link
Member

@rumch-se , do you have plans to work on this PR soon? Only the CCEs issues are pending.

@rumch-se
Copy link
Contributor Author

Hello @marcusburghardt
I need some help here, because I think we are in some kind of loop. You in general is looking if the CCE codes taken from available codes correspond to the codes assigned to the rules. I tried to use files with available codes from another already merged PR which has less number than this PR. In this case from a pragmatic point of view the files with the available numbers have to be reduced with the numbers assigned here, but after the rebase we don't have the expected result you are looking for. For your information at the moment there are 3 people who contributes for SUSE and we use in addition an internal repo where we do PR every time when we need a CCE number to be assigned to a specific rule and after we do assignment here. I can provide an extract from this internal repo which shows which numbers were used by us. Do you think that will help you to see the conflict/problem?
I need your advice what to do.
Have a nice day.
Rumen

Have a nice day
Rumen

CCE-92319-3
CCE-92320-1
Copy link
Member

Choose a reason for hiding this comment

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

This line is not expected in this PR. Please, take a look.

@@ -46,6 +45,7 @@ CCE-92364-9
CCE-92365-6
CCE-92366-4
CCE-92367-2
CCE-92368-0
Copy link
Member

Choose a reason for hiding this comment

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

This line is not expected in this PR. Please, take a look.

@@ -124,3 +124,6 @@ CCE-92443-1
CCE-92444-9
CCE-92445-6
CCE-92446-4
CCE-92447-2
Copy link
Member

Choose a reason for hiding this comment

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

These 3 line are not expected in this PR. Please, take a look.

CCE-92477-9
CCE-92478-7
Copy link
Member

Choose a reason for hiding this comment

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

This line is not expected in this PR. Please, take a look.

@@ -175,6 +174,7 @@ CCE-92651-9
CCE-92652-7
CCE-92653-5
CCE-92654-3
CCE-92655-0
Copy link
Member

Choose a reason for hiding this comment

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

This line is not expected in this PR. Please, take a look.

@@ -217,3 +217,6 @@ CCE-92694-9
CCE-92695-6
CCE-92696-4
CCE-92697-2
CCE-92698-0
Copy link
Member

Choose a reason for hiding this comment

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

These 3 lines are not expected in this PR. Please, take a look.

@marcusburghardt
Copy link
Member

I tried to use files with available codes from another already merged PR which has less number than this P

Hi @rumch-se , the point is that this PR is mixing inclusion and exclusion of CCEs in SLE lists, which makes it difficult to review and ensure consistency. If these additional CCEs are indeed necessary to be included, I recommend you to open a separate and specific PR to include new CCEs in the lists or to fix any eventual inconsistency. But for the scope of this PR, don't include CCEs in the lists, please.

@rumch-se
Copy link
Contributor Author

Hello @marcusburghardt
I have created a new PR - #10131
which I do believe now covers your expectations.
When the new PR will be a part of the master, this PR should be deleted or closed.
Have a nice day
Rumen

@marcusburghardt
Copy link
Member

Closed in favor of #10131

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CIS CIS Benchmark related. do-not-merge/work-in-progress Used by openshift-ci bot. needs-ok-to-test Used by openshift-ci bot. New Rule Issues or pull requests related to new Rules. SLES SUSE Linux Enterprise Server product related.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants