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

bugfix: mount_option: handle commented lines #10518

Merged
merged 1 commit into from
May 4, 2023

Conversation

maage
Copy link
Contributor

@maage maage commented May 1, 2023

Description:

From fstab(5):
...
Each filesystem is described on a separate line. Fields on each
line are separated by tabs or spaces. Lines starting with '#' are
comments. Blank lines are ignored.
...

Line like:

  # /var needs dev

should be ignored.

Add test for this issue.

Rationale:

It is feasible /etc/fstab contains commented out lines. It is not good if rules confuse commented out lines as real.

Review Hints:

There is a new test.

From fstab(5):
...
       Each filesystem is described on a separate line. Fields on each
       line are separated by tabs or spaces. Lines starting with '#' are
       comments. Blank lines are ignored.
...

Line like:
  # /var needs dev
should be ignored.

Add test for this issue.
@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label May 1, 2023
@openshift-ci
Copy link

openshift-ci bot commented May 1, 2023

Hi @maage. 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 this to the 0.1.68 milestone May 1, 2023
@Mab879 Mab879 added the OVAL OVAL update. Related to the systems assessments. label May 1, 2023
@Mab879
Copy link
Member

Mab879 commented May 1, 2023

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Used by openshift-ci bot. and removed needs-ok-to-test Used by openshift-ci bot. labels May 1, 2023
@github-actions
Copy link

github-actions bot commented May 1, 2023

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

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@codeclimate
Copy link

codeclimate bot commented May 1, 2023

Code Climate has analyzed commit ee5352b 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 52.4% (0.0% change).

View more on Code Climate.

@vojtapolasek
Copy link
Collaborator

/ok-to-test

@vojtapolasek vojtapolasek self-assigned this May 2, 2023
@vojtapolasek
Copy link
Collaborator

Hello @maage and thank you for this contribution. Actually you uncovered an interesting topic.
I created modificaion of your test, which inserts a correct line, comments it, and then inserts a bad line. I found out that Ansible remediation can handle that well, but the Bash remediation can't fix it.
Would you cover this case in this PR as well? Or should I create a separate upstream issue?
Other than that, the PR looks good.

@maage
Copy link
Contributor Author

maage commented May 3, 2023

@vojtapolasek I guess another PR would suit me best.

Copy link
Collaborator

@vojtapolasek vojtapolasek left a comment

Choose a reason for hiding this comment

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

Looks good. During review I discovered a problem in Bash remediation which incorrectly handles commented out correct lines. I will create an upstream issue for that case.

@vojtapolasek vojtapolasek merged commit cad3f18 into ComplianceAsCode:master May 4, 2023
@maage maage deleted the mount_option-comment-1 branch May 18, 2023 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Used by openshift-ci bot. OVAL OVAL update. Related to the systems assessments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants