TUN-10216: TUN fix cloudflare vulnerabilities GO-2026-4340 and GO-2026-4341

* TUN-10216: TUN fix cloudflare vulnerabilities GO-2026-4340 and GO-2026-4341

Closes TUN-10216
This commit is contained in:
Luis Neto 2026-02-06 10:01:07 +00:00
parent d7c62aed71
commit d6cb78aeb4
10 changed files with 66 additions and 59 deletions

View File

@ -6,7 +6,7 @@ RUN apt-get update && \
apt-get install --no-install-recommends --allow-downgrades -y \ apt-get install --no-install-recommends --allow-downgrades -y \
build-essential \ build-essential \
git \ git \
go-boring=1.24.11-1 \ go-boring=1.24.13-1 \
libffi-dev \ libffi-dev \
procps \ procps \
python3-dev \ python3-dev \

View File

@ -1,11 +1,11 @@
.golang-inputs: &golang_inputs .golang-inputs: &golang_inputs
runOnMR: true runOnMR: true
runOnBranches: '^master$' runOnBranches: "^master$"
outputDir: artifacts outputDir: artifacts
runner: linux-x86-8cpu-16gb runner: linux-x86-8cpu-16gb
stage: build stage: build
golangVersion: "boring-1.24" golangVersion: "boring-1.24"
imageVersion: "3393-947ec7a@sha256:f81acc2c8ecaa84acb290c43c080702ae3aba6464201a20f9d6eff619be7c878" imageVersion: "3462-0b23466e0715@sha256:42e8533370666a2463041572293a79e1449001ef803a993e6a860be00858c806"
CGO_ENABLED: 1 CGO_ENABLED: 1
.default-packaging-job: &packaging-job-defaults .default-packaging-job: &packaging-job-defaults
@ -65,7 +65,7 @@ include:
- component: $CI_SERVER_FQDN/cloudflare/ci/golang/boring-make@~latest - component: $CI_SERVER_FQDN/cloudflare/ci/golang/boring-make@~latest
inputs: inputs:
<<: *golang_inputs <<: *golang_inputs
runOnBranches: '^$' runOnBranches: "^$"
stage: validate stage: validate
jobPrefix: vulncheck jobPrefix: vulncheck
GOLANG_MAKE_TARGET: vulncheck GOLANG_MAKE_TARGET: vulncheck

View File

@ -28,7 +28,7 @@ macos-build-cloudflared: &mac-build
- '[ "${RUNNER_ARCH}" = "intel" ] && export TARGET_ARCH=amd64' - '[ "${RUNNER_ARCH}" = "intel" ] && export TARGET_ARCH=amd64'
- ARCH=$(uname -m) - ARCH=$(uname -m)
- echo ARCH=$ARCH - TARGET_ARCH=$TARGET_ARCH - echo ARCH=$ARCH - TARGET_ARCH=$TARGET_ARCH
- ./.ci/scripts/mac/install-go.sh - ./.ci/scripts/mac/install-go.sh "$MAC_GO_VERSION"
- BUILD_SCRIPT=.ci/scripts/mac/build.sh - BUILD_SCRIPT=.ci/scripts/mac/build.sh
- if [[ ! -x ${BUILD_SCRIPT} ]] ; then exit ; fi - if [[ ! -x ${BUILD_SCRIPT} ]] ; then exit ; fi
- set -euo pipefail - set -euo pipefail

View File

@ -2,9 +2,13 @@ rm -rf /tmp/go
export GOCACHE=/tmp/gocache export GOCACHE=/tmp/gocache
rm -rf $GOCACHE rm -rf $GOCACHE
brew install go@1.24 if [ -z "$1" ]
then
echo "No go version supplied"
fi
brew install "$1"
go version go version
which go which go
go env go env

View File

@ -4,6 +4,7 @@ set -e -u
# Define the file to store the list of vulnerabilities to ignore. # Define the file to store the list of vulnerabilities to ignore.
IGNORE_FILE=".vulnignore" IGNORE_FILE=".vulnignore"
go version
# Check if the ignored vulnerabilities file exists. If not, create an empty one. # Check if the ignored vulnerabilities file exists. If not, create an empty one.
if [ ! -f "$IGNORE_FILE" ]; then if [ ! -f "$IGNORE_FILE" ]; then
touch "$IGNORE_FILE" touch "$IGNORE_FILE"

View File

@ -18,7 +18,7 @@ windows-build-cloudflared:
<<: *windows-build-defaults <<: *windows-build-defaults
stage: build stage: build
script: script:
- powershell -ExecutionPolicy Bypass -File ".\.ci\scripts\windows\go-wrapper.ps1" "${GO_VERSION}" ".\.ci\scripts\windows\builds.ps1" - powershell -ExecutionPolicy Bypass -File ".\.ci\scripts\windows\go-wrapper.ps1" "${WIN_GO_VERSION}" ".\.ci\scripts\windows\builds.ps1"
artifacts: artifacts:
paths: paths:
- artifacts/* - artifacts/*
@ -73,7 +73,7 @@ windows-component-tests-cloudflared:
script: script:
# We have to decode the secret we encoded on the `windows-load-env-variables` job # We have to decode the secret we encoded on the `windows-load-env-variables` job
- $env:COMPONENT_TESTS_ORIGINCERT = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($env:COMPONENT_TESTS_ORIGINCERT)) - $env:COMPONENT_TESTS_ORIGINCERT = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($env:COMPONENT_TESTS_ORIGINCERT))
- powershell -ExecutionPolicy Bypass -File ".\.ci\scripts\windows\go-wrapper.ps1" "${GO_VERSION}" ".\.ci\scripts\windows\component-test.ps1" - powershell -ExecutionPolicy Bypass -File ".\.ci\scripts\windows\go-wrapper.ps1" "${WIN_GO_VERSION}" ".\.ci\scripts\windows\component-test.ps1"
artifacts: artifacts:
reports: reports:
junit: report.xml junit: report.xml

View File

@ -1,5 +1,7 @@
variables: variables:
GO_VERSION: "go1.24.11" GO_VERSION: "1.24.13"
MAC_GO_VERSION: "go@$GO_VERSION"
WIN_GO_VERSION: "go$GO_VERSION"
GIT_DEPTH: "0" GIT_DEPTH: "0"
default: default:

View File

@ -1,7 +1,7 @@
# use a builder image for building cloudflare # use a builder image for building cloudflare
ARG TARGET_GOOS ARG TARGET_GOOS
ARG TARGET_GOARCH ARG TARGET_GOARCH
FROM golang:1.24.11 AS builder FROM golang:1.24.13 AS builder
ENV GO111MODULE=on \ ENV GO111MODULE=on \
CGO_ENABLED=0 \ CGO_ENABLED=0 \
TARGET_GOOS=${TARGET_GOOS} \ TARGET_GOOS=${TARGET_GOOS} \

View File

@ -1,5 +1,5 @@
# use a builder image for building cloudflare # use a builder image for building cloudflare
FROM golang:1.24.11 AS builder FROM golang:1.24.13 AS builder
ENV GO111MODULE=on \ ENV GO111MODULE=on \
CGO_ENABLED=0 \ CGO_ENABLED=0 \
# the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual

View File

@ -1,5 +1,5 @@
# use a builder image for building cloudflare # use a builder image for building cloudflare
FROM golang:1.24.11 AS builder FROM golang:1.24.13 AS builder
ENV GO111MODULE=on \ ENV GO111MODULE=on \
CGO_ENABLED=0 \ CGO_ENABLED=0 \
# the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual