[v9.5.x] Security: Authenticate to GCR for trivy scans (#73925)

Security: Authenticate to GCR for trivy scans (#72658)

* Authenticate to GCR for trivy scans

# Conflicts:
#	.drone.yml

* verify-starlark

* Change secret

# Conflicts:
#	.drone.yml

(cherry picked from commit e100fc927e)

# Conflicts:
#	.drone.yml
#	scripts/drone/vault.star
This commit is contained in:
Dimitris Sotirakis
2023-08-28 15:56:49 +03:00
committed by GitHub
parent f29ce9b29d
commit c811eb747d
3 changed files with 161 additions and 12 deletions
+131 -7
View File
@@ -3663,14 +3663,34 @@ platform:
arch: amd64 arch: amd64
os: linux os: linux
steps: steps:
- commands:
- echo $${GCR_CREDENTIALS} | docker login -u _json_key --password-stdin https://us.gcr.io
environment:
GCR_CREDENTIALS:
from_secret: gcr_credentials
image: docker:dind
name: authenticate-gcr
volumes:
- name: docker
path: /var/run/docker.sock
- commands: - commands:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:latest - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:latest
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0 image: aquasec/trivy:0.21.0
name: scan-unknown-low-medium-vulnerabilities name: scan-unknown-low-medium-vulnerabilities
volumes:
- name: docker
path: /var/run/docker.sock
- commands: - commands:
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana:latest - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana:latest
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0 image: aquasec/trivy:0.21.0
name: scan-high-critical-vulnerabilities name: scan-high-critical-vulnerabilities
volumes:
- name: docker
path: /var/run/docker.sock
- image: plugins/slack - image: plugins/slack
name: slack-notify-failure name: slack-notify-failure
settings: settings:
@@ -3684,6 +3704,10 @@ trigger:
cron: nightly cron: nightly
event: cron event: cron
type: docker type: docker
volumes:
- host:
path: /var/run/docker.sock
name: docker
--- ---
clone: clone:
retries: 3 retries: 3
@@ -3693,14 +3717,34 @@ platform:
arch: amd64 arch: amd64
os: linux os: linux
steps: steps:
- commands:
- echo $${GCR_CREDENTIALS} | docker login -u _json_key --password-stdin https://us.gcr.io
environment:
GCR_CREDENTIALS:
from_secret: gcr_credentials
image: docker:dind
name: authenticate-gcr
volumes:
- name: docker
path: /var/run/docker.sock
- commands: - commands:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:main - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:main
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0 image: aquasec/trivy:0.21.0
name: scan-unknown-low-medium-vulnerabilities name: scan-unknown-low-medium-vulnerabilities
volumes:
- name: docker
path: /var/run/docker.sock
- commands: - commands:
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana:main - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana:main
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0 image: aquasec/trivy:0.21.0
name: scan-high-critical-vulnerabilities name: scan-high-critical-vulnerabilities
volumes:
- name: docker
path: /var/run/docker.sock
- image: plugins/slack - image: plugins/slack
name: slack-notify-failure name: slack-notify-failure
settings: settings:
@@ -3714,6 +3758,10 @@ trigger:
cron: nightly cron: nightly
event: cron event: cron
type: docker type: docker
volumes:
- host:
path: /var/run/docker.sock
name: docker
--- ---
clone: clone:
retries: 3 retries: 3
@@ -3723,14 +3771,34 @@ platform:
arch: amd64 arch: amd64
os: linux os: linux
steps: steps:
- commands:
- echo $${GCR_CREDENTIALS} | docker login -u _json_key --password-stdin https://us.gcr.io
environment:
GCR_CREDENTIALS:
from_secret: gcr_credentials
image: docker:dind
name: authenticate-gcr
volumes:
- name: docker
path: /var/run/docker.sock
- commands: - commands:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:latest-ubuntu - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:latest-ubuntu
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0 image: aquasec/trivy:0.21.0
name: scan-unknown-low-medium-vulnerabilities name: scan-unknown-low-medium-vulnerabilities
volumes:
- name: docker
path: /var/run/docker.sock
- commands: - commands:
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana:latest-ubuntu - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana:latest-ubuntu
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0 image: aquasec/trivy:0.21.0
name: scan-high-critical-vulnerabilities name: scan-high-critical-vulnerabilities
volumes:
- name: docker
path: /var/run/docker.sock
- image: plugins/slack - image: plugins/slack
name: slack-notify-failure name: slack-notify-failure
settings: settings:
@@ -3745,6 +3813,10 @@ trigger:
cron: nightly cron: nightly
event: cron event: cron
type: docker type: docker
volumes:
- host:
path: /var/run/docker.sock
name: docker
--- ---
clone: clone:
retries: 3 retries: 3
@@ -3754,14 +3826,34 @@ platform:
arch: amd64 arch: amd64
os: linux os: linux
steps: steps:
- commands:
- echo $${GCR_CREDENTIALS} | docker login -u _json_key --password-stdin https://us.gcr.io
environment:
GCR_CREDENTIALS:
from_secret: gcr_credentials
image: docker:dind
name: authenticate-gcr
volumes:
- name: docker
path: /var/run/docker.sock
- commands: - commands:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:main-ubuntu - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana:main-ubuntu
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0 image: aquasec/trivy:0.21.0
name: scan-unknown-low-medium-vulnerabilities name: scan-unknown-low-medium-vulnerabilities
volumes:
- name: docker
path: /var/run/docker.sock
- commands: - commands:
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana:main-ubuntu - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana:main-ubuntu
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0 image: aquasec/trivy:0.21.0
name: scan-high-critical-vulnerabilities name: scan-high-critical-vulnerabilities
volumes:
- name: docker
path: /var/run/docker.sock
- image: plugins/slack - image: plugins/slack
name: slack-notify-failure name: slack-notify-failure
settings: settings:
@@ -3776,6 +3868,10 @@ trigger:
cron: nightly cron: nightly
event: cron event: cron
type: docker type: docker
volumes:
- host:
path: /var/run/docker.sock
name: docker
--- ---
clone: clone:
retries: 3 retries: 3
@@ -3785,6 +3881,16 @@ platform:
arch: amd64 arch: amd64
os: linux os: linux
steps: steps:
- commands:
- echo $${GCR_CREDENTIALS} | docker login -u _json_key --password-stdin https://us.gcr.io
environment:
GCR_CREDENTIALS:
from_secret: gcr_credentials
image: docker:dind
name: authenticate-gcr
volumes:
- name: docker
path: /var/run/docker.sock
- commands: - commands:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/build-container:1.7.5 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/build-container:1.7.5
@@ -3805,8 +3911,13 @@ steps:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/docs-base:dbd975af06 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/docs-base:dbd975af06
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM cypress/included:9.5.1-node16.14.0-slim-chrome99-ff97 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM cypress/included:9.5.1-node16.14.0-slim-chrome99-ff97
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:latest - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:latest
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0 image: aquasec/trivy:0.21.0
name: scan-unknown-low-medium-vulnerabilities name: scan-unknown-low-medium-vulnerabilities
volumes:
- name: docker
path: /var/run/docker.sock
- commands: - commands:
- trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/build-container:1.7.5 - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/build-container:1.7.5
@@ -3827,8 +3938,13 @@ steps:
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/docs-base:dbd975af06 - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/docs-base:dbd975af06
- trivy --exit-code 1 --severity HIGH,CRITICAL cypress/included:9.5.1-node16.14.0-slim-chrome99-ff97 - trivy --exit-code 1 --severity HIGH,CRITICAL cypress/included:9.5.1-node16.14.0-slim-chrome99-ff97
- trivy --exit-code 1 --severity HIGH,CRITICAL us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:latest - trivy --exit-code 1 --severity HIGH,CRITICAL us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:latest
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0 image: aquasec/trivy:0.21.0
name: scan-high-critical-vulnerabilities name: scan-high-critical-vulnerabilities
volumes:
- name: docker
path: /var/run/docker.sock
- image: plugins/slack - image: plugins/slack
name: slack-notify-failure name: slack-notify-failure
settings: settings:
@@ -3842,6 +3958,10 @@ trigger:
cron: nightly cron: nightly
event: cron event: cron
type: docker type: docker
volumes:
- host:
path: /var/run/docker.sock
name: docker
--- ---
clone: clone:
retries: 3 retries: 3
@@ -3873,6 +3993,10 @@ trigger:
cron: grafana-com-nightly cron: grafana-com-nightly
event: cron event: cron
type: docker type: docker
volumes:
- host:
path: /var/run/docker.sock
name: docker
--- ---
get: get:
name: credentials.json name: credentials.json
@@ -4000,12 +4124,6 @@ get:
kind: secret kind: secret
name: enterprise2-cdn-path name: enterprise2-cdn-path
--- ---
get:
name: security_prefix
path: infra/data/ci/grafana-release-eng/enterprise2
kind: secret
name: enterprise2_security_prefix
---
get: get:
name: gcp_service_account_prod_base64 name: gcp_service_account_prod_base64
path: infra/data/ci/grafana-release-eng/rgm path: infra/data/ci/grafana-release-eng/rgm
@@ -4066,7 +4184,13 @@ get:
kind: secret kind: secret
name: github_token name: github_token
--- ---
get:
name: service-account
path: secret/data/common/gcr
kind: secret
name: gcr_credentials
---
kind: signature kind: signature
hmac: 2a4b30f9f3cbbb57221e6d9e22afca00a2dfbc89ce0d4ec8297037a9d84bfd9c hmac: 8ea972fb9df645d27b0a827c5bfbf86ab75e08929dfaa49c54e2f999444bab51
... ...
+25
View File
@@ -24,6 +24,17 @@ def cronjobs():
grafana_com_nightly_pipeline(), grafana_com_nightly_pipeline(),
] ]
def authenticate_gcr_step():
return {
"name": "authenticate-gcr",
"image": "docker:dind",
"commands": ["echo $${GCR_CREDENTIALS} | docker login -u _json_key --password-stdin https://us.gcr.io"],
"environment": {
"GCR_CREDENTIALS": from_secret("gcr_credentials"),
},
"volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
}
def cron_job_pipeline(cronName, name, steps): def cron_job_pipeline(cronName, name, steps):
return { return {
"kind": "pipeline", "kind": "pipeline",
@@ -41,6 +52,14 @@ def cron_job_pipeline(cronName, name, steps):
"retries": 3, "retries": 3,
}, },
"steps": steps, "steps": steps,
"volumes": [
{
"name": "docker",
"host": {
"path": "/var/run/docker.sock",
},
},
],
} }
def scan_docker_image_pipeline(tag): def scan_docker_image_pipeline(tag):
@@ -58,6 +77,7 @@ def scan_docker_image_pipeline(tag):
cronName = "nightly", cronName = "nightly",
name = "scan-" + docker_image + "-image", name = "scan-" + docker_image + "-image",
steps = [ steps = [
authenticate_gcr_step(),
scan_docker_image_unknown_low_medium_vulnerabilities_step(docker_image), scan_docker_image_unknown_low_medium_vulnerabilities_step(docker_image),
scan_docker_image_high_critical_vulnerabilities_step(docker_image), scan_docker_image_high_critical_vulnerabilities_step(docker_image),
slack_job_failed_step("grafana-backend-ops", docker_image), slack_job_failed_step("grafana-backend-ops", docker_image),
@@ -75,6 +95,7 @@ def scan_build_test_publish_docker_image_pipeline():
cronName = "nightly", cronName = "nightly",
name = "scan-build-test-and-publish-docker-images", name = "scan-build-test-and-publish-docker-images",
steps = [ steps = [
authenticate_gcr_step(),
scan_docker_image_unknown_low_medium_vulnerabilities_step("all"), scan_docker_image_unknown_low_medium_vulnerabilities_step("all"),
scan_docker_image_high_critical_vulnerabilities_step("all"), scan_docker_image_high_critical_vulnerabilities_step("all"),
slack_job_failed_step("grafana-backend-ops", "build-images"), slack_job_failed_step("grafana-backend-ops", "build-images"),
@@ -101,6 +122,8 @@ def scan_docker_image_unknown_low_medium_vulnerabilities_step(docker_image):
"name": "scan-unknown-low-medium-vulnerabilities", "name": "scan-unknown-low-medium-vulnerabilities",
"image": aquasec_trivy_image, "image": aquasec_trivy_image,
"commands": cmds, "commands": cmds,
"depends_on": ["authenticate-gcr"],
"volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
} }
def scan_docker_image_high_critical_vulnerabilities_step(docker_image): def scan_docker_image_high_critical_vulnerabilities_step(docker_image):
@@ -123,6 +146,8 @@ def scan_docker_image_high_critical_vulnerabilities_step(docker_image):
"name": "scan-high-critical-vulnerabilities", "name": "scan-high-critical-vulnerabilities",
"image": aquasec_trivy_image, "image": aquasec_trivy_image,
"commands": cmds, "commands": cmds,
"depends_on": ["authenticate-gcr"],
"volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
} }
def slack_job_failed_step(channel, image): def slack_job_failed_step(channel, image):
+5 -5
View File
@@ -112,11 +112,6 @@ def secrets():
"infra/data/ci/grafana-release-eng/enterprise2", "infra/data/ci/grafana-release-eng/enterprise2",
"cdn_path", "cdn_path",
), ),
vault_secret(
"enterprise2_security_prefix",
"infra/data/ci/grafana-release-eng/enterprise2",
"security_prefix",
),
vault_secret( vault_secret(
rgm_gcp_key_base64, rgm_gcp_key_base64,
"infra/data/ci/grafana-release-eng/rgm", "infra/data/ci/grafana-release-eng/rgm",
@@ -168,4 +163,9 @@ def secrets():
"infra/data/ci/github/grafanabot", "infra/data/ci/github/grafanabot",
"pat", "pat",
), ),
vault_secret(
"gcr_credentials",
"secret/data/common/gcr",
"service-account",
),
] ]