Merge branch 'main' into NET-11563-Frontend-Expose-SSO-obtained-Consu…

…l-token-in-WebUI
hashicorp · Feb 11, 2025 · 4cb66c9 · 4cb66c9
2 parents e21cfcd + 57a39b1
commit 4cb66c9
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 23 deletions.
diff --git a/.changelog/22132.txt b/.changelog/22132.txt
@@ -0,0 +1,4 @@
+```release-note:security
+Upgrade Go to use v1.22.12 and bump Go X-Repositories to latest. This addresses CVE
+[CVE-2025-22866](https://nvd.nist.gov/vuln/detail/CVE-2025-22866)
+```
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.11
+1.22.12
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## 1.15.18 Enterprise (February 07, 2025)
+
+Enterprise LTS: Consul Enterprise 1.15 is a Long-Term Support (LTS) release.
+
+BUG FIXES:
+
+* aws-auth: Fix bug where calls to AWS IAM and STS services error out due to URL with multiple trailing slashes. [[GH-22109](https://github.com/hashicorp/consul/issues/22109)]
+
+## 1.15.17 Enterprise (February 05, 2025)
+
+Enterprise LTS: Consul Enterprise 1.15 is a Long-Term Support (LTS) release.
+
+SECURITY:
+
+* Upgrade Go to use v1.22.11 and bump Go X-Repositories to latest. This addresses CVE
+  [CVE-2024-45341](https://nvd.nist.gov/vuln/detail/CVE-2024-45341) and
+  [CVE-2024-45336](https://nvd.nist.gov/vuln/detail/CVE-2024-45336) [[GH-22084](https://github.com/hashicorp/consul/issues/22084)]
+
+## 1.18.7 Enterprise (January 31, 2025)
+
+Enterprise LTS: Consul Enterprise 1.18 is a Long-Term Support (LTS) release.
+
+BUG FIXES:
+
+* api-gateway: Fixed TLS configuration to properly enforce listener TLS versions and cipher suites [[GH-21984](https://github.com/hashicorp/consul/issues/21984)]
+* aws-auth: Fix bug where calls to AWS IAM and STS services error out due to URL with multiple trailing slashes. [[GH-22109](https://github.com/hashicorp/consul/issues/22109)]
+
 ## 1.20.2 (December 26, 2024)
 SECURITY:
 * Removed ability to use bexpr to filter results without ACL read on endpoint [[GH-21950](https://github.com/hashicorp/consul/issues/21950)]

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ GO_MODULES := $(shell find . -name go.mod -exec dirname {} \; | grep -v "proto-g
 # These version variables can either be a valid string for "go install <module>@<version>"
 # or the string @DEV to imply use what is currently installed locally.
 ###
-GOLANGCI_LINT_VERSION='v1.55.2'
+GOLANGCI_LINT_VERSION='v1.56.1'
 MOCKERY_VERSION='v2.41.0'
 BUF_VERSION='v1.26.0'
 

diff --git a/agent/consul/state/txn.go b/agent/consul/state/txn.go
@@ -28,7 +28,7 @@ func (s *Store) txnKVS(tx WriteTxn, idx uint64, op *structs.TxnKVOp) (structs.Tx
 	var entry *structs.DirEntry
 	var err error
 
-	// enumcover: api.KVOp
+	// enumcover:api.KVOp
 	switch op.Verb {
 	case api.KVSet:
 		entry = &op.DirEnt
@@ -137,7 +137,7 @@ func (s *Store) txnKVS(tx WriteTxn, idx uint64, op *structs.TxnKVOp) (structs.Tx
 func txnSession(tx WriteTxn, idx uint64, op *structs.TxnSessionOp) error {
 	var err error
 
-	// enumcover: api.SessionOp
+	// enumcover:api.SessionOp
 	switch op.Verb {
 	case api.SessionDelete:
 		err = sessionDeleteWithSession(tx, &op.Session, idx)

diff --git a/agent/consul/txn_endpoint.go b/agent/consul/txn_endpoint.go
@@ -268,7 +268,7 @@ func (t *Txn) Read(args *structs.TxnReadRequest, reply *structs.TxnReadResponse)
 // nodeVerbValidate checks for a known operation type. For certain operations,
 // it also indicated if further "preApply" checks are required.
 func nodeVerbValidate(op api.NodeOp) (bool, error) {
-	// enumcover: api.NodeOp
+	// enumcover:api.NodeOp
 	switch op {
 	// Skip the pre-apply checks if this is a GET.
 	case api.NodeGet:
@@ -283,7 +283,7 @@ func nodeVerbValidate(op api.NodeOp) (bool, error) {
 // serviceVerbValidate checks for a known operation type. For certain operations,
 // it also indicated if further "preApply" checks are required.
 func serviceVerbValidate(op api.ServiceOp) (bool, error) {
-	// enumcover: api.ServiceOp
+	// enumcover:api.ServiceOp
 	switch op {
 	// Skip the pre-apply checks if this is a GET.
 	case api.ServiceGet:
@@ -298,7 +298,7 @@ func serviceVerbValidate(op api.ServiceOp) (bool, error) {
 // checkVerbValidate checks for a known operation type. For certain operations,
 // it also indicated if further "preApply" checks are required.
 func checkVerbValidate(op api.CheckOp) (bool, error) {
-	// enumcover: api.CheckOp
+	// enumcover:api.CheckOp
 	switch op {
 	// Skip the pre-apply checks if this is a GET.
 	case api.CheckGet:
@@ -312,7 +312,7 @@ func checkVerbValidate(op api.CheckOp) (bool, error) {
 
 // intentionVerbValidate checks for a known operation type.
 func intentionVerbValidate(op structs.IntentionOp) error {
-	// enumcover: structs.IntentionOp
+	// enumcover:structs.IntentionOp
 	switch op {
 	case structs.IntentionOpCreate, structs.IntentionOpDelete, structs.IntentionOpUpdate, structs.IntentionOpDeleteAll, structs.IntentionOpUpsert:
 		return nil
@@ -323,7 +323,7 @@ func intentionVerbValidate(op structs.IntentionOp) error {
 
 // sessionVerbValidate checks for a known operation type.
 func sessionVerbValidate(op api.SessionOp) error {
-	// enumcover: api.SessionOp
+	// enumcover:api.SessionOp
 	switch op {
 	case api.SessionDelete:
 		return nil

diff --git a/api/go.mod b/api/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/api
 
-go 1.22.11
+go 1.22.12
 
 replace github.com/hashicorp/consul/sdk => ../sdk
 

diff --git a/envoyextensions/go.mod b/envoyextensions/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/envoyextensions
 
-go 1.22.11
+go 1.22.12
 
 replace (
 	github.com/hashicorp/consul/api => ../api

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul
 
-go 1.22.11
+go 1.22.12
 
 replace (
 	github.com/hashicorp/consul/api => ./api

diff --git a/internal/tools/proto-gen-rpc-glue/e2e/consul/go.mod b/internal/tools/proto-gen-rpc-glue/e2e/consul/go.mod
@@ -1,5 +1,5 @@
 module github.com/hashicorp/consul
 
-go 1.22.11
+go 1.22.12
 
 require google.golang.org/protobuf v1.28.1
diff --git a/internal/tools/proto-gen-rpc-glue/e2e/go.mod b/internal/tools/proto-gen-rpc-glue/e2e/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/internal/tools/proto-gen-rpc-glue/e2e
 
-go 1.22.11
+go 1.22.12
 
 replace github.com/hashicorp/consul => ./consul
 

diff --git a/internal/tools/proto-gen-rpc-glue/go.mod b/internal/tools/proto-gen-rpc-glue/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/internal/tools/proto-gen-rpc-glue
 
-go 1.22.11
+go 1.22.12
 
 require github.com/stretchr/testify v1.8.4
 

diff --git a/internal/tools/protoc-gen-consul-rate-limit/go.mod b/internal/tools/protoc-gen-consul-rate-limit/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/internal/tools/protoc-gen-consul-rate-limit
 
-go 1.22.11
+go 1.22.12
 
 replace github.com/hashicorp/consul/proto-public => ../../../proto-public
 

diff --git a/proto-public/go.mod b/proto-public/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/proto-public
 
-go 1.22.11
+go 1.22.12
 
 require (
 	google.golang.org/grpc v1.56.3

diff --git a/sdk/go.mod b/sdk/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/sdk
 
-go 1.22.11
+go 1.22.12
 
 require (
 	github.com/hashicorp/go-cleanhttp v0.5.2

diff --git a/test-integ/go.mod b/test-integ/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/test-integ
 
-go 1.22.11
+go 1.22.12
 
 require (
 	github.com/google/go-cmp v0.6.0

diff --git a/test/integration/connect/envoy/test-sds-server/go.mod b/test/integration/connect/envoy/test-sds-server/go.mod
@@ -1,6 +1,6 @@
 module test-sds-server
 
-go 1.22.11
+go 1.22.12
 
 require (
 	github.com/envoyproxy/go-control-plane v0.12.0

diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/test/integration/consul-container
 
-go 1.22.11
+go 1.22.12
 
 require (
 	fortio.org/fortio v1.54.0

diff --git a/testing/deployer/go.mod b/testing/deployer/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/testing/deployer
 
-go 1.22.11
+go 1.22.12
 
 require (
 	github.com/avast/retry-go v3.0.0+incompatible

diff --git a/troubleshoot/go.mod b/troubleshoot/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/troubleshoot
 
-go 1.22.11
+go 1.22.12
 
 replace (
 	github.com/hashicorp/consul/api => ../api