Skip to content

Commit f34a22d

Browse files
thaJeztahthaJeztah
committed
update go to go1.20.4, go1.19.9
go1.20.4 (released 2023-05-02) includes three security fixes to the html/template package, as well as bug fixes to the compiler, the runtime, and the crypto/subtle, crypto/tls, net/http, and syscall packages. See the Go 1.20.4 milestone on our issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.20.4+label%3ACherryPickApproved release notes: https://go.dev/doc/devel/release#go1.20.4 full diff: golang/go@go1.20.3...go1.20.4 from the announcement: > These minor releases include 3 security fixes following the security policy: > > - html/template: improper sanitization of CSS values > > Angle brackets (`<>`) were not considered dangerous characters when inserted > into CSS contexts. Templates containing multiple actions separated by a '/' > character could result in unexpectedly closing the CSS context and allowing > for injection of unexpected HMTL, if executed with untrusted input. > > Thanks to Juho Nurminen of Mattermost for reporting this issue. > > This is CVE-2023-24539 and Go issue https://go.dev/issue/59720. > > - html/template: improper handling of JavaScript whitespace > > Not all valid JavaScript whitespace characters were considered to be > whitespace. Templates containing whitespace characters outside of the character > set "\t\n\f\r\u0020\u2028\u2029" in JavaScript contexts that also contain > actions may not be properly sanitized during execution. > > Thanks to Juho Nurminen of Mattermost for reporting this issue. > > This is CVE-2023-24540 and Go issue https://go.dev/issue/59721. > > - html/template: improper handling of empty HTML attributes > > Templates containing actions in unquoted HTML attributes (e.g. "attr={{.}}") > executed with empty input could result in output that would have unexpected > results when parsed due to HTML normalization rules. This may allow injection > of arbitrary attributes into tags. > > Thanks to Juho Nurminen of Mattermost for reporting this issue. > > This is CVE-2023-29400 and Go issue https://go.dev/issue/59722. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit b947a6f) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent e8e7306 commit f34a22d

9 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎.github/workflows/build-test-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
steps:
4242
- uses: actions/setup-go@v3
4343
with:
44-
go-version: "1.20.3"
44+
go-version: "1.20.4"
4545

4646
- uses: actions/checkout@v3
4747
with:

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
env:
1313
# Go version we currently use to build containerd across all CI.
1414
# Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions.
15-
GO_VERSION: "1.20.3"
15+
GO_VERSION: "1.20.4"
1616

1717
permissions: # added using https://github.com/step-security/secure-workflows
1818
contents: read
@@ -233,7 +233,7 @@ jobs:
233233
strategy:
234234
matrix:
235235
os: [ubuntu-20.04, macos-12, windows-2019, windows-2022]
236-
go-version: ["1.20.3", "1.19.12"]
236+
go-version: ["1.20.4", "1.19.12"]
237237
steps:
238238
- name: Install dependencies
239239
if: matrix.os == 'ubuntu-20.04'

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- uses: actions/setup-go@v3
3535
with:
36-
go-version: 1.20.3
36+
go-version: 1.20.4
3737

3838
# Initializes the CodeQL tools for scanning.
3939
- name: Initialize CodeQL

‎.github/workflows/images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- uses: actions/setup-go@v3
2828
with:
29-
go-version: "1.20.3"
29+
go-version: "1.20.4"
3030

3131
- uses: actions/checkout@v3
3232
with:

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- '.github/workflows/nightly.yml'
88

99
env:
10-
GO_VERSION: "1.20.3"
10+
GO_VERSION: "1.20.4"
1111

1212
permissions: # added using https://github.com/step-security/secure-workflows
1313
contents: read

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
name: Containerd Release
77

88
env:
9-
GO_VERSION: "1.20.3"
9+
GO_VERSION: "1.20.4"
1010

1111
permissions: # added using https://github.com/step-security/secure-workflows
1212
contents: read

‎Vagrantfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ EOF
9494
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
9595
sh.upload_path = "/tmp/vagrant-install-golang"
9696
sh.env = {
97-
'GO_VERSION': ENV['GO_VERSION'] || "1.20.3",
97+
'GO_VERSION': ENV['GO_VERSION'] || "1.20.4",
9898
}
9999
sh.inline = <<~SHELL
100100
#!/usr/bin/env bash

‎contrib/Dockerfile.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../
1212

13-
ARG GOLANG_VERSION=1.20.3
13+
ARG GOLANG_VERSION=1.20.4
1414
ARG GOLANG_IMAGE=golang
1515

1616
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

‎script/setup/prepare_env_windows.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# lived test environment.
66
Set-MpPreference -DisableRealtimeMonitoring:$true
77

8-
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.20.3"; make = ""; nssm = "" }
8+
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.20.4"; make = ""; nssm = "" }
99

1010
Write-Host "Downloading chocolatey package"
1111
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'

0 commit comments

Comments
 (0)