From 0e05f9efcb8e69810f2986f2fd14650a35b47a35 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Tue, 6 Sep 2022 22:19:38 +0200
Subject: [PATCH] Update to go 1.19.1 to address CVE-2022-27664, CVE-2022-32190

From the mailing list:

We have just released Go versions 1.19.1 and 1.18.6, minor point releases.
These minor releases include 2 security fixes following the security policy:

- net/http: handle server errors after sending GOAWAY
  A closing HTTP/2 server connection could hang forever waiting for a clean
  shutdown that was preempted by a subsequent fatal error. This failure mode
  could be exploited to cause a denial of service.

  Thanks to Bahruz Jabiyev, Tommaso Innocenti, Anthony Gavazzi, Steven Sprecher,
  and Kaan Onarlioglu for reporting this.

  This is CVE-2022-27664 and Go issue https://go.dev/issue/54658.

- net/url: JoinPath does not strip relative path components in all circumstances
  JoinPath and URL.JoinPath would not remove `../` path components appended to a
  relative path. For example, `JoinPath("https://go.dev", "../go")` returned the
  URL `https://go.dev/../go`, despite the JoinPath documentation stating that
  `../` path elements are cleaned from the result.

  Thanks to q0jt for reporting this issue.

  This is CVE-2022-32190 and Go issue https://go.dev/issue/54385.

Release notes:

go1.19.1 (released 2022-09-06) includes security fixes to the net/http and
net/url packages, as well as bug fixes to the compiler, the go command, the pprof
command, the linker, the runtime, and the crypto/tls and crypto/x509 packages.
See the Go 1.19.1 milestone on the issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.19.1+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3a17d8a9091674406f0237ca5274428d3912d65a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Dockerfile                           | 2 +-
 appveyor.yml                         | 2 +-
 docker-bake.hcl                      | 2 +-
 dockerfiles/Dockerfile.binary-native | 2 +-
 dockerfiles/Dockerfile.dev           | 2 +-
 dockerfiles/Dockerfile.e2e           | 2 +-
 dockerfiles/Dockerfile.lint          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 71e01dfd8f..f096104679 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG BASE_VARIANT=alpine
-ARG GO_VERSION=1.19.0
+ARG GO_VERSION=1.19.1
 ARG ALPINE_VERSION=3.16
 ARG XX_VERSION=1.1.0
 
diff --git a/appveyor.yml b/appveyor.yml
index 2075572b5c..489b7ca26b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
 
 environment:
   GOPATH: c:\gopath
-  GOVERSION: 1.19.0
+  GOVERSION: 1.19.1
   DEPVERSION: v0.4.1
 
 install:
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 9ac29aee8d..7548f63d79 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-    default = "1.19.0"
+    default = "1.19.1"
 }
 variable "VERSION" {
     default = ""
diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native
index a885e2eb8e..3e14c1aa5c 100644
--- a/dockerfiles/Dockerfile.binary-native
+++ b/dockerfiles/Dockerfile.binary-native
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.19.0
+ARG GO_VERSION=1.19.1
 
 FROM    golang:${GO_VERSION}-alpine
 
diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
index 5b25dae4af..019af891b6 100644
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.19.0
+ARG GO_VERSION=1.19.1
 ARG ALPINE_VERSION=3.16
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang
diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e
index 45dfa7daa4..7de17f946c 100644
--- a/dockerfiles/Dockerfile.e2e
+++ b/dockerfiles/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.19.0
+ARG GO_VERSION=1.19.1
 
 # Use Debian based image as docker-compose requires glibc.
 FROM golang:${GO_VERSION}-buster
diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint
index f728e83a10..3a26c071d1 100644
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.19.0
+ARG GO_VERSION=1.19.1
 ARG ALPINE_VERSION=3.16
 ARG GOLANGCI_LINT_VERSION=v1.49.0