Skip to content

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #22598 to be assessed for backporting due to the inclusion of the label backport/1.21.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@sanikachavan5
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: unable to process merge commit: "7cb58052b8b1ae489d9ef99c168323d3aa878ed2", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

Add explicit charset encoding to prevent attacker from interpreting the output in a different encoding than intended.

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

PCI review checklist

  • I have documented a clear reason for, and description of, the change I am making.

  • If applicable, I've documented a plan to revert these changes if they require more than reverting the pull request.

  • If applicable, I've documented the impact of any changes to security controls.

    Examples of changes to security controls include using new access control methods, adding or removing logging pipelines, etc.


Overview of commits

abhishek-hashicorp and others added 30 commits March 3, 2025 18:39
* Init release 1.21

* Create nightly-test-integrations-1.21.x.yml

* Remove comma
* Upgrade go version

* Added changelog

* Update config.deepcopy.go

* Update .golangci.yml

* fix lint
* Upgrade crypto to 0.35.0

* Upgrade oauth and go-jose

* upgrade oauth and jose

* Added changelog
…API (#22220)

* Add the missing Service TaggedAddresses and Check Type fields to Txn API

* added changelog
…22227)

* Add session health check management and tests

* Refactor session health check management and update related tests

* Cleanup

---------

Co-authored-by: srahul3 <[email protected]>
* build(deps): bump go version to go1.24.1

* update: use 1.23.7 instead

* add changelog
* Fixes a couple of example commands

The `-name` option is not available `-description` is used in it's place.

set-agent-token is a sub-command of the acl command.

* This feature works with federated services only

This command does not work with peered clusters so needs to be clarified.
…22248)

* Add the missing Service TaggedAddresses and Check Type fields to Txn API

* added changelog

* Refactor Txn API to use AgentService and add TaggedAddresses support
* Update agent.mdx

Starting from Consul v1.20.1+ent, Consul supports using Azure Blob Storage for the snapshot agent via Azure Service Principal  ID and Secret authentication. I've successfully tested this configuration in my lab environment and have added the relevant parameters to this documentation for completeness.

* Update website/content/commands/snapshot/agent.mdx

Co-authored-by: Blake Covarrubias <[email protected]>

* Update website/content/commands/snapshot/agent.mdx

Co-authored-by: Blake Covarrubias <[email protected]>

* Update website/content/commands/snapshot/agent.mdx

Co-authored-by: Blake Covarrubias <[email protected]>

* Update website/content/commands/snapshot/agent.mdx

Co-authored-by: Blake Covarrubias <[email protected]>

---------

Co-authored-by: Blake Covarrubias <[email protected]>
* Fix catalog service endpoint when querying for a peer service

* Add changelog file

* Add changes to docs. Add test

* Update website/content/api-docs/catalog.mdx

Co-authored-by: Jeff Boruszak <[email protected]>

---------

Co-authored-by: Sreeram Narayanan <[email protected]>
Co-authored-by: nitin-sachdev-29 <[email protected]>
Co-authored-by: Jeff Boruszak <[email protected]>
* Update lock.mdx (Node Health Check and TTL)

Consul `lock` command update that captures why consul lock can act indefinitely when node checks are in place and how users can work around it by creating/managing their own session.

* Update website/content/commands/lock.mdx

Co-authored-by: Jeff Boruszak <[email protected]>

---------

Co-authored-by: Jeff Boruszak <[email protected]>
* Fixed following CVEs:
GHSA-vvgc-356p-c3xw in golang.org/x/[email protected]
GO-2025-3595 in golang.org/x/[email protected]
GO-2025-3553 in github.com/golang-jwt/jwt/[email protected]
GHSA-mh63-6h87-95cp in github.com/golang-jwt/jwt/[email protected]
stdlib in Go [email protected]

* added changelog
* Fixed following CVEs:
GHSA-vvgc-356p-c3xw in golang.org/x/[email protected]
GO-2025-3595 in golang.org/x/[email protected]
GO-2025-3553 in github.com/golang-jwt/jwt/[email protected]
GHSA-mh63-6h87-95cp in github.com/golang-jwt/jwt/[email protected]
stdlib in Go [email protected]

* added changelog

* upgraded go to 1.23.8
feature: Adding configurable value to disable XDS Load balancing

Co-authored-by: Jeff Boruszak <[email protected]>

---------

Co-authored-by: Jeff Boruszak <[email protected]>
* suppressing staticcheck lint warning

* upgraded hashicorp/go-discover to 1.0.0 version

* generated proto files
update iframe to videoembed
…22041)

* migration

* nav fixes

* nav

* Missing top-level pages

* nav/content alignment

* partial path update

* Partial fixes

* Partial updates

* partial paths

* erroneous replacement fix

* 3 page migration (test)

* /agent migration

* CA, cluster peering, & config entries

* connect -> Gateways

* connect

* connect

* nav

* Dynamic app config

* ecs

* Tutorials -> docs

* Tutorials moved

* Updated nav with tutorials in docs

* enterprise, install, and k8s through k8s/connect

* k8s deployment

* finished k8s migration

* lambda, nia, nomad

* nav fixes

* security and discovery

* service & upgrade

* final page migrations

* Nav update

* Change navigation and page placement

* Revert "Change navigation and page placement"

This reverts commit 0934235.

* Change navigation and page placement

* Fixed broken include.

* Updated sync consul service catalog with aws cloud map page.

* Update to match page use of cloud map - AWS separates the two words.

* Updated register services into a namespace docs page.

* Updated explore the consul ui page.

* Refactor HAProxy tutorial into usage doc

* re-org

* architecture and fundamentals

* duplicate page deleted

* Apply suggestions from code review

Co-authored-by: Jeff Boruszak <[email protected]>

* Moved consul-aws cli reference to its own page.

* partial fix

* Fix links and next steps

* install and dev mode pages

* CodeBlocks

* env var page

* title changes

* Aligning with tracker

* nav fixes

* tracking alignment

* Nav fixes

* content checker fixed

* Partial path fixes

* more partial fixes

* remove v2 reference

* nav/title adjustments

* first 64 find and replaces

* /connect and /consul-vs-other

* through /nia

* finish docs paths

* tutorial link paths

* Redirects

* Redirect updates

* another tutorials redirect fix

* link path updates

* security architecture

* Raft backend architecture

* Deploy Consul overview

* Fixes to redirect tests

* Redirects

* More redirect fixes

* Updated link path replacements

* README draft

* README

* More readme

* Readme

* Deploy server overview

* Deploy client agents and dataplanes

* cloud auto join page move

* Manage Consul

* Clean up

* Consul template structure and first content

* page name and filepath changes

* Index updates

* typo

* VMs index page

* Consul template documentation

