Skip to content

Fix vulnerability scanner not working in the GitHub actions CI and make it less strict #772

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

Merged
jormundur00 merged 3 commits into from
Nov 14, 2025
Merged

Fix vulnerability scanner not working in the GitHub actions CI and make it less strict #772

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19bf0b9
Make vulnerability scanner accept new image versions when they have a…
jormundur00 Nov 14, 2025
3e95f70
Check origin/master instead of master when getting allowed images, so…
jormundur00 Nov 14, 2025
57f52e6
Refactor method name and docs
jormundur00 Nov 14, 2025
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
18 changes: 7 additions & 11 deletions tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/GrypeTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
package org.graalvm.internal.tck;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import org.graalvm.internal.tck.model.MetadataIndexEntry;
import org.graalvm.internal.tck.model.grype.GrypeEntry;
import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.TaskAction;
Expand Down Expand Up @@ -61,8 +57,8 @@ public boolean isVulnerableImage() {
return vulnerabilities.critical() > 0 || vulnerabilities.high() > 0;
}

public boolean isLessVulnerable(DockerImage other) {
return this.vulnerabilities.critical() < other.vulnerabilities().critical() && this.vulnerabilities.high() < other.vulnerabilities().high();
public boolean isNotMoreVulnerable(DockerImage other) {
return this.vulnerabilities.critical() <= other.vulnerabilities().critical() && this.vulnerabilities.high() <= other.vulnerabilities().high();
}

public void printVulnerabilityStatus() {
Expand Down Expand Up @@ -95,7 +91,7 @@ private void scanAllImages() {

/**
* Scans images that have been changed between org.graalvm.internal.tck.GrypeTask#baseCommit and org.graalvm.internal.tck.GrypeTask#newCommit.
* If changed images are less vulnerable than previously allowed images, they won't be reported as vulnerable
* If changed images are not more vulnerable than previously allowed images, they won't be reported as vulnerable
*/
private void scanChangedImages() throws IOException, URISyntaxException {
Set<DockerImage> imagesToCheck = getChangedImages().stream().map(this::makeDockerImage).collect(Collectors.toSet());
Expand All @@ -113,13 +109,13 @@ private void scanChangedImages() throws IOException, URISyntaxException {
.filter(allowedImage -> DockerUtils.getImageName(allowedImage).equalsIgnoreCase(image.getImageName()))
.findFirst();

// check if a new image is less vulnerable than the existing one
// check if a new image is not more vulnerable than the existing one
if (existingAllowedImage.isPresent()) {
DockerImage imageToCompare = makeDockerImage(existingAllowedImage.get());
imageToCompare.printVulnerabilityStatus();

if (image.isLessVulnerable(imageToCompare)) {
System.out.println("Accepting: " + image.image() + " because it has less vulnerabilities than existing: " + imageToCompare.image());
if (image.isNotMoreVulnerable(imageToCompare)) {
System.out.println("Accepting: " + image.image() + " because it does not have more vulnerabilities than existing: " + imageToCompare.image());
acceptedImages++;
}
}
Expand Down Expand Up @@ -229,7 +225,7 @@ private Set<String> getAllowedImagesFromMaster() throws URISyntaxException, IOEx
ByteArrayOutputStream baos = new ByteArrayOutputStream();
getExecOperations().exec(spec -> {
spec.setStandardOutput(baos);
spec.commandLine("git", "show", "master:tests/tck-build-logic/src/main/resources" + file);
spec.commandLine("git", "show", "origin/master:tests/tck-build-logic/src/main/resources" + file);
});

allowedImages.add(baos.toString());
Expand Down
Loading