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

fix(query): revert changes in the 'platform_flag_with_from' query #7117

Merged
merged 11 commits into from
Jun 12, 2024
Merged

fix(query): revert changes in the 'platform_flag_with_from' query #7117

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
043bb8a
updated query description
JulioSCX Jun 11, 2024
cba7f16
updated test files
JulioSCX Jun 11, 2024
ddb076f
reverted query changes
JulioSCX Jun 11, 2024
27f05dd
updated severity to 'Info'
JulioSCX Jun 11, 2024
c17028d
added filename to expected results
JulioSCX Jun 11, 2024
ee685d4
Merge branch 'master' into AST-43980
JulioSCX Jun 11, 2024
f94f299
Merge branch 'master' into AST-43980
JulioSCX Jun 11, 2024
f1cbe6c
removed 'platform' flag from dockerfile
JulioSCX Jun 11, 2024
3620a70
Merge branch 'AST-43980' of https://github.com/Checkmarx/kics into AS…
JulioSCX Jun 11, 2024
71b4ea8
fixed tests
JulioSCX Jun 11, 2024
5025b12
Merge branch 'master' into AST-43980
JulioSCX Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/queries/dockerfile/using_platform_with_from/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"id": "b16e8501-ef3c-44e1-a543-a093238099c9",
"queryName": "Using Platform Flag with FROM Command",
"severity": "LOW",
"severity": "INFO",
"category": "Best Practices",
"descriptionText": "'FROM' instruction should use the flag '--platform'",
"descriptionText": "'FROM' instruction should not use the flag '--platform'",
"descriptionUrl": "https://docs.docker.com/engine/reference/builder/#from",
"platform": "Dockerfile",
"descriptionID": "5bd0baab",
Expand Down
9 changes: 4 additions & 5 deletions assets/queries/dockerfile/using_platform_with_from/query.rego
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ import data.generic.common as common_lib
CxPolicy[result] {
resource := input.document[i].command[name][_]

common_lib.contains_element(resource.Value, "as")
contains(resource.Cmd, "from")
not common_lib.contains_with_size(resource.Flags, "--platform")
contains(resource.Flags[j], "--platform")
contains(resource.Cmd, "from")

result := {
"documentId": input.document[i].id,
"searchKey": sprintf("FROM={{%s}}.{{%s}}", [name, resource.Original]),
"issueType": "IncorrectValue",
"keyExpectedValue": sprintf("FROM={{%s}}.{{%s}} should use the flag '--platform'", [name, resource.Original]),
"keyActualValue": sprintf("FROM={{%s}}.{{%s}} not use the flag '--platform'", [name, resource.Original]),
"keyExpectedValue": sprintf("FROM={{%s}}.{{%s}} should not use the '--platform' flag", [name, resource.Original]),
"keyActualValue": sprintf("FROM={{%s}}.{{%s}} is using the '--platform' flag", [name, resource.Original]),
}
}
2 changes: 1 addition & 1 deletion assets/queries/dockerfile/using_platform_with_from/test/negative.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ RUN apk add --update py2-pip
RUN pip install --upgrade pip
LABEL maintainer="[email protected]"
COPY requirements.txt /usr/src/app/
FROM --platform=arm64 baseimage as baseimage-build
FROM baseimage as baseimage-build
2 changes: 1 addition & 1 deletion assets/queries/dockerfile/using_platform_with_from/test/positive.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ RUN apk add --update py2-pip
RUN pip install --upgrade pip
LABEL maintainer="[email protected]"
COPY requirements.txt /usr/src/app/
FROM baseimage as baseimage-build
FROM --platform=arm64 baseimage as baseimage-build
Loading