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: https://github.com/golang/go/compare/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 <github@gone.nl>
(cherry picked from commit fd0621d0fe)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
168 lines
3.2 KiB
HCL
168 lines
3.2 KiB
HCL
variable "GO_VERSION" {
|
|
default = "1.20.4"
|
|
}
|
|
variable "VERSION" {
|
|
default = ""
|
|
}
|
|
variable "USE_GLIBC" {
|
|
default = ""
|
|
}
|
|
variable "STRIP_TARGET" {
|
|
default = ""
|
|
}
|
|
variable "IMAGE_NAME" {
|
|
default = "docker-cli"
|
|
}
|
|
|
|
# Sets the name of the company that produced the windows binary.
|
|
variable "PACKAGER_NAME" {
|
|
default = ""
|
|
}
|
|
|
|
target "_common" {
|
|
args = {
|
|
GO_VERSION = GO_VERSION
|
|
BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1
|
|
}
|
|
}
|
|
|
|
target "_platforms" {
|
|
platforms = [
|
|
"darwin/amd64",
|
|
"darwin/arm64",
|
|
"linux/amd64",
|
|
"linux/arm/v6",
|
|
"linux/arm/v7",
|
|
"linux/arm64",
|
|
"linux/ppc64le",
|
|
"linux/riscv64",
|
|
"linux/s390x",
|
|
"windows/amd64",
|
|
"windows/arm64"
|
|
]
|
|
}
|
|
|
|
group "default" {
|
|
targets = ["binary"]
|
|
}
|
|
|
|
target "binary" {
|
|
inherits = ["_common"]
|
|
target = "binary"
|
|
platforms = ["local"]
|
|
output = ["build"]
|
|
args = {
|
|
BASE_VARIANT = USE_GLIBC == "1" ? "bullseye" : "alpine"
|
|
VERSION = VERSION
|
|
PACKAGER_NAME = PACKAGER_NAME
|
|
GO_STRIP = STRIP_TARGET
|
|
}
|
|
}
|
|
|
|
target "dynbinary" {
|
|
inherits = ["binary"]
|
|
args = {
|
|
GO_LINKMODE = "dynamic"
|
|
}
|
|
}
|
|
|
|
target "plugins" {
|
|
inherits = ["_common"]
|
|
target = "plugins"
|
|
platforms = ["local"]
|
|
output = ["build"]
|
|
args = {
|
|
BASE_VARIANT = USE_GLIBC == "1" ? "bullseye" : "alpine"
|
|
VERSION = VERSION
|
|
GO_STRIP = STRIP_TARGET
|
|
}
|
|
}
|
|
|
|
target "cross" {
|
|
inherits = ["binary", "_platforms"]
|
|
}
|
|
|
|
target "dynbinary-cross" {
|
|
inherits = ["dynbinary", "_platforms"]
|
|
}
|
|
|
|
target "plugins-cross" {
|
|
inherits = ["plugins", "_platforms"]
|
|
}
|
|
|
|
target "lint" {
|
|
inherits = ["_common"]
|
|
dockerfile = "./dockerfiles/Dockerfile.lint"
|
|
target = "lint"
|
|
output = ["type=cacheonly"]
|
|
}
|
|
|
|
target "shellcheck" {
|
|
inherits = ["_common"]
|
|
dockerfile = "./dockerfiles/Dockerfile.shellcheck"
|
|
target = "shellcheck"
|
|
output = ["type=cacheonly"]
|
|
}
|
|
|
|
target "validate-vendor" {
|
|
inherits = ["_common"]
|
|
dockerfile = "./dockerfiles/Dockerfile.vendor"
|
|
target = "validate"
|
|
output = ["type=cacheonly"]
|
|
}
|
|
|
|
target "update-vendor" {
|
|
inherits = ["_common"]
|
|
dockerfile = "./dockerfiles/Dockerfile.vendor"
|
|
target = "update"
|
|
output = ["."]
|
|
}
|
|
|
|
target "mod-outdated" {
|
|
inherits = ["_common"]
|
|
dockerfile = "./dockerfiles/Dockerfile.vendor"
|
|
target = "outdated"
|
|
no-cache-filter = ["outdated"]
|
|
output = ["type=cacheonly"]
|
|
}
|
|
|
|
target "validate-authors" {
|
|
inherits = ["_common"]
|
|
dockerfile = "./dockerfiles/Dockerfile.authors"
|
|
target = "validate"
|
|
output = ["type=cacheonly"]
|
|
}
|
|
|
|
target "update-authors" {
|
|
inherits = ["_common"]
|
|
dockerfile = "./dockerfiles/Dockerfile.authors"
|
|
target = "update"
|
|
output = ["."]
|
|
}
|
|
|
|
target "test" {
|
|
target = "test"
|
|
output = ["type=cacheonly"]
|
|
}
|
|
|
|
target "test-coverage" {
|
|
target = "test-coverage"
|
|
output = ["build/coverage"]
|
|
}
|
|
|
|
target "e2e-image" {
|
|
target = "e2e"
|
|
output = ["type=docker"]
|
|
tags = ["${IMAGE_NAME}"]
|
|
args = {
|
|
BASE_VARIANT = USE_GLIBC == "1" ? "bullseye" : "alpine"
|
|
VERSION = VERSION
|
|
}
|
|
}
|
|
|
|
target "e2e-gencerts" {
|
|
inherits = ["_common"]
|
|
dockerfile = "./e2e/testdata/Dockerfile.gencerts"
|
|
output = ["./e2e/testdata"]
|
|
}
|