From 293781d2771dd7bcb6ee7388cbd7be4e9ed02a15 Mon Sep 17 00:00:00 2001
From: Christian Schlotter <christi.schlotter@gmail.com>
Date: Tue, 8 Aug 2023 09:10:45 +0200
Subject: [PATCH] Add verify-govulncheck and verify-vulnerabilities targets and
 integrate to scan action

---
 ...ge-scan.yaml => weekly-security-scan.yaml} |  6 +--
 Makefile                                      | 19 +++++++++
 hack/verify-vulnerabilities.sh                | 40 +++++++++++++++++++
 3 files changed, 62 insertions(+), 3 deletions(-)
 rename .github/workflows/{weekly-image-scan.yaml => weekly-security-scan.yaml} (87%)
 create mode 100755 hack/verify-vulnerabilities.sh

diff --git a/.github/workflows/weekly-image-scan.yaml b/.github/workflows/weekly-security-scan.yaml
similarity index 87%
rename from .github/workflows/weekly-image-scan.yaml
rename to .github/workflows/weekly-security-scan.yaml
index cac026712a09..577ac727d25d 100644
--- a/.github/workflows/weekly-image-scan.yaml
+++ b/.github/workflows/weekly-security-scan.yaml
@@ -1,4 +1,4 @@
-name: Weekly image scan
+name: Weekly security scan
 
 on:
   schedule:
@@ -28,5 +28,5 @@ jobs:
       uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # tag=v4.0.1
       with:
         go-version: ${{ steps.vars.outputs.go_version }}
-    - name: Run verify container script
-      run: make verify-container-images
+    - name: Run verify vulnerabilities script
+      run: make verify-vulnerabilities
diff --git a/Makefile b/Makefile
index c34dfb202b3f..d21fd13b8f8e 100644
--- a/Makefile
+++ b/Makefile
@@ -164,6 +164,11 @@ GOLANGCI_LINT_VER := $(shell cat .github/workflows/pr-golangci-lint.yaml | grep
 GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
 GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
 
+GOVULNCHECK_BIN := govulncheck
+GOVULNCHECK_VER := v1.0.0
+GOVULNCHECK := $(abspath $(TOOLS_BIN_DIR)/$(GOVULNCHECK_BIN)-$(GOVULNCHECK_VER))
+GOVULNCHECK_PKG := golang.org/x/vuln/cmd/govulncheck
+
 CONVERSION_VERIFIER_BIN := conversion-verifier
 CONVERSION_VERIFIER := $(abspath $(TOOLS_BIN_DIR)/$(CONVERSION_VERIFIER_BIN))
 
@@ -653,6 +658,14 @@ verify-tiltfile: ## Verify Tiltfile format
 verify-container-images: ## Verify container images
 	TRACE=$(TRACE) ./hack/verify-container-images.sh
 
+.PHONY: verify-govulncheck
+verify-govulncheck: $(GOVULNCHECK) ## Verify code for vulnerabilities
+	$(GOVULNCHECK) ./...
+
+.PHONY: verify-vulnerabilities
+verify-vulnerabilities: ## Verify code and images for vulnerabilities
+	TRACE=$(TRACE) ./hack/verify-vulnerabilities.sh
+
 ## --------------------------------------
 ## Binaries
 ## --------------------------------------
@@ -1249,6 +1262,9 @@ $(GINKGO_BIN): $(GINKGO) ## Build a local copy of ginkgo.
 .PHONY: $(GOLANGCI_LINT_BIN)
 $(GOLANGCI_LINT_BIN): $(GOLANGCI_LINT) ## Build a local copy of golangci-lint.
 
+.PHONY: $(GOVULNCHECK_BIN)
+$(GOVULNCHECK_BIN): $(GOVULNCHECK) ## Build a local copy of govulncheck.
+
 $(CONTROLLER_GEN): # Build controller-gen from tools folder.
 	GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(CONTROLLER_GEN_PKG) $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER)
 
@@ -1300,6 +1316,9 @@ $(GINKGO): # Build ginkgo from tools folder.
 $(GOLANGCI_LINT): # Build golangci-lint from tools folder.
 	GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(GOLANGCI_LINT_PKG) $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
 
+$(GOVULNCHECK): # Build govulncheck.
+	GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(GOVULNCHECK_PKG) $(GOVULNCHECK_BIN) $(GOVULNCHECK_VER)
+
 ## --------------------------------------
 ## Helpers
 ## --------------------------------------
diff --git a/hack/verify-vulnerabilities.sh b/hack/verify-vulnerabilities.sh
new file mode 100755
index 000000000000..dd73bc3aecbd
--- /dev/null
+++ b/hack/verify-vulnerabilities.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Copyright 2023 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+if [[ "${TRACE-0}" == "1" ]]; then
+    set -o xtrace
+fi
+
+# Scan the images
+make verify-container-images && R1=$? || R1=$?
+make verify-govulncheck && R2=$? || R2=$?
+
+echo ""
+BRed='\033[1;31m'
+BGreen='\033[1;32m'
+NC='\033[0m' # No
+
+if [ "$R1" -ne "0" ] || [ "$R2" -ne "0" ]
+then
+  echo -e "${BRed}Check for vulnerabilities failed! There are vulnerability to be fixed${NC}"
+  exit 1
+fi
+
+echo -e "${BGreen}Check for vulnerabilities passed! No vulnerability found${NC}"