* disaster recovery and openshift guides (#11)

* docs: disaster recovery
* docs: openshift

* adding OpenShift Local to CRC naming convention
* Openshift page restructure
* add redundancy-zones link
* update openshift guide versions

Co-authored-by: Jeff Boruszak <[email protected]>
Co-authored-by: boruszak <[email protected]>
Co-authored-by: Jeff Boruszak <[email protected]>

* /connect

* /connect/vm

* /connect/k8s

* /fundamentals/cli

* /fundamentals/cli and /register/service/nomad

* /fundamentals/api

* /fundamentals/editions (and remove env-var)

* /fundamentals/tf and finish /fundamentals/editions

* /fundamentals/identity

* Fixes for working preview

* Fundamentals updates

* Agent page updates

* Agent reference restructure

* Redirects update

* CT config

* References with links and defaults

* Some workflow fixes

* Fix some links and images

* Gossip and TLS with vault first changes

* Gossip and TLS with vault first changes

* Replace consul.io for URL deprecation

* Bug Bash fixes

* More bug bash fixes

* nav fix

* Final bug bash fixes

* Vault TLS consul-template

* Name the tool Consul Template

* Move auto_config in config reference

* Fix links

* Updates to architecture

* Architecture and use case updates

* QoL improvements

* Apply suggestions from code review

Co-authored-by: Jeff Boruszak <[email protected]>

* Glossary improvements

* Updates

* README updates

* Finetuning

* final readme updates

* Link path changes to fix 500 errors

* linkcheck fixes round 2

* round 3 500 error fixes

* Errors fixes round 4

* CE-827: adding k8s and openshift tshoot info

* Revert "CE-827: adding k8s and openshift tshoot info"

This reverts commit a02f21d.

* Redhat category rename

* Readme updates

* CE-846 content and screenshots

* Ref/agent remove index; add auto-config file

* Fix broken links due to configuration-file dir

* CE-851 content and images

* Fix content-check errors

* lock update + move autopilot

* v1.21 updates & release notes

* IA/Content strategy readme finalizations

* Inline image fix

* real img fix

* More README + consul.d in agent fundamentals

* reviewed dataplane architecture content

* review rest of completed drafts in arch

* persona/directory index

* reviewed fundamentals

* Readme toc and final updates

* re-order some sections

* Final toc for readme

* move inline examples to Example section where it made sense.

* Ce-835: DNS views (#16)

* CE-835 DNS forwarding in OpenShift

* CE-835 DNS views in OpenShift

* Apply suggestions from code review

Co-authored-by: Jeff Boruszak <[email protected]>

---------

Co-authored-by: Jeff Boruszak <[email protected]>

* CE-827: Troubleshoot OpenShift (#17)

* CE-827: adding k8s and openshift tshoot info

* CE-827: adding openshift import-image info

* CE-827: import-image timeout

* Apply suggestions from code review

Co-authored-by: Jeff Boruszak <[email protected]>

---------

Co-authored-by: Jeff Boruszak <[email protected]>

* CE-833: OpenShift page updates (#18)

* CE-833: updater versions

* Apply suggestions from code review

Co-authored-by: Jeff Boruszak <[email protected]>

---------

Co-authored-by: Jeff Boruszak <[email protected]>

* CE-825: Consul on OpenShift Index Page (#19)

* CE-825: Consul on OpenShift Index Page

* Apply suggestions from code review

Co-authored-by: Jeff Boruszak <[email protected]>

---------

Co-authored-by: Jeff Boruszak <[email protected]>

* telemetry

* configuration file index

* ESM and release notes updates

* Apply suggestions from code review

Co-authored-by: Tu Nguyen <[email protected]>

* Apply suggestions from code review

Co-authored-by: Tu Nguyen <[email protected]>

* fixes for content check

* partial fix

* Merge resolution changes

* Agent: Fix remaining links to reference/agent#

* Copy edits

* Update HAProxy load balance guide

* review manage/dns

* multi-tenant/sameness-group/vm

* multi-tenant/samenessgroup/k8s

* secure

* deploy

* CE-834: Upgrade OpenShift (#25)

* upgrade openshift deployment

* openshift: improve upgrade article

* openshift: add redhat word to openshift term

* Apply suggestions from code review

Co-authored-by: Jeff Boruszak <[email protected]>

* revision after code review

---------

Co-authored-by: Jeff Boruszak <[email protected]>

* Cleanup, especially Agent references

* content fixes

* Error fix

---------

Co-authored-by: Daniele Carcasole <[email protected]>
Co-authored-by: danielehc <[email protected]>
Co-authored-by: Anthony <[email protected]>
Co-authored-by: Krastin Krastev <[email protected]>
Co-authored-by: danielehc <[email protected]>
Co-authored-by: Aimee Ukasick <[email protected]>
Co-authored-by: Tu Nguyen <[email protected]>
Co-authored-by: Tu Nguyen <[email protected]>
Missing <CodeBlockConfig>  added
* table to partial conversion plus updates

* k8s version update
* fix: updated grpc config for partition endpoint

* minor cleanup
* Fix IPv6 address handling in LAN <-> WAN join flooder

When `advertise_addr` is an IPv6 address, Consul WAN federation breaks
and we get a constant stream of warnings:
```
[WARN]  agent.server.memberlist.wan: memberlist: Failed to resolve
i-02a3c94b46768b01f.aws-eu-west-1/2a05:d018:18a3:f202:64d9:1621:ab22:df45:8302:
lookup 2a05:d018:18a3:f202:64d9:1621:ab22:df45:8302: no such host
```

The LAN <-> WAN join flooder creates IPv6 addresses without square
brackets with `fmt.Sprintf("%s:%d", addr, s.WanJoinPort)`, which
confuses `net.SplitHostPort` in `memberlist.resolveAddr`.

Fixes #22225

* add changelog
Updated the list with newer patch versions for supported Envoy releases while removing outdated entries. This ensures compatibility and aligns with the latest supported versions documented by Consul's Envoy proxy guidelines.
…R requests (#22376)

* Added default namespace and partition check before signing CA certificate in Consul CE
anilvpatel and others added 6 commits August 19, 2025 14:05
* add: testcase for IPv6 scenarios in peering establish api
* CE-754 page creation

* CE-754 - Add navigation

* Apply suggestions from code review

Co-authored-by: Jeff Boruszak <[email protected]>

---------

Co-authored-by: Jeff Boruszak <[email protected]>
* sec: perform constant time compare for sensitive values

* add changelog
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/sanikachavan5/SECVULN-8628-add-charset-wherever-applicable/frequently-hopeful-yak branch from 784d096 to 623202b Compare August 25, 2025 11:21
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@github-actions github-actions bot added type/docs Documentation needs to be created/updated/clarified theme/api Relating to the HTTP API interface theme/health-checks Health Check functionality theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/ui Anything related to the UI theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies type/ci Relating to continuous integration (CI) tooling for testing or releases pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation labels Aug 25, 2025
@hashicorp-cla-app
Copy link

hashicorp-cla-app bot commented Aug 25, 2025

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


28 out of 29 committers have signed the CLA.

  • abhishek-hashicorp
  • nitin-sachdev-29
  • srahul3
  • nickwales
  • dduzgun-security
  • SuyashHashiCorp
  • arnabkaycee
  • Vikramarjuna
  • KleeKitz
  • natemollica-nm
  • jorgemarey
  • im2nguyen
  • Moose1301
  • sujay-hashicorp
  • boruszak
  • sreeram77
  • tkren
  • mrgupta7
  • markcampv
  • pajay-rao
  • kswap
  • anilvpatel
  • krastin
  • krutibaraiya
  • 20sr20
  • sanikachavan5
  • suresh-hashicorp
  • danielehc
  • compliance-pr-automation-bot[bot]

Have you signed the CLA already but the status is still pending? Recheck it.

@sanikachavan5 sanikachavan5 deleted the backport/sanikachavan5/SECVULN-8628-add-charset-wherever-applicable/frequently-hopeful-yak branch August 26, 2025 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/dependencies PR specifically updates dependencies of project theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation theme/contributing Additions and enhancements to community contributing materials theme/envoy/xds Related to Envoy support theme/health-checks Health Check functionality theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/ui Anything related to the UI type/ci Relating to continuous integration (CI) tooling for testing or releases type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Development

Successfully merging this pull request may close these issues.