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

GH-16354 Remove Snyk and add Trivy #16358

Merged
merged 4 commits into from
Aug 7, 2024
Merged

GH-16354 Remove Snyk and add Trivy #16358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2577fe2
GH-16354 remove Snyk and add Trivy
valenad1 Aug 7, 2024
2a480bc
remove -pkg-types because it creates empty file if no vulnerability i…
valenad1 Aug 6, 2024
3603ec7
refactor
valenad1 Aug 6, 2024
feb199b
Replace special characters with * in order to show it directly in bro…
valenad1 Aug 6, 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
2 changes: 0 additions & 2 deletions docker/prisma/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@ RUN for dir in $DIRECTORIES; do \
chown -R 2117:2117 /$dir; \
done

RUN npm install snyk -g

CMD ["/bin/bash"]
40 changes: 27 additions & 13 deletions scripts/jenkins/jenkinsfiles/Jenkinsfile-PrismaScan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
@Library('test-shared-library') _

def dockerImage
def trivyVersion = "0.54.1"

def setPrismaScanningStages(assemblyType, stageIndex) {
def setScanningStages(assemblyType, stageIndex) {
branchName = "${env.BRANCH_NAME}".replace('/', '-')
assemblyImage = "h2o-assemblies/${assemblyType}:${BUILD_NUMBER}-${branchName}"

Expand All @@ -13,13 +14,25 @@ def setPrismaScanningStages(assemblyType, stageIndex) {
sh "docker build . -t ${assemblyImage} -f ./docker/prisma/Dockerfile.${assemblyType}jars"
}
}
stage ("${stageIndex}.B. Scan ${assemblyType} jar using Snyk") {
withCredentials([string(credentialsId: 'H2O_3_SNYK_TOKEN_JENKINS_TEXT', variable: 'SNYK_TOKEN')]) {
script {
sh "./snyk container test ${assemblyImage} --file=./docker/prisma/Dockerfile.${assemblyType}jars --severity-threshold=medium --app-vulns --nested-jars-depth=4 | tee ${assemblyImage}-snyk.out || true"
}
archiveArtifacts artifacts: "${assemblyImage}-snyk.out"
stage ("${stageIndex}.B. Scan ${assemblyType} jar using Trivy") {
script {
sh "./trivy image ${assemblyImage} --output ${assemblyImage}-trivy.out"
// Replace special characters with * in order to show it directly in browser
sh """
sed -i 's/─/*/g' ${assemblyImage}-trivy.out
sed -i 's/│/*/g' ${assemblyImage}-trivy.out
sed -i 's/┤/*/g' ${assemblyImage}-trivy.out
sed -i 's/├/*/g' ${assemblyImage}-trivy.out
sed -i 's/┼/*/g' ${assemblyImage}-trivy.out
sed -i 's/┐/*/g' ${assemblyImage}-trivy.out
sed -i 's/┌/*/g' ${assemblyImage}-trivy.out
sed -i 's/└/*/g' ${assemblyImage}-trivy.out
sed -i 's/┘/*/g' ${assemblyImage}-trivy.out
sed -i 's/┬/*/g' ${assemblyImage}-trivy.out
sed -i 's/┴/*/g' ${assemblyImage}-trivy.out
"""
}
archiveArtifacts artifacts: "${assemblyImage}-trivy.out"
}
stage("${stageIndex}.C. Scan ${assemblyType} jar using Prisma") {
script {
Expand Down Expand Up @@ -62,8 +75,9 @@ pipeline {
dir("docker/prisma"){
dockerImage = docker.build("node-java","-f Dockerfile .")
}
sh "curl --compressed https://static.snyk.io/cli/latest/snyk-linux -o snyk"
sh "chmod +x ./snyk"
sh "wget https://github.com/aquasecurity/trivy/releases/download/v${trivyVersion}/trivy_${trivyVersion}_Linux-64bit.tar.gz"
sh "tar -zxvf trivy_${trivyVersion}_Linux-64bit.tar.gz"
sh "chmod +x ./trivy"
}

}
Expand All @@ -80,14 +94,14 @@ pipeline {
}
}
}
stage('2. Steam assembly jar (Prisma)') {
stage('2. Steam assembly jar') {
steps {
setPrismaScanningStages("steam", 2)
setScanningStages("steam", 2)
}
}
stage('3. Main assembly jar (Prisma)') {
stage('3. Main assembly jar') {
steps {
setPrismaScanningStages("main", 3)
setScanningStages("main", 3)
}
}
}
Expand Down
Loading