From a9d663438f2c8a7b1457b3c3fbbbd0ef67f82f5b Mon Sep 17 00:00:00 2001 From: Raj Chaudhuri Date: Sun, 3 Mar 2024 22:42:41 +0530 Subject: [PATCH] Go version bumped to 1.21 --- go.mod | 2 +- reweave/CHANGELOG.md | 7 ++ reweave/Makefile | 4 +- reweave/build/Dockerfile | 2 +- reweave/scans/badge.json | 2 +- reweave/scans/report.md | 102 +++++++----------------- reweave/scans/weave-kube-list-vulns.txt | 50 ++++-------- reweave/scans/weave-npc-list-vulns.txt | 46 +++-------- 8 files changed, 71 insertions(+), 144 deletions(-) diff --git a/go.mod b/go.mod index d95955f1..df5e3164 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rajch/weave -go 1.20 +go 1.21 require ( github.com/andybalholm/go-bit v1.0.1 diff --git a/reweave/CHANGELOG.md b/reweave/CHANGELOG.md index 45442004..944ced1d 100644 --- a/reweave/CHANGELOG.md +++ b/reweave/CHANGELOG.md @@ -6,6 +6,13 @@ All changes made to the weave net codebase during the reweave effort will be doc ### Changed +* Bumped go version in `go.mod` to `1.21`. +* Changed go base image in `reweave/build/Dockerfile` to `golang:1.21.6-bullseye`. + +## 2.8.2-beta14 (0e7b15b3) + +### Changed + * Vulnerability scanning output changed to a consolidated report * Documentation changed to reflect new fork status diff --git a/reweave/Makefile b/reweave/Makefile index 8b2d87fc..e0809002 100644 --- a/reweave/Makefile +++ b/reweave/Makefile @@ -1,4 +1,4 @@ -IMAGE_VERSION ?= 2.8.2-beta14 +IMAGE_VERSION ?= 2.8.2-beta15 REGISTRY_USER ?= rajchaudhuri ALPINE_BASEIMAGE ?= alpine:3.19.1 @@ -47,7 +47,7 @@ clean-plugin: tools/clean-plugin.sh .PHONY: clean -clean: clean-plugin clean-images +clean: clean-images clean-plugin .PHONY: submodule submodule: ../tools/.git diff --git a/reweave/build/Dockerfile b/reweave/build/Dockerfile index 50ea0f23..f37b95a0 100644 --- a/reweave/build/Dockerfile +++ b/reweave/build/Dockerfile @@ -7,7 +7,7 @@ ARG ALPINE_BASEIMAGE=alpine:3.19.1 # It will be built only once for a given build platform. Subsequent # stages will start from this and cross-compile for each target # architecture. -FROM --platform=${BUILDPLATFORM} golang:1.20.2-bullseye AS builderbase +FROM --platform=${BUILDPLATFORM} golang:1.21.6-bullseye AS builderbase # Support Raspberry Pi 2 and newer ENV GOARM 7 diff --git a/reweave/scans/badge.json b/reweave/scans/badge.json index f9d68035..a82ba4dc 100644 --- a/reweave/scans/badge.json +++ b/reweave/scans/badge.json @@ -1 +1 @@ -{"schemaVersion": 1, "label": "Vulnerabilty count", "message": "34", "color": "orange"} +{"schemaVersion": 1, "label": "Vulnerabilty count", "message": "14", "color": "orange"} diff --git a/reweave/scans/report.md b/reweave/scans/report.md index 095d34ec..0a295501 100644 --- a/reweave/scans/report.md +++ b/reweave/scans/report.md @@ -1,7 +1,7 @@ # Vulnerability Report Report date: 2024-03-03 -Unique vulnerability count: 34 +Unique vulnerability count: 14 Images version: 2.8.2-beta14 ## Scanner Details @@ -19,76 +19,36 @@ Supported DB Schema: 5 ## Vulnerabilities -weave-kube: (34) +weave-kube: (14) -NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY -busybox 1.36.1-r15 apk CVE-2023-42366 Medium -busybox 1.36.1-r15 apk CVE-2023-42365 Medium -busybox 1.36.1-r15 apk CVE-2023-42364 Medium -busybox 1.36.1-r15 apk CVE-2023-42363 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium -curl 8.5.0-r0 apk CVE-2024-0853 Medium -libuv 1.47.0-r0 apk CVE-2024-24806 High -ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium -stdlib go1.20.2 go-module CVE-2023-29405 Critical -stdlib go1.20.2 go-module CVE-2023-29404 Critical -stdlib go1.20.2 go-module CVE-2023-29402 Critical -stdlib go1.20.2 go-module CVE-2023-24540 Critical -stdlib go1.20.2 go-module CVE-2023-24538 Critical -stdlib go1.20.2 go-module CVE-2023-45285 High -stdlib go1.20.2 go-module CVE-2023-44487 High -stdlib go1.20.2 go-module CVE-2023-39325 High -stdlib go1.20.2 go-module CVE-2023-39323 High -stdlib go1.20.2 go-module CVE-2023-29403 High -stdlib go1.20.2 go-module CVE-2023-29400 High -stdlib go1.20.2 go-module CVE-2023-24539 High -stdlib go1.20.2 go-module CVE-2023-24537 High -stdlib go1.20.2 go-module CVE-2023-24536 High -stdlib go1.20.2 go-module CVE-2023-24534 High -stdlib go1.20.2 go-module CVE-2023-39326 Medium -stdlib go1.20.2 go-module CVE-2023-39319 Medium -stdlib go1.20.2 go-module CVE-2023-39318 Medium -stdlib go1.20.2 go-module CVE-2023-29409 Medium -stdlib go1.20.2 go-module CVE-2023-29406 Medium +NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY +busybox 1.36.1-r15 apk CVE-2023-42366 Medium +busybox 1.36.1-r15 apk CVE-2023-42365 Medium +busybox 1.36.1-r15 apk CVE-2023-42364 Medium +busybox 1.36.1-r15 apk CVE-2023-42363 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium +curl 8.5.0-r0 apk CVE-2024-0853 Medium +libuv 1.47.0-r0 apk CVE-2024-24806 High +ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium -weave-npc: (32) +weave-npc: (12) -NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY -busybox 1.36.1-r15 apk CVE-2023-42366 Medium -busybox 1.36.1-r15 apk CVE-2023-42365 Medium -busybox 1.36.1-r15 apk CVE-2023-42364 Medium -busybox 1.36.1-r15 apk CVE-2023-42363 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium -stdlib go1.20.2 go-module CVE-2023-29405 Critical -stdlib go1.20.2 go-module CVE-2023-29404 Critical -stdlib go1.20.2 go-module CVE-2023-29402 Critical -stdlib go1.20.2 go-module CVE-2023-24540 Critical -stdlib go1.20.2 go-module CVE-2023-24538 Critical -stdlib go1.20.2 go-module CVE-2023-45285 High -stdlib go1.20.2 go-module CVE-2023-44487 High -stdlib go1.20.2 go-module CVE-2023-39325 High -stdlib go1.20.2 go-module CVE-2023-39323 High -stdlib go1.20.2 go-module CVE-2023-29403 High -stdlib go1.20.2 go-module CVE-2023-29400 High -stdlib go1.20.2 go-module CVE-2023-24539 High -stdlib go1.20.2 go-module CVE-2023-24537 High -stdlib go1.20.2 go-module CVE-2023-24536 High -stdlib go1.20.2 go-module CVE-2023-24534 High -stdlib go1.20.2 go-module CVE-2023-39326 Medium -stdlib go1.20.2 go-module CVE-2023-39319 Medium -stdlib go1.20.2 go-module CVE-2023-39318 Medium -stdlib go1.20.2 go-module CVE-2023-29409 Medium -stdlib go1.20.2 go-module CVE-2023-29406 Medium +NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY +busybox 1.36.1-r15 apk CVE-2023-42366 Medium +busybox 1.36.1-r15 apk CVE-2023-42365 Medium +busybox 1.36.1-r15 apk CVE-2023-42364 Medium +busybox 1.36.1-r15 apk CVE-2023-42363 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium diff --git a/reweave/scans/weave-kube-list-vulns.txt b/reweave/scans/weave-kube-list-vulns.txt index 2502a428..a73e49e5 100644 --- a/reweave/scans/weave-kube-list-vulns.txt +++ b/reweave/scans/weave-kube-list-vulns.txt @@ -1,35 +1,15 @@ -NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY -busybox 1.36.1-r15 apk CVE-2023-42366 Medium -busybox 1.36.1-r15 apk CVE-2023-42365 Medium -busybox 1.36.1-r15 apk CVE-2023-42364 Medium -busybox 1.36.1-r15 apk CVE-2023-42363 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium -curl 8.5.0-r0 apk CVE-2024-0853 Medium -libuv 1.47.0-r0 apk CVE-2024-24806 High -ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium -stdlib go1.20.2 go-module CVE-2023-29405 Critical -stdlib go1.20.2 go-module CVE-2023-29404 Critical -stdlib go1.20.2 go-module CVE-2023-29402 Critical -stdlib go1.20.2 go-module CVE-2023-24540 Critical -stdlib go1.20.2 go-module CVE-2023-24538 Critical -stdlib go1.20.2 go-module CVE-2023-45285 High -stdlib go1.20.2 go-module CVE-2023-44487 High -stdlib go1.20.2 go-module CVE-2023-39325 High -stdlib go1.20.2 go-module CVE-2023-39323 High -stdlib go1.20.2 go-module CVE-2023-29403 High -stdlib go1.20.2 go-module CVE-2023-29400 High -stdlib go1.20.2 go-module CVE-2023-24539 High -stdlib go1.20.2 go-module CVE-2023-24537 High -stdlib go1.20.2 go-module CVE-2023-24536 High -stdlib go1.20.2 go-module CVE-2023-24534 High -stdlib go1.20.2 go-module CVE-2023-39326 Medium -stdlib go1.20.2 go-module CVE-2023-39319 Medium -stdlib go1.20.2 go-module CVE-2023-39318 Medium -stdlib go1.20.2 go-module CVE-2023-29409 Medium -stdlib go1.20.2 go-module CVE-2023-29406 Medium +NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY +busybox 1.36.1-r15 apk CVE-2023-42366 Medium +busybox 1.36.1-r15 apk CVE-2023-42365 Medium +busybox 1.36.1-r15 apk CVE-2023-42364 Medium +busybox 1.36.1-r15 apk CVE-2023-42363 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium +curl 8.5.0-r0 apk CVE-2024-0853 Medium +libuv 1.47.0-r0 apk CVE-2024-24806 High +ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium diff --git a/reweave/scans/weave-npc-list-vulns.txt b/reweave/scans/weave-npc-list-vulns.txt index a7348fab..d36ef394 100644 --- a/reweave/scans/weave-npc-list-vulns.txt +++ b/reweave/scans/weave-npc-list-vulns.txt @@ -1,33 +1,13 @@ -NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY -busybox 1.36.1-r15 apk CVE-2023-42366 Medium -busybox 1.36.1-r15 apk CVE-2023-42365 Medium -busybox 1.36.1-r15 apk CVE-2023-42364 Medium -busybox 1.36.1-r15 apk CVE-2023-42363 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium -busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium -ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium -stdlib go1.20.2 go-module CVE-2023-29405 Critical -stdlib go1.20.2 go-module CVE-2023-29404 Critical -stdlib go1.20.2 go-module CVE-2023-29402 Critical -stdlib go1.20.2 go-module CVE-2023-24540 Critical -stdlib go1.20.2 go-module CVE-2023-24538 Critical -stdlib go1.20.2 go-module CVE-2023-45285 High -stdlib go1.20.2 go-module CVE-2023-44487 High -stdlib go1.20.2 go-module CVE-2023-39325 High -stdlib go1.20.2 go-module CVE-2023-39323 High -stdlib go1.20.2 go-module CVE-2023-29403 High -stdlib go1.20.2 go-module CVE-2023-29400 High -stdlib go1.20.2 go-module CVE-2023-24539 High -stdlib go1.20.2 go-module CVE-2023-24537 High -stdlib go1.20.2 go-module CVE-2023-24536 High -stdlib go1.20.2 go-module CVE-2023-24534 High -stdlib go1.20.2 go-module CVE-2023-39326 Medium -stdlib go1.20.2 go-module CVE-2023-39319 Medium -stdlib go1.20.2 go-module CVE-2023-39318 Medium -stdlib go1.20.2 go-module CVE-2023-29409 Medium -stdlib go1.20.2 go-module CVE-2023-29406 Medium +NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY +busybox 1.36.1-r15 apk CVE-2023-42366 Medium +busybox 1.36.1-r15 apk CVE-2023-42365 Medium +busybox 1.36.1-r15 apk CVE-2023-42364 Medium +busybox 1.36.1-r15 apk CVE-2023-42363 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium +busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium +ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium