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.

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

DISA K8s STIG rule 242442 does not parse imageID correctly #321

Merged
merged 10 commits into from
Oct 18, 2024
Merged

DISA K8s STIG rule 242442 does not parse imageID correctly #321

merged 10 commits into from
Oct 18, 2024

Conversation

georgibaltiev
Copy link
Contributor

@georgibaltiev georgibaltiev commented Oct 17, 2024 •
edited by AleksandarSavchev
Loading

What this PR does / why we need it:
This PR refactors the parsing of image names in all 3 implementations of DISA rule 242442. The strings split functions are replaced by an regex parsing function imported from the package k8s.io/kubernetes/pkg/util/parsers. An additional test to replicate the scenario that provoked the issue has been added as well.

Which issue(s) this PR fixes:
Fixes #302

Special notes for your reviewer:

Release note:

A bug causing rule 242442 for all providers to parse image names incorrectly under certain circumstances (for example the image name containing additional semicolons before the tag/digest) was fixed.

@gardener-robot gardener-robot added needs/review Needs review size/m Size of pull request is medium (see gardener-robot robot/bots/size.py) labels Oct 17, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 17, 2024
@gardener-robot-ci-3 gardener-robot-ci-3 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 17, 2024
@gardener-robot gardener-robot added size/l Size of pull request is large (see gardener-robot robot/bots/size.py) needs/second-opinion Needs second review by someone else and removed size/m Size of pull request is medium (see gardener-robot robot/bots/size.py) labels Oct 17, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 17, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 17, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 17, 2024
@georgibaltiev georgibaltiev changed the title Image id parsing bug fix DISA K8s STIG rule 242442 does not parse imageID correctly Oct 17, 2024
AleksandarSavchev
AleksandarSavchev requested changes Oct 17, 2024
View reviewed changes
Copy link
Member

@AleksandarSavchev AleksandarSavchev 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 overall, just a few nits.

pkg/provider/gardener/ruleset/disak8sstig/rules/242442.go Outdated Show resolved Hide resolved
pkg/provider/virtualgarden/ruleset/disak8sstig/rules/242442.go Outdated Show resolved Hide resolved
pkg/provider/gardener/ruleset/disak8sstig/rules/242442_test.go Outdated Show resolved Hide resolved
pkg/provider/managedk8s/ruleset/disak8sstig/rules/242442_test.go Outdated Show resolved Hide resolved
pkg/provider/virtualgarden/ruleset/disak8sstig/rules/242442_test.go Outdated Show resolved Hide resolved
pkg/provider/gardener/ruleset/disak8sstig/rules/242442_test.go Outdated Show resolved Hide resolved
@gardener-robot gardener-robot added the needs/changes Needs (more) changes label Oct 17, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 17, 2024
@georgibaltiev georgibaltiev marked this pull request as ready for review October 17, 2024 15:22
@georgibaltiev georgibaltiev requested a review from a team as a code owner October 17, 2024 15:22
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 18, 2024
AleksandarSavchev
AleksandarSavchev reviewed Oct 18, 2024
View reviewed changes
Copy link
Member

@AleksandarSavchev AleksandarSavchev left a comment

Choose a reason for hiding this comment

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

Thanks!
/lgtm

@gardener-robot gardener-robot added reviewed/lgtm Has approval for merging needs/changes Needs (more) changes and removed needs/changes Needs (more) changes needs/review Needs review needs/second-opinion Needs second review by someone else labels Oct 18, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 18, 2024
@gardener-robot gardener-robot removed the reviewed/lgtm Has approval for merging label Oct 18, 2024
dimityrmirchev
dimityrmirchev requested changes Oct 18, 2024
View reviewed changes
Copy link
Member

@dimityrmirchev dimityrmirchev left a comment

Choose a reason for hiding this comment

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

Thanks! Two requests that need to be applied in several places. The rest looks good.

pkg/provider/managedk8s/ruleset/disak8sstig/rules/242442.go Outdated

dockerref "github.com/distribution/reference"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
dockerref "github.com/distribution/reference"
imageref "github.com/distribution/reference"

pkg/provider/managedk8s/ruleset/disak8sstig/rules/242442_test.go Outdated
@@ -113,19 +116,45 @@ var _ = Describe("#242442", func() {

Expect(ruleResult.CheckResults).To(Equal(expectedCheckResults))
})
It("should return correct results when images are local", func() {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
It("should return correct results when images are local", func() {
It("should return correct results when image repository includes port number", func() {

@gardener-robot gardener-robot added the needs/second-opinion Needs second review by someone else label Oct 18, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 18, 2024
dimityrmirchev
dimityrmirchev approved these changes Oct 18, 2024
View reviewed changes
Copy link
Member

@dimityrmirchev dimityrmirchev left a comment

Choose a reason for hiding this comment

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

/lgtm

@gardener-robot gardener-robot added reviewed/lgtm Has approval for merging and removed needs/changes Needs (more) changes needs/second-opinion Needs second review by someone else labels Oct 18, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 18, 2024
@georgibaltiev georgibaltiev merged commit b916f3a into gardener:main Oct 18, 2024
9 checks passed
@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Oct 18, 2024
@georgibaltiev georgibaltiev deleted the image-id-parsing-bug-fix branch October 18, 2024 07:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AleksandarSavchev AleksandarSavchev AleksandarSavchev approved these changes

@dimityrmirchev dimityrmirchev dimityrmirchev approved these changes

Assignees
No one assigned
Labels
needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) reviewed/lgtm Has approval for merging reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) size/l Size of pull request is large (see gardener-robot robot/bots/size.py) status/closed Issue is closed (either delivered or triaged)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DISA K8s STIG rule 242442 does not parse imageID correctly
6 participants
@georgibaltiev @dimityrmirchev @AleksandarSavchev @gardener-robot-ci-1 @gardener-robot-ci-3 @gardener-robot